| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
|\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
# By David King (16) and others
# Via David King (13) and others
* 'develop' of github.com:phpbb/phpbb3: (67 commits)
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
[ticket/11215] Remove unnecessary comment
[ticket/11755] MySQL upgrader out of date
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
[ticket/11823] Set up nginx server to match PHP files with characters after .php
[ticket/11812] Fix empty define
[ticket/11818] Update Symfony dependencies to 2.3.*
[ticket/11791] Load adm/ events from styles/adm/event/
[ticket/11215] Fix helper_url_test.php tests
[ticket/11215] Add newline back to .htaccess, fix wording
[ticket/11215] Update comment in .htaccess
[ticket/11215] Uncomment rewrite rules in .htaccess
[ticket/11215] Make controller helper url() method use correct format
[ticket/11215] Add commented-out URL rewrite capability to .htaccess
[ticket/11821] Fix comma usage next to "You are receiving this notification".
[ticket/11769] Allow using 0 as poster name
[ticket/11769] Allow '0' as username
[ticket/11215] Use new URL structure for controllers
[ticket/11215] Everything appears to be working...
...
Conflicts:
phpBB/phpbb/template/twig/lexer.php
tests/template/template_test.php
|
| |\ \ \ \
| | | | | |
| | | | | | |
[ticket/11215] Correct paths when path info is used for controller access
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11215
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In tests, the old app.php?controller=foo structure was used. Instead
it should be app.php/foo.
PHPBB3-11215
|
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
PHPBB3-11812
|
| |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
* Hardolaf/ticket/11813:
[ticket/11813] Change mock auth provider to implement base provider
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11813
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* 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
|
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | | |
PHPBB3-11724
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
# 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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11628
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)
PHPBB3-11628
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument
PHPBB3-11628
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11628
|
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
No longer used since Twig was implemented.
PHPBB3-11628
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11816
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11816
|
| |/ / /
|/| | |
| | | |
| | | | |
PHPBB3-11816
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/11784:
[ticket/11784] Remove naming redundancy for event listeners
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11784
|
|\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 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
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 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
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11775
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11775
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11775
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11775
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11775
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
With the merge of https://github.com/phpbb/phpbb3/pull/1564 a new test has
been added. Renamed and moved the template listener file of that test to
comply with the new requirements.
PHPBB3-11777
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The tests written for extension template events did not follow the convention
and documentation of placing template event files in the events/ subdirectory.
Moved the files to this subdirectory so the tests succeed again.
PHPBB3-11777
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11701
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11701
|
| | |_|/ /
| |/| | |
| | | | |
| | | | | |
PHPBB3-11701
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
[ticket/11574] Remove install/udpate/new/ fallback from database_update.php
[ticket/11574] Do not display incompatible package note after successful update
[ticket/11574] Remove old "continue step"-message
[ticket/11574] Change order of files and database update
[ticket/11574] Fix more issues in the updater
[ticket/11574] Add trailing slash for consistency
[ticket/11574] Fix table prefix in database updater
[ticket/11574] Fix various path issues in the updater
[ticket/11574] Make install language filename less crazy
[ticket/11574] Use alternate DI config file for updater
[ticket/11574] Include normalizer so it loads form the correct directory
[ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
[ticket/11574] Use log object instead of old function
[ticket/11574] Include vendor into update packages
[ticket/11574] Create phpbb_log object before using it.
[ticket/11574] Add correct language parameter to return links
[ticket/11574] Use request object rather then request_var function
[ticket/11574] Load new language files whenever possible
[ticket/11574] Require new files in install/index.php and add a class loader
[ticket/11574] Require new files in database_update.php and add a class loader
...
|
| |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* phpbb/develop: (130 commits)
[ticket/11638] Changed the layout to match the other similar commits
[ticket/11640] removed the space that I wonder what it was doing there.
[ticket/11749] Move event after all template data has been defined
[ticket/10917] Variable used only once so delete it
[ticket/10917] Revert use of phpbb wrapper
[ticket/11749] Template events for topic_list_row_pre/append
[ticket/11749] PHP Events for viewforum.php
[ticket/11749] PHP Events for search.php
[ticket/11740] Update FAQ to include Ideas Centre
[ticket/11062] If user's language is english there is no further work needed
[ticket/11062] Load new strings from user's language file if provided
[ticket/10917] Using phpbb wrapper
[ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
[ticket/11741] Fix empty brackets and remove bullet
[ticket/11638] Removed the unneeded reset.
[ticket/11638] Use the $parse_flags like the other commits
[ticket/11638] Reverted to use the $parse tags way as the other ones
[ticket/11638] Updated: bitwise $parse_flags use optionset()
[ticket/11656] Made the check for the bitfield just like other PR's
[ticket/11667] Use @inheritdoc
...
|
| |\ \ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* upstream/develop: (575 commits)
[ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
[ticket/11696] Move file to new directory
[ticket/11696] Rename constructor to __construct()
[ticket/11696] Remove manual loading of db_tools in extension controller test
[ticket/11696] Rename db_tools.php so it can be autoloaded
[ticket/11698] Moving all autoloadable files to phpbb/
[ticket/11694] Do not locate assets with root path
[ticket/11692] Don't update search_type in dev migration if already appended
[ticket/11675] Fix template loop
[ticket/11690] Old module class names may get autoloaded by class_exists
[ticket/9649] Display information on index for moderators on unapproved posts
[ticket/10999] Fix assets_version in ACP
[prep-release-3.0.12] More changelog items for the 3.0.12 release.
[ticket/11687] Add assets_version to phpbb_config
[ticket/11686] Not checking for phpBB Debug errors on functional tests
[ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
[ticket/11674] Do not include vendor folder if there are no dependencies.
[ticket/11685] Remove logout confirmation page
[ticket/11684] Remove useless confirmation page after login and admin login
[ticket/9657] Define user before injecting
...
Conflicts:
phpBB/includes/functions_container.php
phpBB/install/database_update.php
phpBB/install/index.php
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11574
|