Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ... | Joseph Warner | 2013-09-06 | 239 | -5469/+5282 |
|\ | |||||
| * | Merge remote-tracking branch 'EXreaction/ticket/11791' into develop | David King | 2013-09-02 | 5 | -5/+5 |
| |\ | |||||
| | * | [ticket/11791] Load adm/ events from styles/adm/event/ | Nathan Guse | 2013-09-02 | 5 | -5/+5 |
| * | | Merge remote-tracking branch 'EXreaction/ticket/11818' into develop | David King | 2013-09-02 | 2 | -160/+349 |
| |\ \ | |||||
| | * | | [ticket/11818] Update Symfony dependencies to 2.3.* | Nathan Guse | 2013-09-02 | 2 | -160/+349 |
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11755' into develop | David King | 2013-09-02 | 4 | -2786/+1456 |
| |\ \ \ | |||||
| | * | | | [ticket/11755] MySQL upgrader out of date | Nathan Guse | 2013-09-02 | 4 | -2786/+1456 |
| | |/ / | |||||
| * | | | Merge pull request #1102 from imkingdavid/ticket/11215 | Nathan Guse | 2013-09-02 | 8 | -54/+117 |
| |\ \ \ | |||||
| | * | | | [ticket/11215] Remove unnecessary comment | David King | 2013-09-02 | 1 | -4/+0 |
| | * | | | Merge branch 'develop' into ticket/11215 | David King | 2013-09-02 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * | | | | [ticket/11215] Fix helper_url_test.php tests | David King | 2013-09-02 | 2 | -16/+18 |
| | * | | | | [ticket/11215] Add newline back to .htaccess, fix wording | David King | 2013-09-02 | 1 | -3/+3 |
| | * | | | | [ticket/11215] Update comment in .htaccess | David King | 2013-09-02 | 1 | -4/+4 |
| | * | | | | [ticket/11215] Uncomment rewrite rules in .htaccess | David King | 2013-09-02 | 1 | -4/+4 |
| | * | | | | [ticket/11215] Make controller helper url() method use correct format | David King | 2013-09-02 | 2 | -16/+18 |
| | * | | | | [ticket/11215] Add commented-out URL rewrite capability to .htaccess | David King | 2013-09-02 | 2 | -4/+34 |
| | * | | | | Merge remote-tracking branch 'upstream/develop' into ticket/11215 | David King | 2013-09-02 | 6 | -36/+17 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | [ticket/11215] Use new URL structure for controllers | David King | 2013-08-31 | 1 | -5/+5 |
| | * | | | | [ticket/11215] Everything appears to be working... | David King | 2013-08-31 | 1 | -19/+9 |
| | * | | | | Merge branch 'develop' into ticket/11215 | David King | 2013-08-31 | 448 | -2841/+3693 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge branch 'develop' into ticket/11215 | David King | 2013-07-14 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 13 | -60/+229 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 128 | -1606/+6060 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 4 | -34/+205 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | [ticket/11215] Don't try to use when it isn't there | David King | 2013-07-13 | 1 | -2/+2 |
| | * | | | | | | | | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 45 | -304/+970 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | [ticket/11215] Don't try to correct paths during tests | David King | 2013-07-12 | 1 | -1/+1 |
| | * | | | | | | | | | [ticket/11215] use global | David King | 2013-07-11 | 1 | -2/+2 |
| | * | | | | | | | | | Merge branch 'develop' into ticket/11215 | David King | 2013-07-11 | 94 | -2708/+3110 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | [ticket/11215] Correct for different URL but same path info | David King | 2013-07-06 | 1 | -1/+10 |
| | * | | | | | | | | | | [ticket/11215] A few minor optimizations for phpbb_get_web_root_path() | David King | 2013-07-06 | 1 | -8/+4 |
| | * | | | | | | | | | | [ticket/11215] Correct paths when path info is used for controller access | David King | 2013-07-06 | 3 | -14/+52 |
| * | | | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11812' into develop | Andreas Fischer | 2013-09-03 | 3 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | [ticket/11812] Fix empty define | Nathan Guse | 2013-09-02 | 3 | -2/+4 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-09-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/11823' into develop-olympus | Andreas Fischer | 2013-09-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | [ticket/11823] Set up nginx server to match PHP files with characters after .php | David King | 2013-09-02 | 1 | -1/+1 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-09-02 | 5 | -4/+15 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-09-02 | 5 | -5/+14 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'nickvergessen/ticket/11769' into prep-release-3... | Andreas Fischer | 2013-09-02 | 5 | -5/+14 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | [ticket/11769] Allow using 0 as poster name | Joas Schilling | 2013-09-02 | 1 | -1/+1 |
| | | | * | | | | | | | | | [ticket/11769] Allow '0' as username | Joas Schilling | 2013-09-02 | 1 | -1/+1 |
| | | | * | | | | | | | | | [ticket/11769] Allow '0' as username in notification mails | Joas Schilling | 2013-08-23 | 3 | -3/+3 |
| | | | * | | | | | | | | | [ticket/11769] Fix language issues in the doc blocks | Joas Schilling | 2013-08-23 | 2 | -6/+7 |
| | | | * | | | | | | | | | [ticket/11769] Correctly supply the post author's username in posting.php | Joas Schilling | 2013-08-23 | 2 | -2/+10 |
| | | |/ / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch 'develop-olympus' into develop | Joas Schilling | 2013-09-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/11821' into develop-olympus | Joas Schilling | 2013-09-02 | 3 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | [ticket/11821] Fix comma usage next to "You are receiving this notification". | Andreas Fischer | 2013-09-02 | 3 | -3/+3 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge remote-tracking branch 'Hardolaf/ticket/11813' into develop | Andreas Fischer | 2013-09-01 | 1 | -32/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | [ticket/11813] Change mock auth provider to implement base provider | Joseph Warner | 2013-08-27 | 1 | -32/+2 |