aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into ticket/11215David King2013-08-31448-2841/+3693
|\
| * Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-303-3/+15
| |\ | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11724: [ticket/11724] Handle ELSE IF separately [ticket/11724] Replace spaces with tabs [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
| | * [ticket/11724] Handle ELSE IF separatelyNathan Guse2013-08-281-5/+7
| | | | | | | | | | | | PHPBB3-11724
| | * [ticket/11724] Replace spaces with tabsNathan Guse2013-07-281-1/+1
| | | | | | | | | | | | PHPBB3-11724
| | * [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-273-1/+11
| | | | | | | | | | | | PHPBB3-11724
| * | Merge remote-tracking branch 'EXreaction/ticket/11628' into developDavid King2013-08-2928-1373/+275
| |\ \
| | * | [ticket/11628] Create base template class with common functionsNathan Guse2013-08-282-179/+149
| | | | | | | | | | | | | | | | | | | | | | | | E.g. assign_vars PHPBB3-11628
| | * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-28152-646/+1036
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| * | | Merge remote-tracking branch 'remotes/brunoais/ticket/11803' into developNathan Guse2013-08-281-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * remotes/brunoais/ticket/11803: [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
| | * | | [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0brunoais2013-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When it was made the min number of options allowed to a user was 1 but 0 can also be used as it means unlimited. PHPBB3-11803
| * | | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-261-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11799] Send anti abuse headers in "new password" emails.
| | * \ \ \ Merge remote-tracking branch 'bantu/ticket/11799' into develop-olympusJoas Schilling2013-08-261-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11799: [ticket/11799] Send anti abuse headers in "new password" emails.
| | | * | | | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-11799
| * | | | | Merge remote-tracking branch 'rechosen/ticket/11792' into developJoas Schilling2013-08-224-1/+127
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rechosen/ticket/11792: [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
| | * | | | | [ticket/11792] Add functional test for var lang_set_ext of core.user_setuprechosen2013-08-223-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure that the new lang_set_ext variable available with the core.user_setup event works properly, a functional test was added. It overwrites the value of the 'SKIP' language key, which is assumed to remain in use for some time to come. PHPBB3-11792
| | * | | | | [ticket/11792] Add performance remark to core.user_setup event PHPDocrechosen2013-08-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent extension authors from loading all their translations globally, a remark on this was added to the PHPDoc documentation of the core.user_setup event. PHPBB3-11792
| | * | | | | [ticket/11792] Add variable 'lang_set_ext' to event core.user_setuprechosen2013-08-191-1/+13
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow extensions to add global language strings just like mods can, add the 'lang_set_ext' variable to the core.user_setup event. It requires an ext_name to be specified as well as a lang_set, and loads the specified lang_set in the context of the extension. PHPBB3-11792
| * | | | | Merge remote-tracking branch 'mvinny/ticket/11804' into developAndreas Fischer2013-08-201-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/11804: [ticket/11804] Remove </li> from overall_header which was not open
| | * | | | | [ticket/11804] Remove </li> from overall_header which was not openMarcus Vinny2013-08-201-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11804
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-200-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11802] replace $browser with $user->browser Conflicts: phpBB/download/file.php
| | * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-201-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11802] replace $browser with $user->browser
| | | * \ \ \ Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12Andreas Fischer2013-08-201-1/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11802: [ticket/11802] replace $browser with $user->browser
| | | | * | | | [ticket/11802] replace $browser with $user->browserDhruv2013-08-201-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-11802
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-191-5/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11801] removed some whitespace and added missing semi colon's in css Conflicts: phpBB/styles/prosilver/theme/colours.css
| | * | | | | Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-olympusAndreas Fischer2013-08-192-18/+18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prosk8er/ticket/11801: [ticket/11801] removed some whitespace and added missing semi colon's in css
| | | * | | | | [ticket/11801] removed some whitespace and added missing semi colon's in cssProsk8er2013-08-192-18/+18
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-11801
| * | | | | | Merge remote-tracking branch 'Elsensee/ticket/11760' into developDhruv2013-08-1936-36/+36
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oliver Schramm # Via Oliver Schramm * Elsensee/ticket/11760: [ticket/11760] Use phpbb_version_compare() wrapper
| | * | | | | [ticket/11760] Use phpbb_version_compare() wrapperOliver Schramm2013-08-0236-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11760
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-182-2/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11789] Remove inline color in memberlist_view Conflicts: phpBB/styles/subsilver2/template/memberlist_view.html
| | * | | | | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-182-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11789: [ticket/11789] Remove inline color in memberlist_view
| | | * | | | | [ticket/11789] Remove inline color in memberlist_viewVjacheslav Trushkin2013-08-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11789
| * | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-184-5/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11789] Remove colors from HTML code Conflicts: phpBB/styles/subsilver2/template/ucp_pm_history.html
| | * | | | | | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-184-5/+13
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11789: [ticket/11789] Remove colors from HTML code
| | | * | | | | [ticket/11789] Remove colors from HTML codeVjacheslav Trushkin2013-08-144-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11789
| * | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11796' into developAndreas Fischer2013-08-184-53/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11796: [ticket/11796] Replace pagination with pagination.html
| | * | | | | | | [ticket/11796] Replace pagination with pagination.htmlVjacheslav Trushkin2013-08-164-53/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11796
| * | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11779' into developAndreas Fischer2013-08-181-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11779: [ticket/11779] Fix unapproved messages class name
| | * | | | | | | | [ticket/11779] Fix unapproved messages class nameVjacheslav Trushkin2013-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11779
| * | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11800' into developAndreas Fischer2013-08-183-4/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11800: [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html
| | * | | | | | | | | [ticket/11800] Fix scripts variable in subsilver simple_footerVjacheslav Trushkin2013-08-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11800
| | * | | | | | | | | [ticket/11800] Fix JavaScript in simple_footer.htmlVjacheslav Trushkin2013-08-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include forum_fn.js via INCLUDEJS Move $SCRIPTS after footer event, allowing extensions to include scripts Use correct template variable for including scripts PHPBB3-11800
| | * | | | | | | | | [ticket/11800] Remove forum_fn from memberlist_search.htmlVjacheslav Trushkin2013-08-171-1/+0
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11800
| * | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11754' into developAndreas Fischer2013-08-183-6/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11754: [ticket/11754] Remove styleswitcher leftovers
| | * | | | | | | | | [ticket/11754] Remove styleswitcher leftoversVjacheslav Trushkin2013-07-303-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11754
| * | | | | | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/11784' into developDhruv2013-08-1814-3/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Matt Friedman # Via Matt Friedman * VSEphpbb/ticket/11784: [ticket/11784] Remove naming redundancy for event listeners
| | * | | | | | | | | | [ticket/11784] Remove naming redundancy for event listenersMatt Friedman2013-08-1314-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11784
| * | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-161-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | / / / / / / | | | |_|_|/ / / / / / | | |/| | | | | | | | * develop-olympus: [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
| | * | | | | | | | | Merge remote-tracking branch 'rechosen/ticket/11794' into develop-olympusAndreas Fischer2013-08-161-10/+10
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rechosen/ticket/11794: [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
| | | * | | | | | | | | [ticket/11794] Add missing array element commas to docs/coding-guidelines.htmlrechosen2013-08-161-10/+10
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the coding guidelines document prescribes "commas after every array element", it contains several example code fragments with array elements not terminated by a comma. This commit fixes that. PHPBB3-11794
| * | | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11770' into developAndreas Fischer2013-08-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11770: [ticket/11770] Fix class name for pm list
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-12 07:35:48 +0000