aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-2679-3080/+3896
|\ | | | | | | | | Conflicts: phpBB/install/database_update.php
| * Merge remote-tracking branch 'EXreaction/ticket/11367' into developDavid King2013-02-261-3/+11
| |\ | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (1) and Nathaniel Guse (1) # Via Nathan Guse * EXreaction/ticket/11367: [ticket/11367] Always freeresult [ticket/11367] Migrator throws error if migrations table does not exist
| | * [ticket/11367] Always freeresultNathan Guse2013-02-261-2/+2
| | | | | | | | | | | | PHPBB3-11367
| | * [ticket/11367] Migrator throws error if migrations table does not existNathaniel Guse2013-02-251-4/+12
| | | | | | | | | | | | | | | | | | Force load_migration_state to not throw errors if the table does not exist. PHPBB3-11367
| * | Merge remote-tracking branch 'EXreaction/feature/migrations-data' into developDavid King2013-02-2646-2820/+3339
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (14) and Nathaniel Guse (4) # Via Nathaniel Guse * EXreaction/feature/migrations-data: [feature/migrations] Inject migrator rather than the container. [feature/migrations] Use the user class for language handling [feature/migrations] Fully revert the removal of the user_msnm field [feature/migrations] Revert unrelated change to schema_data.sql [feature/migrations] Remove user_msnm migration [feature/migrations] Correct depends_on [feature/migrations] Subdirectories for migration data [feature/migrations] Reports table schema changes in recent develop [feature/migrations] Automatically populate migrations table on install [feature/migrations] effectively installed check for migration data [feature/migrations] Comments for the return in the custom functions [feature/migrations] Order the migrations schema in schema_data.sql [feature/migrations] Fix migrations installer, schema for schema_data.sql [feature/migrations] Make depends_on static to call it without dependencies [feature/migrations] Remove hardcoded language, use lang instead. [feature/migrations] Revert schema for migration data [feature/migrations] Replace database_update.php with migrations updater [feature/migrations] Rebuilding migrations data on develop
| | * Merge branch 'feature/migrations-data' of github.com:EXreaction/phpbb3 into ↵Nathaniel Guse2013-02-2527-152/+441
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/migrations-data # By Dhruv (19) and others # Via Nathaniel Guse (3) and others * 'feature/migrations-data' of github.com:EXreaction/phpbb3: (38 commits) [feature/migrations] Use the user class for language handling [feature/migrations] Fully revert the removal of the user_msnm field [feature/migrations] Revert unrelated change to schema_data.sql [ticket/11179] remove extra & in function call [ticket/11179] correct start parameter in sphinx search [ticket/11179] correct start parameter in native author search [ticket/11179] correct start parameter in native keyword search [ticket/11179] fix success query path for postgres [ticket/11179] fix success query path for mysql [ticket/11179] minor fixes [ticket/11179] pass start param by reference in postgres [ticket/11179] correct start param in author search of postgres [ticket/11179] correct start parameter in psql keyword search [ticket/11179] pass start param by reference in author search [ticket/11179] correct start parameter for author search [ticket/11179] use FOUND_ROWS query to re-search with changed start param [ticket/11179] pass start parameter by reference [ticket/11179] correct the start parameter while retrieving from cache [ticket/11179] add search query in case initial one fails [ticket/11359] html escape sphinx config data ...
| | | * [feature/migrations] Use the user class for language handlingNathaniel Guse2013-02-231-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | Also localise error messages from the migrator PHBB3-9737
| | | * [feature/migrations] Fully revert the removal of the user_msnm fieldNathaniel Guse2013-02-231-1/+0
| | | | | | | | | | | | | | | | PHBB3-9737
| | | * [feature/migrations] Revert unrelated change to schema_data.sqlNathaniel Guse2013-02-231-0/+1
| | | | | | | | | | | | | | | | PHBB3-9737
| | | * Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Nathaniel Guse2013-02-2324-139/+430
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/migrations-data Conflicts: phpBB/install/database_update.php
| | * | | [feature/migrations] Inject migrator rather than the container.Nathaniel Guse2013-02-251-3/+12
| | |/ / | | | | | | | | | | | | | | | | | | | | Some docblocks PHBB3-9737
| | * | [feature/migrations] Remove user_msnm migrationNathan Guse2013-02-062-0/+44
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Correct depends_onNathan Guse2013-02-065-4/+8
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Subdirectories for migration dataNathan Guse2013-02-0643-88/+88
| | | | | | | | | | | | | | | | | | | | | | | | Organization will set you free PHPBB3-9737
| | * | [feature/migrations] Reports table schema changes in recent developNathan Guse2013-02-062-0/+43
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Automatically populate migrations table on installNathan Guse2013-02-062-44/+7
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] effectively installed check for migration dataNathan Guse2013-02-0644-142/+223
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Comments for the return in the custom functionsNathan Guse2013-02-062-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11318
| | * | [feature/migrations] Order the migrations schema in schema_data.sqlNathan Guse2013-02-061-9/+9
| | | | | | | | | | | | | | | | PHPBB3-11318
| | * | [feature/migrations] Fix migrations installer, schema for schema_data.sqlNathan Guse2013-02-063-64/+116
| | | | | | | | | | | | | | | | PHPBB3-11318
| | * | [feature/migrations] Make depends_on static to call it without dependenciesNathan Guse2013-02-0644-133/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move installing migrations to migration/install.php and handle figuring out what migrations have been installed based on phpBB version. PHPBB3-11318
| | * | [feature/migrations] Remove hardcoded language, use lang instead.Nathan Guse2013-02-062-27/+30
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Revert schema for migration dataNathan Guse2013-02-0641-168/+314
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Replace database_update.php with migrations updaterNathan Guse2013-02-062-2939/+99
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Rebuilding migrations data on developNathan Guse2013-02-0642-7/+2948
| | | | | | | | | | | | | | | | | | | | | | | | So this is easy to merge later. PHPBB3-9737
| * | | Merge remote-tracking branch 'remotes/marc/ticket/11342' into developNathaniel Guse2013-02-252-4/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/11342: [ticket/11342] Fix "unexpected token" syntax error [ticket/11342] Mark active topics read when marking forums read
| | * | | [ticket/11342] Fix "unexpected token" syntax errorMarc Alexander2013-02-201-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB-11342
| | * | | [ticket/11342] Mark active topics read when marking forums readMarc Alexander2013-02-032-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marking forums read while viewing a category will also mark the active topics inside that category read. Therefore, the active topics should also be marked read. With this patch the ajax callback "mark_forums_read" will check if the active topics id ("active_topics") exists and also mark topics read if it does. As the active topics will only be displayed in categories, which can't have any other topics, this is a proper approach. PHPBB3-11342
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-02-241-1/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
| | * \ \ \ Merge remote-tracking branch 'naderman/ticket/10986' into develop-olympusAndreas Fischer2013-02-241-1/+23
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10986: [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
| | | * | | | [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generatedNils Adermann2013-02-241-1/+23
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than send invalid message ids with a missing domain part we try to read one from $_SERVER and otherwise use phpbb.generated PHPBB3-10986
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-18/+32
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11358] Changed the name of post parameter. [ticket/11358] Changed the action parameter value to represent the link. [ticket/11358] Enabled link making all users default for a group. [ticket/11358] Removed redundant code and referred proper variable. [ticket/11358] Success message even without selecting a user.
| | * | | | Merge branch 'ticket/11358' into develop-olympusNils Adermann2013-02-241-18/+32
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11358: [ticket/11358] Changed the name of post parameter. [ticket/11358] Changed the action parameter value to represent the link. [ticket/11358] Enabled link making all users default for a group. [ticket/11358] Removed redundant code and referred proper variable. [ticket/11358] Success message even without selecting a user.
| | | * | | | [ticket/11358] Changed the name of post parameter.erangamapa2013-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the parameter name 'defaultbylink' to a meaningful name 'set_default_on_all'. Parameter is used for making all users default for selected group in acp_groups.php. PHPBB3-11358
| | | * | | | [ticket/11358] Changed the action parameter value to represent the link.erangamapa2013-02-241-20/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the action parameter value to recognize whether 'Make default group for every member' is clicked. If so execute a seperate code block under switch statement for $action and add all the users as default for the group. PHPBB3-11358
| | | * | | | [ticket/11358] Enabled link making all users default for a group.erangamapa2013-02-241-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect whether link is clicked or form is posted for making users default for a group. If form is posted and no users are selected, validation happens and displays an error message. When the link is clicked, all the users will be default users for that group. PHPBB3-11358
| | | * | | | [ticket/11358] Removed redundant code and referred proper variable.erangamapa2013-02-241-40/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was thrown when no users are selected before executing the code chunk which manually adds all the user to make the group default. Removed this code and referred $mark_ary instead of $name_ary which will not have selected user ids. PHPBB3-11358
| | | * | | | [ticket/11358] Success message even without selecting a user.erangamapa2013-02-241-0/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In group membership management, if you perform the action 'Make group default for member' without selecting any user, a confirm box will be displayed and will show a success message after confirming. Added a new condition to fix this issue in acp_groups.php. It will check weather any users are selected before performing above action. PHPBB3-11358
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-0/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11355] Referred proper variable when validating selection. [ticket/11355] Wrong error message when no user is selected. Conflicts: phpBB/includes/acp/acp_groups.php
| | * | | | Merge branch 'ticket/11355' into develop-olympusNils Adermann2013-02-241-1/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11355: [ticket/11355] Referred proper variable when validating selection. [ticket/11355] Wrong error message when no user is selected.
| | | * | | | [ticket/11355] Referred proper variable when validating selection.erangamapa2013-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier PR was referring wrong variable $name_ary. Changed it to $mark_ary which actually contains selected user ids. PHPBB3-11355
| | | * | | | [ticket/11355] Wrong error message when no user is selected.erangamapa2013-02-241-1/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ACP group membership management, if you select 'remove member from group' without selecting any users and submit,it will display a wrong error after confirmbox. Since no users are selected, this should not go even until confirmbox. Added a new condition to check weather any users are selected when the action is 'deleteusers' in acp_groups.php and disply a correct error. PHPBB3-11355
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11361] Make sure that array passed to strtr() has the proper format. Conflicts: phpBB/includes/session.php
| | * | | | Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympusNils Adermann2013-02-241-1/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/11361: [ticket/11361] Make sure that array passed to strtr() has the proper format.
| | | * | | | [ticket/11361] Make sure that array passed to strtr() has the proper format.Andreas Fischer2013-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The array $date_cache[$format]['lang'] passed to strtr() contains a sub-array which results in an E_NOTICE being thrown for 'Array to string conversion' on PHP 5.4. Ensure that the array passed to strtr() is one-dimensional by filtering out non-string values. PHPBB3-11361
| * | | | | | [ticket/10896] Add missing email validation lost in develop mergeNils Adermann2013-02-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incomplete merge, by adding a piece of code moved to another file in olympus back. PHPBB3-10896
| * | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-243-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID [ticket/10896] Adds email validation to email settings in ACP Conflicts: phpBB/adm/index.php phpBB/language/en/common.php phpBB/language/en/ucp.php
| | * | | | | Merge remote-tracking branch 'github-exreaction/ticket/10896' into ↵Nils Adermann2013-02-244-3/+10
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-exreaction/ticket/10896: [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID [ticket/10896] Adds email validation to email settings in ACP
| | | * | | | | [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALIDNathan Guse2013-02-043-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10896
| | | * | | | | [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-043-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new validation type to the ACP validate_config_vars function and implements it on the board_contact and board_email settings. PHPBB3-10896
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 03:50:53 +0000