aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [feature/new-tz-handling] Correct capitalisation of phpbb_datetime.Chris Smith2012-03-141-1/+1
* [feature/new-tz-handling] Update user methods to use new date processing class.Chris Smith2012-03-141-63/+24
* [feature/new-tz-handling] Renamed old variables and removed extra conditional.Chris Smith2012-03-141-24/+19
* [feature/new-tz-handling] Use phpbb_datetime rather than phpbb_DateTime.Chris Smith2012-03-141-2/+2
* [feature/new-tz-handling] Wrapper around DateTime for new date time handling.Chris Smith2012-03-141-0/+160
* Merge branch 'develop-olympus' into developNils Adermann2011-12-013-1/+60
|\
| * Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-013-1/+60
| |\
| | * Merge remote-tracking branch 'github-bantu/ticket/10480' into prep-release-3....Nils Adermann2011-12-012-0/+59
| | |\
| | | * [ticket/10480] Add a build target for changelog building.Andreas Fischer2011-11-291-0/+6
| | | * [ticket/10480] Add a build script for exporting the changelog from tracker.Andreas Fischer2011-11-291-0/+53
| | * | Merge remote-tracking branch 'github-bantu/ticket/10502' into prep-release-3....Nils Adermann2011-12-011-1/+1
| | |\ \
| | | * | [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.Andreas Fischer2011-11-291-1/+1
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-291-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-291-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'nickvergessen/ticket/10501' into prep-release-3...Andreas Fischer2011-11-291-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [ticket/10501] Fix description of table prefixesJoas Schilling2011-11-281-2/+2
| | | |/
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-281-1/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-281-1/+0
| |\ \ \ | | |/ /
| | * | [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
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-0/+8
| |\ \ | | |/
| | * [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
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-5/+5
| |\ \ | | |/
| | * Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10Andreas Fischer2011-11-271-5/+5
| | |\
| | | * [ticket/10497] Fix SQL error when guest visits forum with unread topicrxu2011-11-271-5/+5
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-262-2/+9
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-262-2/+9
| |\ \ \ | | |/ /
| | * | [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-264-5/+12
| | |/
* | | Merge remote-tracking branch 'p/ticket/10481' into developAndreas Fischer2011-11-251-1/+10
|\ \ \
| * | | [ticket/10481] Use phar:// url for requiring goutte.Oleg Pudeyev2011-11-241-1/+1
| * | | [ticket/10481] Skip functional tests if phar extension is missing.Oleg Pudeyev2011-11-241-1/+10
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-251-11/+15
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'p/ticket/10280' into develop-olympusAndreas Fischer2011-11-251-11/+15
| |\ \ \
| | * | | [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
| |/ / /
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-254-0/+64
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-254-0/+64
| |\ \ \ | | | |/ | | |/|
| | * | Merge remote-tracking branch 'igorw/ticket/10483' into prep-release-3.0.10Oleg Pudeyev2011-11-254-0/+64
| | |\ \
| | | * | [ticket/10483] Fix test suite when running with MySQL strict modeIgor Wiedler2011-11-214-0/+64
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10484' into developOleg Pudeyev2011-11-247-38/+47
|\ \ \ \ \
| * | | | | [ticket/10484] Use variables for sql_build_query() callsJoas Schilling2011-11-217-38/+47
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-244-17/+25
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'nickvergessen/ticket/10485' into prep-release-3...Oleg Pudeyev2011-11-244-17/+25
| | |\ \ \ \
| | | * | | | [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632Joas Schilling2011-11-214-17/+25
| | | | |/ / | | | |/| |
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-241-0/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-241-0/+8
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'bantu/ticket/10486' into prep-release-3.0.10Oleg Pudeyev2011-11-241-0/+8
| | |\ \ \
| | | * | | [ticket/10486] Create git shortlog and git diff --stat in build script.Andreas Fischer2011-11-221-0/+8
| | | |/ /
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+6
|\ \ \ \ \ | |/ / / /