aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11809] Ensure code.js is first script included after jQueryMarc Alexander2013-09-132-2/+2
| | | | | | | | | | | | The file core.js sets up most of the AJAX and jQuery related framework for phpBB. Due to this, it needs to be included before any other javascript file in order to ensure that subsequent files can use the phpBB variables and functions. Currently, it is however loaded with INCLUDEJS in overall_footer which causes it to be loaded after every other javascript file except for the style specific ajax.js. This causes every javascript file that is included before core.js and is using the phpBB AJAX functions or variables to break. PHPBB3-11809
* Merge remote-tracking branch 'rechosen/ticket/11792' into developJoas Schilling2013-08-221-1/+16
|\ | | | | | | | | | | | | * 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 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
* | [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-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
| * | [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-182-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-132-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | [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
| * | | | | | | [ticket/11770] Fix class name for pm listVjacheslav Trushkin2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11770
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-151-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-151-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic
| | * | | | | [ticket/11775] Fix error when moving the last post to another topicJoas Schilling2013-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11775
| | * | | | | Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into ↵Andreas Fischer2013-08-012-4/+22
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data. [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'" [ticket/11752] HTTP -> HTTPs in email/installed.txt
* | | \ \ \ \ \ Merge pull request #1643 from rechosen/ticket/11777Joas Schilling2013-08-121-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11777] Search for template listeners in the php event listeners way
| * | | | | | | | [ticket/11777] Require a suffix of '_listener' on extension template listenersrechosen2013-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To further mirror the file name and location requirements for php template event listeners, require extension template event listener files to follow the '<event name>_listener.html' naming format. PHPBB3-11777
| * | | | | | | | [ticket/11777] Rename the extension template listener subdirectory to 'event/'rechosen2013-08-121-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per suggestion of EXreaction and nickvergessen, do not look for extension template event listeners in styles/[style]/template/events/ but in styles/[style]/template/event/ (without the trailing 's') to match the way phpBB looks for php template event listeners. PHPBB3-11777
| * | | | | | | | [ticket/11777] Add subdirectory 'events/' to the template event search pathrechosen2013-08-121-3/+8
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the twig template engine look in the events/ subdirectory instead of the main styles/[style]/template/ directory for extension template events. Note that it does _not_ look recursively! PHPBB3-11777
* | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11781' into developAndreas Fischer2013-08-121-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11781: [ticket/11781] Include func update_post_information()
| * | | | | | | | [ticket/11781] Include func update_post_information()Vjacheslav Trushkin2013-08-111-0/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include functions_posting before using functions defined in that file PHPBB3-11781
* | | | | | | | [ticket/11780] Remove references to unused imagesVjacheslav Trushkin2013-08-112-60/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11780
* | | | | | | | [ticket/11780] Remove unused imagesVjacheslav Trushkin2013-08-116-0/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-11780
* | | | | | | Merge pull request #1633 from nickvergessen/ticket/11751Nathan Guse2013-08-091-0/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11751] Add mcp modules for softdelete on update
| * | | | | | | [ticket/11751] Add mcp modules for softdelete on updateJoas Schilling2013-07-311-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11751
* | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11701' into developJoas Schilling2013-08-092-10/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11701: [ticket/11701] New line at EOF [ticket/11701] Test events in loops [ticket/11701] Refix regex for appending |length [ticket/11701] Fix regex for appending |length [ticket/11701] Fix loops var check [ticket/11701] Remove useless str_replace [ticket/11701] Loop variables are not passed correctly to events
| * | | | | | | | [ticket/11701] Refix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| * | | | | | | | [ticket/11701] Fix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| * | | | | | | | [ticket/11701] Fix loops var checkNathaniel Guse2013-07-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| * | | | | | | | [ticket/11701] Remove useless str_replaceNathaniel Guse2013-07-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11701
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 23:28:27 +0000