aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * [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
| | * [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-232-13/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * 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-232-13/+24
| |\ \ | | |/ | | | | | | | | | | | | * 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
| | * [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-232-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | 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-2212-23/+24
|\ \ \ | | | | | | | | Ticket/10990
| * | | [ticket/10990] Changes for developNathan Guse2012-07-226-28/+28
| | | | | | | | | | | | | | | | 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-2216-55/+56
| | | | | | | | | | | | | | | | PHPBB3-10990
* | | | Merge remote-tracking branch 'github-igorw/ticket/11012' into developNils Adermann2012-07-216-29/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 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] 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-211-40/+40
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * 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-211-40/+40
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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-211-83/+122
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-211-83/+122
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-211-83/+122
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-32/+44
| | | | | | | | | | | | | | | | 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] 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] 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 pull request #843 from nickvergessen/feature/new-tz-handlingNils Adermann2012-07-1912-114/+598
|\ \ \ \ | | | | | | | | | | Feature/new tz handling
| * | | | [feature/new-tz-handling] Don't use global user but make it a parameterJoas Schilling2012-07-195-8/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | [feature/new-tz-handling] Fall back to UTC, if the timezone is invalidJoas Schilling2012-07-192-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should avoid problems, when the board files are updated but database isn't. PHPBB3-9558
| * | | | [feature/new-tz-handling] Add previous selected value to validation if validJoas Schilling2012-07-192-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also add the selected timezone if we can create an object with it. DateTimeZone::listIdentifiers seems to not add all identifiers to the list, because some are only kept for backward compatible reasons. If the user has a deprecated value, we add it here, so it can still be kept. Once the user changed his value, there is no way back to deprecated values. PHPBB3-9558
| * | | | [feature/new-tz-handling] Display suggestion when a different value is selectedJoas Schilling2012-07-191-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | [feature/new-tz-handling] Remove additional marking of selected itemsJoas Schilling2012-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | [feature/new-tz-handling] Move update helper function to new classJoas Schilling2012-07-181-0/+112
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | [feature/new-tz-handling] Delete old variable which is not used anymoreJoas Schilling2012-07-181-3/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | [feature/new-tz-handling] Rename $user->tz back to $user->timezoneJoas Schilling2012-07-185-13/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | [feature/new-tz-handling] Remove "timezone might be numeric"Joas Schilling2012-07-182-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we updated all of the used values, there really shouldn't be one anymore. PHPBB3-9558
| * | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-07-1824-175/+1273
| |\ \ \ \ | | | | | | | | | | | | | | | | | | feature/new-tz-handling
| * | | | | [feature/new-tz-handling] Properly name new timezone selection functionJoas Schilling2012-07-175-20/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked the old one as deprecated and made it using the new function. PHPBB3-9558
| * | | | | [feature/new-tz-handling] Use tmp variable for user timezoneJoas Schilling2012-07-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | | [feature/new-tz-handling] Allow phpbb prefix for user data validation functionsJoas Schilling2012-07-161-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | | [feature/new-tz-handling] Require user argument on phpbb_datetimeJoas Schilling2012-07-163-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9558
| * | | | | [feature/new-tz-handling] Fix code and doc layoutJoas Schilling2012-06-202-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9558
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 11:49:01 +0000