aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11069] Add closing span back to credit line in subsilver2 simple footerAndreas Fischer2012-08-261-1/+1
| | | | | | Regression from 0ceb77fb995e7433242a87c1fe0c22840a2b23e1. PHPBB3-11069
* Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-08-202-2/+8
|\ | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [prep-release-3.0.11] Bumping version number for 3.0.11 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * [prep-release-3.0.11] Bumping version number for 3.0.11 final.Andreas Fischer2012-08-204-5/+11
| |
* | Merge remote-tracking branch 'igorw/ticket/11059' into develop-olympusAndreas Fischer2012-08-191-1/+1
|\ \ | | | | | | | | | | | | * igorw/ticket/11059: [ticket/11059] Use https for the README logo
| * | [ticket/11059] Use https for the README logoIgor Wiedler2012-08-191-1/+1
| | | | | | | | | | | | | | | | | | It's causing troubles since we moved the site to HTTPS PHPBB3-11059
* | | Merge PR #950 branch 'dhruvgoel92/ticket/10943' into develop-olympusOleg Pudeyev2012-08-183-1/+4
|\ \ \ | |/ / |/| | | | | | | | | | | * dhruvgoel92/ticket/10943: [ticket/10943] displays searched query in search result [ticket/10943] use keywords variable to display in search box
| * | [ticket/10943] displays searched query in search resultDhruv Goel2012-08-113-0/+3
| | | | | | | | | | | | | | | | | | | | | Search backend displays an additional normalized search query just above the ignored words. PHPBB3-10943
| * | [ticket/10943] use keywords variable to display in search boxDhruv Goel2012-08-111-1/+1
|/ / | | | | | | | | | | | | $keywords which contains the string as entered by the user should be used to display in search box instead of search_query. PHPBB3-10943
* | Merge remote-tracking branch 'Fyorl/ticket/11034' into develop-olympusAndreas Fischer2012-07-301-4/+2
|\ \ | | | | | | | | | | | | * Fyorl/ticket/11034: [ticket/11034] Re-arranged install order to emulate real install
| * | [ticket/11034] Re-arranged install order to emulate real installFyorl2012-07-301-4/+2
|/ / | | | | | | PHPBB3-11034
* | 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 '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 '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 '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 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 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
| | * [ticket/10950] Select the correct columns in SQL queries.Andreas Fischer2012-06-231-2/+2
| | | | | | | | | | | | PHPBB3-10950
| | * [ticket/10950] Use a variable for the private message id.Andreas Fischer2012-06-231-6/+8
| | | | | | | | | | | | PHPBB3-10950
| | * [ticket/10950] Move array initialisation to the front.Andreas Fischer2012-06-231-1/+2
| | | | | | | | | | | | PHPBB3-10950
| | * [ticket/10950] Remove redundant if statement.Andreas Fischer2012-06-231-12/+9
| | | | | | | | | | | | | | | | | | We already know author_id and folder_id. PHPBB3-10950
| | * [ticket/10950] Fix SQL coding style (indentation) in second SQL query.Andreas Fischer2012-06-231-1/+1
| | | | | | | | | | | | PHPBB3-10950
| | * [ticket/10950] Use proper ' in order to fix comment.Andreas Fischer2012-06-231-1/+1
| | | | | | | | | | | | PHPBB3-10950
* | | Merge remote-tracking branch 'github-bantu/ticket/11009' into develop-olympusNils Adermann2012-07-211-5/+16
|\ \ \ | | | | | | | | | | | | | | | | * github-bantu/ticket/11009: [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
| * | | [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.Andreas Fischer2012-07-211-5/+16
|/ / / | | | | | | | | | PHPBB3-11009
* | | Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-191-30/+37
|\ \ \ | |/ / | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10441] Make CDB linking more consistent [ticket/10441] Typo [ticket/10441] Update to docs/README.html
| * | Merge remote-tracking branch 'github-noxwizard/ticket/10441' into ↵Nils Adermann2012-07-191-30/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.11 * github-noxwizard/ticket/10441: [ticket/10441] Make CDB linking more consistent [ticket/10441] Typo [ticket/10441] Update to docs/README.html
generated by cgit v1.2.1 (git 2.21.0) at 2026-02-06 11:26:12 +0000