aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/new-tz-handling] Added phpbb_datetime::__toString().Chris Smith2012-03-141-0/+10
| | | | | | | New phpbb_datetime::__toString() magic method that formats the datetime according to the users default settings. PHPBB3-9558
* [feature/new-tz-handling] Comment and optimise phpbb_datetime::format().Chris Smith2012-03-141-3/+10
| | | | | | | | | - Added comments explaining the complex time computations for rendering relative date times. - Replaced some repeated method invokations with variables. PHPBB3-9558
* [feature/new-tz-handling] Correct typo in member comment.Chris Smith2012-03-141-1/+1
| | | | PHPBB3-9558
* [feature/new-tz-handling] Fixed bug with signature of user::create_datetime().Chris Smith2012-03-141-1/+1
| | | | | | First argument to user::create_datetime() should be optional. PHPBB3-9558
* [feature/new-tz-handling] Added a user::create_datetime() method.Chris Smith2012-03-141-0/+15
| | | | | | | New method which handles instantiating new phpbb_datetime objects in the context of the current user. PHPBB3-9558
* [feature/new-tz-handling] Replace user::$timezone with user::$tz.Chris Smith2012-03-141-6/+13
| | | | | | | user::$tz will store the new DateTimeZone object representing the users timezone instead of the existing user::$timezone and user::$dst combination. PHPBB3-9558
* [feature/new-tz-handling] Remove old user::$dst propertyChris Smith2012-03-141-1/+0
| | | | PHPBB3-9558
* [feature/new-tz-handling] Correct capitalisation of phpbb_datetime.Chris Smith2012-03-141-1/+1
| | | | PHPBB3-9558
* [feature/new-tz-handling] Update user methods to use new date processing class.Chris Smith2012-03-141-63/+24
| | | | | | | | | | | | | user::setup() now stores a DateTimeZone object in user::$timezone representing the users timezone. For backwards compatibility a numeric value in user/board_timezone will be converted into one of the legacy Etc/GMT±X timezones. This will be used until the user updates his/her timezone in the UCP. user::format_date() is now basically a legacy wrapper that transforms a UTC UNIX timestamp into a formatted localised date using phpbb_datetime::format(). PHPBB3-9558
* [feature/new-tz-handling] Renamed old variables and removed extra conditional.Chris Smith2012-03-141-24/+19
| | | | PHPBB3-9558
* [feature/new-tz-handling] Use phpbb_datetime rather than phpbb_DateTime.Chris Smith2012-03-141-2/+2
| | | | PHPBB3-9558
* [feature/new-tz-handling] Wrapper around DateTime for new date time handling.Chris Smith2012-03-141-0/+160
| | | | | | | Wrapped PHP's DateTime with some extensions for supporting phpBB's relative date formats and provided the DateTime::getTimestamp() method to PHP < 5.3. PHPBB3-9558
* Merge branch 'develop-olympus' into developNils Adermann2011-12-011-1/+1
|\ | | | | | | | | | | | | * develop-olympus: [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker. [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| * Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker. [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| | * Merge remote-tracking branch 'github-bantu/ticket/10502' into ↵Nils Adermann2011-12-011-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * github-bantu/ticket/10502: [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| | | * [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.Andreas Fischer2011-11-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10502
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-291-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10501] Fix description of table prefixes
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-291-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10501] Fix description of table prefixes
| | * | Merge remote-tracking branch 'nickvergessen/ticket/10501' into ↵Andreas Fischer2011-11-291-2/+2
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10501: [ticket/10501] Fix description of table prefixes
| | | * [ticket/10501] Fix description of table prefixesJoas Schilling2011-11-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | They must start with a letter, not an alphanumeric character PHPBB3-10501
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-281-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-281-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
| | * | [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.Andreas Fischer2011-11-281-1/+0
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-0/+8
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
| * | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-0/+8
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
| | * [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.Andreas Fischer2011-11-271-0/+8
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-5/+5
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| * | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-5/+5
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.10: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| | * Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10Andreas Fischer2011-11-271-5/+5
| | |\ | | | | | | | | | | | | | | | | * rxu/ticket/10497: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| | | * [ticket/10497] Fix SQL error when guest visits forum with unread topicrxu2011-11-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from the ticket PHPBB3-9008 fix. When topic marking was enabled for guests, and a guest visited a forum with a new topic which is marked unread, the built SQL missed an alias for a TOPICS_TABLE which resulted in the following error: Unknown column 't.topic_approved' in 'where clause' [1054] The fix is to add an alias for the table. PHPBB3-10497 PHPBB3-9008
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-261-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. Conflicts: phpBB/install/database_update.php
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-261-0/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-263-3/+10
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-251-11/+15
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10280] Change the display of user activation settings in the ACP.
| * | [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
| | | | | | | | | | | | | | | | | | Use a select box to be consistent with other settings. PHPBB3-10280
| * | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-244-17/+25
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.10: [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
| | * Merge remote-tracking branch 'nickvergessen/ticket/10485' into ↵Oleg Pudeyev2011-11-244-17/+25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10485: [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
| | | * [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632Joas Schilling2011-11-214-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the previous fix and fix it the way we did it in PHPBB3-10360 for 3.1 PHPBB3-6632 PHPBB3-10485
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10484' into developOleg Pudeyev2011-11-247-38/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10484: [ticket/10484] Use variables for sql_build_query() calls Conflicts: phpBB/includes/mcp/mcp_front.php
| * | | | [ticket/10484] Use variables for sql_build_query() callsJoas Schilling2011-11-217-38/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's easier for mods/extensions to extend the arrays. PHPBB3-10484
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+6
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+6
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * prep-release-3.0.10: [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
| | * | | Merge remote-tracking branch 'bantu/ticket/10488' into prep-release-3.0.10Oleg Pudeyev2011-11-231-1/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10488: [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
| | | * | | [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.Andreas Fischer2011-11-231-1/+6
| | | | |/ | | | |/| | | | | | | | | | | PHPBB3-10488
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| | * | | Merge remote-tracking branch 'bantu/ticket/10461' into prep-release-3.0.10Oleg Pudeyev2011-11-231-1/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10461: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| | | * | | [ticket/10461] Add a comment explaining the logic here.Oleg Pudeyev2011-11-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10461
| | | * | | [ticket/10461] Correct $log_count check in view_log() so we show logs again.Andreas Fischer2011-11-231-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We pass $log_count as false now when we do not need to know how many log entries there are. However when $log_count is false, $log_count == 0 will be true as well and thus we will return early with 0. PHPBB3-9874 PHPBB3-10461
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10479] Remove PostgreSQL version numbers from driver's language string