| 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
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11673
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPB3-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
|
| | | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
PHPBB3-11825
|
| | | |\ \ \ \ |
|
| | | | | |/ /
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
De-duplicating code from create_schema_files, mysql_upgrader.
New file phpbb/db/schema_data which contains all the current schema data.
New function in db_tools public static function get_dbms_type_map() to make the
type map available everywhere (without requiring $db be setup already)
PHPBB3-11755
|
| | | |\ \ \ \
| | | | | | |
| | | | | | | |
[ticket/11215] Correct paths when path info is used for controller access
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-11215
|
| | | | |/ / /
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11215
|
| | | |/ / /
| | | | |
| | | | |
| | | | | |
PHPBB3-11812
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11724
|
| | | | | |/
| | | |/|
| | | | |
| | | | | |
PHPBB3-11724
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
E.g. assign_vars
PHPBB3-11628
|