aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/develop' into ticket/11215David King2013-09-025-4/+15
|\
| * Merge branch 'develop-olympus' into developAndreas Fischer2013-09-025-4/+15
| |\
| | * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-025-5/+14
| | |\
| | | * [ticket/11769] Allow using 0 as poster nameJoas Schilling2013-09-021-1/+1
| | | * [ticket/11769] Allow '0' as usernameJoas Schilling2013-09-021-1/+1
| | | * [ticket/11769] Allow '0' as username in notification mailsJoas Schilling2013-08-233-3/+3
| | | * [ticket/11769] Fix language issues in the doc blocksJoas Schilling2013-08-232-6/+7
| | | * [ticket/11769] Correctly supply the post author's username in posting.phpJoas Schilling2013-08-232-2/+10
| | * | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
* | | | [ticket/11215] Everything appears to be working...David King2013-08-311-19/+9
* | | | Merge branch 'develop' into ticket/11215David King2013-08-31350-2426/+1904
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-301-3/+6
| |\ \ \
| | * | | [ticket/11724] Handle ELSE IF separatelyNathan Guse2013-08-281-5/+7
| | * | | [ticket/11724] Replace spaces with tabsNathan Guse2013-07-281-1/+1
| | * | | [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-271-1/+2
| * | | | [ticket/11628] Create base template class with common functionsNathan Guse2013-08-282-179/+149
| * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-28122-584/+742
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'remotes/brunoais/ticket/11803' into developNathan Guse2013-08-281-1/+1
| | |\ \ \ \
| | | * | | | [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0brunoais2013-08-261-1/+1
| | * | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-261-0/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| | | * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-201-1/+1
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | [ticket/11802] replace $browser with $user->browserDhruv2013-08-201-1/+1
| | * | | | | Merge remote-tracking branch 'rechosen/ticket/11792' into developJoas Schilling2013-08-221-1/+16
| | |\ \ \ \ \
| | | * | | | | [ticket/11792] Add performance remark to core.user_setup event PHPDocrechosen2013-08-191-0/+3
| | | * | | | | [ticket/11792] Add variable 'lang_set_ext' to event core.user_setuprechosen2013-08-191-1/+13
| | | | |_|/ / | | | |/| | |
| | * | | | | [ticket/11804] Remove </li> from overall_header which was not openMarcus Vinny2013-08-201-1/+0
| | * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-191-5/+5
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | [ticket/11801] removed some whitespace and added missing semi colon's in cssProsk8er2013-08-192-18/+18
| | * | | | | Merge remote-tracking branch 'Elsensee/ticket/11760' into developDhruv2013-08-1936-36/+36
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | [ticket/11760] Use phpbb_version_compare() wrapperOliver Schramm2013-08-0236-36/+36
| | * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-182-2/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-182-2/+2
| | | |\ \ \ \
| | | | * | | | [ticket/11789] Remove inline color in memberlist_viewVjacheslav Trushkin2013-08-182-2/+2
| | * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-184-5/+13
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-184-5/+13
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | [ticket/11789] Remove colors from HTML codeVjacheslav Trushkin2013-08-144-5/+13
| | * | | | | | Merge remote-tracking branch 'cyberalien/ticket/11796' into developAndreas Fischer2013-08-184-53/+4
| | |\ \ \ \ \ \
| | | * | | | | | [ticket/11796] Replace pagination with pagination.htmlVjacheslav Trushkin2013-08-164-53/+4
| | * | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11779' into developAndreas Fischer2013-08-181-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | [ticket/11779] Fix unapproved messages class nameVjacheslav Trushkin2013-08-111-2/+2
| | * | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11800' into developAndreas Fischer2013-08-183-4/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | [ticket/11800] Fix scripts variable in subsilver simple_footerVjacheslav Trushkin2013-08-171-1/+2
| | | * | | | | | | | [ticket/11800] Fix JavaScript in simple_footer.htmlVjacheslav Trushkin2013-08-171-2/+4
| | | * | | | | | | | [ticket/11800] Remove forum_fn from memberlist_search.htmlVjacheslav Trushkin2013-08-171-1/+0
| | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11754' into developAndreas Fischer2013-08-183-6/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | [ticket/11754] Remove styleswitcher leftoversVjacheslav Trushkin2013-07-303-6/+0
| | * | | | | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/11784' into developDhruv2013-08-182-2/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [ticket/11784] Remove naming redundancy for event listenersMatt Friedman2013-08-132-2/+1
| | * | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-161-10/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | / / / / / | | | | |_|_|/ / / / / | | | |/| | | | | | |
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-19 03:37:01 +0000