| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
To prevent the underscore in DEFINE variables from being forgotten again,
the template tests now test INCLUDEing a file based on the contents of a
DEFINE variable with underscores in it.
PHPBB3-11843
|
| |\ \ \ \ \
| | | | | | |
| | | | | | | |
Group join approved notification
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11745
|
| |\ \ \ \ \ \
| | |/ / / / /
| | | | | | | |
[ticket/11744] Group join request notification
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This also fixes tests
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11744
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
# By Joseph Warner (187) and others
# Via Nathan Guse (6) and others
* 'develop' of github.com:phpbb/phpbb3: (195 commits)
[ticket/11828] Fix greedy operators in lexer
[ticket/11835] Fix ucp_auth_link adding in migration
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
[ticket/develop/11832] Fix path detection
[feature/oauth] Fix tabindex
[ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
[ticket/11829] Use report_closed to determine status in MCP report_details
[feature/oauth] Fix bug on ucp_auth_link related to error display
[feature/oauth] More small fixes
[feature/oauth] More minor changes from review
[feature/oauth] Fix small bug introduced by update in OAuth library
[feature/oauth] Fix small issues on ucp pages
[feature/oauth] Fix typo in OAuth logout method
[feature/oauth] Make token storage service ignorant
[feature/oauth] Update oauth::logout() to use clearAllTokens()
[feature/oauth] Update storage implementation due to inteface change
[feature/oauth] Update lusitanian/oauth to stable branch
[ticket/11822] Use namespace lookup order for asset loading
[feature/oauth] Update comment on oauth service exception
[feature/oauth] Forgot to remove placeholder comment
...
Conflicts:
phpBB/phpbb/template/twig/lexer.php
tests/template/template_test.php
|
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Use lazy operators and use stricter validation
PHPBB3-11828
|
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
feature/oauth
Conflicts:
phpBB/composer.json
phpBB/composer.lock
phpBB/develop/create_schema_files.php
phpBB/includes/ucp/ucp_register.php
PHPBB3-11673
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|