aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-291-9/+9
| | | | | | | | All columns were renamed from having prune_shadow_topics as namebase to just prune_shadow. A missing column was also added to the migration file's remove_schema() method. PHPBB3-12150
* [ticket/12150] Add missing space to query for shadow topicsMarc Alexander2014-03-291-1/+1
| | | | PHPBB3-12150
* [ticket/12150] Add missing prune settings variables in acp_forumsMarc Alexander2014-03-291-0/+6
| | | | PHPBB3-12150
* [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-291-0/+5
| | | | PHPBB3-12150
* [ticket/12150] Add options to acpMarc Alexander2014-03-291-0/+3
| | | | PHPBB3-12150
* Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into ↵Nils Adermann2014-03-292-1233/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/11459: (21 commits) [ticket/11459] Make 3.1.0-dev migration depend on migrations_table [ticket/11459] Move $supported_dbms to beginning of create schema file [ticket/11459] Fix missing constant CONFIG_TABLE for sql_create_index() [ticket/11459] Fix auth provider test [ticket/11459] Correctly set up the database from schema in unit tests [ticket/11459] Install DB schema from json file [ticket/11459] Clean up a little more [ticket/11459] Do not add table schema to database schema files [ticket/11459] Create schema.json from migration files [ticket/11459] Do not take files of extensions into account [ticket/11459] Pass array with migration class names to schema generator [ticket/11459] Refresh schema files [ticket/11459] Remove spaces from the end of lines in MSSQL [ticket/11459] Correctly handle index column length [ticket/11459] Add migration for migrations table [ticket/11459] Update doc blocks [ticket/11459] Remove old schema file [ticket/11459] Update schema files with new script [ticket/11459] Use new migration/schema_generator to create schema files [ticket/11459] Add Schema from 3.0.0 ...
| * [ticket/11459] Remove old schema fileJoas Schilling2014-03-292-1233/+0
| | | | | | | | PHPBB3-11459
* | Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeusJoas Schilling2014-03-291-0/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/11959: [ticket/11959] Move phpbb_generate_string_list() to functions_content.php. [ticket/11959] Add unit tests. [ticket/11959] Remove use of plurals and make it possible to use Oxford comma. [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name. [ticket/11959] Simplify how the users are trimmed. [ticket/11959] Add function to create a string list. [ticket/11959] Add samples for the untrimmed strings. [ticket/11959] List the last user with "and" instead of a comma. [ticket/11959] Use the plurals system for the untrimmed language strings. [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text. [ticket/11959] Use plurals for the language strings.
| * | [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.Cesar G2014-03-292-32/+32
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.Cesar G2014-03-191-5/+15
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.Cesar G2014-03-191-1/+1
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Add function to create a string list.Cesar G2014-03-191-0/+22
| | | | | | | | | | | | PHPBB3-11959
* | | Merge remote-tracking branch 'vsephpbb/ticket/12300' into develop-ascraeusJoas Schilling2014-03-291-0/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12300: [ticket/12300] Make only red topic/forum row icons clickable to unread posts [ticket/12300] Fix broken link to last post in topic subscriptions list [ticket/12300] Fix alignment of clickable icons [ticket/12300] Make all topic row icons clickable [ticket/12300] Rename new class for row icon links [ticket/12300] Make topic icon links clickable to newest unread posts [ticket/12300] Revert topic title links back to default behavior
| * | [ticket/12300] Make only red topic/forum row icons clickable to unread postsMatt Friedman2014-03-281-0/+2
| | | | | | | | | | | | PHPBB3-12300
* | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-291-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9725] Code sniffer fixes [ticket/9725] Do not use deprecated views to remove default constraints [ticket/9725] Move primary key creation to the correct location [ticket/9725] Remove trailing spaces from MSSQL schema [ticket/9725] Create MSSQL primary keys if none exist [ticket/9725] Remove explicit filegroup designations [ticket/9725] Fetch Azure db stats from proper table [ticket/9725] Add dummy indexes for Azure [ticket/9725] Create an Azure SQL compatible Schema Conflicts: phpBB/install/schemas/mssql_schema.sql
| * \ \ Merge remote-tracking branch 'noxwizard/ticket/naderman/9725' into ↵Joas Schilling2014-03-292-49/+113
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * noxwizard/ticket/naderman/9725: [ticket/9725] Code sniffer fixes [ticket/9725] Do not use deprecated views to remove default constraints [ticket/9725] Move primary key creation to the correct location [ticket/9725] Remove trailing spaces from MSSQL schema [ticket/9725] Create MSSQL primary keys if none exist [ticket/9725] Remove explicit filegroup designations [ticket/9725] Fetch Azure db stats from proper table [ticket/9725] Add dummy indexes for Azure [ticket/9725] Create an Azure SQL compatible Schema
| | * | | [ticket/9725] Code sniffer fixesPatrick Webster2014-03-281-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | [ticket/9725] Do not use deprecated views to remove default constraintsPatrick Webster2014-03-281-32/+84
| | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | [ticket/9725] Move primary key creation to the correct locationPatrick Webster2014-03-281-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | [ticket/9725] Create MSSQL primary keys if none existPatrick Webster2014-03-281-0/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | [ticket/9725] Remove explicit filegroup designationsPatrick Webster2014-03-281-17/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | [ticket/9725] Fetch Azure db stats from proper tablePatrick Webster2014-03-281-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-9725
* | | | | [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-fileCrizzo2014-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11336
* | | | | Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeusJoas Schilling2014-03-282-6/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | * geetakshi/ticket/11360: [ticket/11360] Updating default value of $display_online_list [ticket/11360] Avoiding online list where not required [ticket/11360] Change second parameter in page_header function
| * | | | [ticket/11360] Updating default value of $display_online_listgeetakshi2014-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11360
| * | | | [ticket/11360] Change second parameter in page_header functiongeetakshi2014-03-191-5/+5
| | |_|/ | |/| | | | | | | | | | PHPBB3-11360
* | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-221-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page Conflicts: phpBB/adm/style/acp_users_overview.html
| * | | [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12035
| * | | [ticket/12035] Adding necessary conditionsgeetakshi2014-03-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12035
| * | | [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Adding link of posts behind displayed number of posts of the user PHPBB3-12035
| * | | Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympusJoas Schilling2014-03-141-2/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * marcosbc/ticket/12247: [ticket/12247] Makes static usernames work [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
| | * | | [ticket/12247] Makes static usernames workMarcos Bjorkelund2014-03-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relative to the last ticket, this allows static usernames to work correctly (those inserted in the post-column post_username) when sending the e-mail, instead of showing just "Anonymous". PHPBB3-12247
| | * | | [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()Marcos Bjorkelund2014-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It includes the poster's username in the email notifications of posts that get approved by moderators. This is done by adding the username to every user_notification() function located in /phpBB/includes/mcp/mcp_queue.php. PHPBB3-12247
* | | | | [ticket/12292] Improve style details pageMatt Friedman2014-03-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-12292 Gave style details page a proper heading and back button. Also removed a few obsolete code leftovers in the style and CSS. PHPBB3-12292
* | | | | Merge pull request #2137 from geetakshi/ticket/8309Dhruv Goel2014-03-202-3/+3
|\ \ \ \ \ | | | | | | | | | | | | [ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
| * | | | | [ticket/8309] Changing $last_activity to $last_activegeetakshi2014-03-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | | [ticket/8309] Removing key with similar function to avoid redundancygeetakshi2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | | [ticket/8309] Rename $last_visit to $last_activitygeetakshi2014-03-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | | [ticket/8309] Renaming "Last visit" to "Last activity"geetakshi2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8309
* | | | | | Merge remote-tracking branch 'Elsensee/ticket/11169' into developJoas Schilling2014-03-191-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11169: [ticket/11169] Skip migration if "Users" category has been deleted [ticket/11169] Move module 'prune users' to users category
| * | | | | [ticket/11169] Move module 'prune users' to users categoryOliver Schramm2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11169
* | | | | | Merge remote-tracking branch 'prototech/ticket/12160' into developJoas Schilling2014-03-181-0/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/12160: [ticket/12160] Use phpbb_check_installation_exists() in the other modules. [ticket/12160] Move phpbb_check_installation_exists() to functions_install.php [ticket/12160] Check if phpBB is installed before creating phpBB container. [ticket/12160] Add function to check if phpBB is installed.
| * | | | | | [ticket/12160] Move phpbb_check_installation_exists() to functions_install.phpCesar G2014-02-222-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12160
| * | | | | | [ticket/12160] Add function to check if phpBB is installed.Cesar G2014-02-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12160
* | | | | | | Merge branch 'ticket/11239' of github.com:geetakshi/phpbb into developJoas Schilling2014-03-161-1/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By geetakshi # Via geetakshi * 'ticket/11239' of github.com:geetakshi/phpbb: [ticket/11239] Removing hard-coded, language specific possessive [ticket/11239] Including username before Overview title
| * | | | | | [ticket/11239] Removing hard-coded, language specific possessivegeetakshi2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11239
| * | | | | | [ticket/11239] Including username before Overview titlegeetakshi2014-03-161-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding username to the page title to avoid confusion while managing multiple users in ACP PHPBB3-11239
* | | | | | [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-devJoas Schilling2014-03-151-1/+1
| | | | | |
* | | | | | [prep-release-3.1.0-b1] Update version to 3.1.0-b1Joas Schilling2014-03-151-1/+1
| | | | | |
* | | | | | [ticket/12272] Fix hardcoded colons in subforums.Maël Soucaze2014-03-151-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In subforums list, under the parent forum description, there are two harcoded colons instead of {L_COLON}. PHPBB3-12272