aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11025] Replace <b> with <strong> and/or class for semantic styling ↵Matt Friedman2012-07-232-1/+6
| | | | | | in subsilver2 PHPBB3-11025
* [ticket/11025] Replace <b> with <strong> and/or class for semantic stylingMatt Friedman2012-07-233-2/+7
| | | | PHPBB3-11025
* [ticket/11025] Make last topic titles in forum list BoldMatt Friedman2012-07-232-2/+2
| | | | | | | This small style tweak will make the truncated last topic titles shown in the forum list BOLD for better visual impact. PHPBB3-11025
* Merge branch 'develop-olympus' into developAndreas Fischer2012-07-233-2/+15
|\ | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. Conflicts: phpBB/install/database_update.php
| * Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-233-2/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.Andreas Fischer2012-07-231-0/+9
| | |
| | * [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.Andreas Fischer2012-07-234-5/+9
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-2/+5
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10965] Profile data is only grabbed when show_novalue is enabled
| * | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-2/+5
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Profile data is only grabbed when show_novalue is enabled
| | * Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11Andreas Fischer2012-07-231-2/+5
| | |\ | | | | | | | | | | | | | | | | * naderman/ticket/10965: [ticket/10965] Profile data is only grabbed when show_novalue is enabled
| | | * [ticket/10965] Profile data is only grabbed when show_novalue is enabledNils Adermann2012-07-231-2/+5
| | | | | | | | | | | | | | | | PHPBB3-10965
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
| * | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-0/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
| | * | Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11Andreas Fischer2012-07-231-0/+8
| | |\ \ | | | |/ | | | | | | | | | | | | * naderman/ticket/10965: [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
| | | * [ticket/10965] Make sure all profile fields are always grabbed on viewtopicNils Adermann2012-07-231-0/+8
| | | | | | | | | | | | | | | | PHPBB3-10965
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-2313-13/+46
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value Conflicts: phpBB/includes/acp/acp_profile.php
| * | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-2313-13/+46
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value
| | * | Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11Andreas Fischer2012-07-2313-13/+46
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | * naderman/ticket/10965: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value
| | | * [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1Nils Adermann2012-07-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10965
| | | * [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-2313-13/+46
| | |/ | | | | | | | | | | | | | | | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
* | | Merge pull request #914 from EXreaction/ticket/10990Nils Adermann2012-07-2218-30/+31
|\ \ \ | | | | | | | | Ticket/10990
| * | | [ticket/10990] Changes for developNathan Guse2012-07-227-29/+29
| | | | | | | | | | | | | | | | PHPBB3-10990
| * | | [ticket/10990] Do not use comma separator when storing it as a log.Nathan Guse2012-07-226-10/+10
| | | | | | | | | | | | | | | | PHPBB3-10990
| * | | [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriateNathan2012-07-2222-61/+62
| | | | | | | | | | | | | | | | PHPBB3-10990
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-07-220-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
| * | | Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-221-0/+12
| |\ \ \ | | | |/ | | |/| | | | | | | | | * prep-release-3.0.11: [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
| | * | Merge branch 'ticket/10667' into prep-release-3.0.11Nils Adermann2012-07-221-0/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/10667: [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
| | | * | [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)Igor Wiedler2012-07-221-0/+12
| | |/ / | | | | | | | | | | | | PHPBB3-10667
* | | | Merge pull request #909 from igorw/ticket/10667Nils Adermann2012-07-211-0/+12
|\ \ \ \ | | | | | | | | | | [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
| * | | | [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)Igor Wiedler2012-07-211-0/+12
|/ / / / | | | | | | | | | | | | PHPBB3-10667
* | | | Merge remote-tracking branch 'github-igorw/ticket/11012' into developNils Adermann2012-07-217-30/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/ticket/11012: [ticket/11012] Fix php_ext change in mock_extension_manager [ticket/11012] Normalize $phpEx member vars to $php_ext
| * | | | [ticket/11012] Fix php_ext change in mock_extension_managerIgor Wiedler2012-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11012
| * | | | [ticket/11012] Normalize $phpEx member vars to $php_extIgor Wiedler2012-07-216-29/+29
| | | | | | | | | | | | | | | | | | | | PHPBB3-11012
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into developNils Adermann2012-07-212-40/+69
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * github-nickvergessen/ticket/11002: [ticket/11002] Use translating option to rename the Etc/GMT options
| * | | | [ticket/11002] Use translating option to rename the Etc/GMT optionsJoas Schilling2012-07-212-40/+69
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | They have the invers offset of their name. So GMT+2 has the offset -7200. To avoid additional confusion, we simply overwrite their name. PHPBB3-11002
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-07-214-84/+428
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10950] Fix grammar in comments [ticket/10950] Delete PMs for users that have not yet read the pm [ticket/10950] Fix unit tests to fit the new pm deleting behaviour [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user [ticket/10950] Remove deleted entries in tests instead of commenting them out [ticket/10950] Use database count() and group by instead of doing that in php [ticket/10950] Check $delete_ids to be not empty [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms() [ticket/10950] Fix unit tests to reflect desired behaviour [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms() [ticket/10950] Correct comment for the second query. [ticket/10950] Add empty line to make unset() call more visible. [ticket/10950] Select the correct columns in SQL queries. [ticket/10950] Use a variable for the private message id. [ticket/10950] Move array initialisation to the front. [ticket/10950] Remove redundant if statement. [ticket/10950] Fix SQL coding style (indentation) in second SQL query. [ticket/10950] Use proper ' in order to fix comment.
| * | | Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-214-84/+428
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10950] Fix grammar in comments [ticket/10950] Delete PMs for users that have not yet read the pm [ticket/10950] Fix unit tests to fit the new pm deleting behaviour [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user [ticket/10950] Remove deleted entries in tests instead of commenting them out [ticket/10950] Use database count() and group by instead of doing that in php [ticket/10950] Check $delete_ids to be not empty [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms() [ticket/10950] Fix unit tests to reflect desired behaviour [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms() [ticket/10950] Correct comment for the second query. [ticket/10950] Add empty line to make unset() call more visible. [ticket/10950] Select the correct columns in SQL queries. [ticket/10950] Use a variable for the private message id. [ticket/10950] Move array initialisation to the front. [ticket/10950] Remove redundant if statement. [ticket/10950] Fix SQL coding style (indentation) in second SQL query. [ticket/10950] Use proper ' in order to fix comment.
| | * | Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into ↵Nils Adermann2012-07-214-84/+428
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.11 * github-nickvergessen/ticket/10950: [ticket/10950] Fix grammar in comments [ticket/10950] Delete PMs for users that have not yet read the pm [ticket/10950] Fix unit tests to fit the new pm deleting behaviour [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user [ticket/10950] Remove deleted entries in tests instead of commenting them out [ticket/10950] Use database count() and group by instead of doing that in php [ticket/10950] Check $delete_ids to be not empty [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms() [ticket/10950] Fix unit tests to reflect desired behaviour [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms() [ticket/10950] Correct comment for the second query. [ticket/10950] Add empty line to make unset() call more visible. [ticket/10950] Select the correct columns in SQL queries. [ticket/10950] Use a variable for the private message id. [ticket/10950] Move array initialisation to the front. [ticket/10950] Remove redundant if statement. [ticket/10950] Fix SQL coding style (indentation) in second SQL query. [ticket/10950] Use proper ' in order to fix comment.
| | | * | [ticket/10950] Fix grammar in commentsJoas Schilling2012-07-201-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10950
| | | * | [ticket/10950] Delete PMs for users that have not yet read the pmJoas Schilling2012-07-202-33/+45
| | | | | | | | | | | | | | | | | | | | PHPBB3-10950
| | | * | [ticket/10950] Fix unit tests to fit the new pm deleting behaviourJoas Schilling2012-07-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Undelivered PMs should not be delivered to recipients that have not yet received them. PHPBB3-10950
| | | * | [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each userJoas Schilling2012-07-161-5/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-10950
| | | * | [ticket/10950] Remove deleted entries in tests instead of commenting them outJoas Schilling2012-07-111-17/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10950
| | | * | [ticket/10950] Use database count() and group by instead of doing that in phpJoas Schilling2012-07-111-11/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10950
| | | * | [ticket/10950] Check $delete_ids to be not emptyJoas Schilling2012-07-041-19/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-10950
| | | * | [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()Joas Schilling2012-07-041-58/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Get delete_ids, pms of the user as receipt - Get undelivered_msg, pms of the user as sender - Delete undelivered_msg, if there are only NO_BOX, OUTBOX and SENTBOX links - Correct the _new and _unread user values for the receipts - Delete delete_ids, if there are no links to them anymore - Reset _new and _unread values for the user we delete PHPBB3-10950
| | | * | [ticket/10950] Fix unit tests to reflect desired behaviourJoas Schilling2012-07-042-4/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://wiki.phpbb.com/Deleting_Private_Messages for further explanation. PHPBB3-10950
| | | * | [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()Joas Schilling2012-06-232-0/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Todo: Add cases to in which the msg is also deleted. PHPBB3-10950
| | | * | [ticket/10950] Correct comment for the second query.Andreas Fischer2012-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only undelivered messages are handled. PHPBB3-10950
| | | * | [ticket/10950] Add empty line to make unset() call more visible.Andreas Fischer2012-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10950