Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop | Nathan Guse | 2013-09-13 | 3 | -141/+280 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #1701 from EXreaction/ticket/11831 | David King | 2013-09-12 | 3 | -155/+299 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | [ticket/11831] getAttribute was replaced with attr | Nathan | 2013-09-06 | 1 | -1/+1 | |
| | * | | | | | | | [ticket/11831] Update fabpot/goutte to 1.0.* | Nathan | 2013-09-06 | 2 | -154/+298 | |
* | | | | | | | | | Merge pull request #1713 from Hardolaf/ticket/11836 | Nathan Guse | 2013-09-13 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ticket/11836] Fix subsilver fatal error | Joseph Warner | 2013-09-13 | 1 | -1/+3 | |
* | | | | | | | | | | Merge pull request #1711 from Hardolaf/ticket/11836 | Nathan Guse | 2013-09-13 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | / / / / / / | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | [ticket/11836] Fix fatal error on unsupported provider for auth link | Joseph Warner | 2013-09-13 | 1 | -1/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #1675 from marc1706/ticket/11809 | Nathan Guse | 2013-09-13 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | [ticket/11809] Ensure code.js is first script included after jQuery | Marc Alexander | 2013-09-13 | 2 | -2/+2 | |
* | | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop | Joas Schilling | 2013-09-13 | 7 | -19/+139 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | [ticket/11824] Fix comment wording | David King | 2013-09-13 | 1 | -1/+1 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | [ticket/11824] Revert changes in functions.php | David King | 2013-09-12 | 1 | -3/+3 | |
| * | | | | | | [ticket/11824] Reorganize test file | David King | 2013-09-12 | 1 | -18/+17 | |
| * | | | | | | [ticket/11824] Update language string for board settings | David King | 2013-09-12 | 1 | -1/+1 | |
| * | | | | | | [ticket/11824] Revert changes to functions_content.php | David King | 2013-09-12 | 1 | -2/+2 | |
| * | | | | | | [ticket/11824] Add tests for urls with mod_rewrite enabled | David King | 2013-09-06 | 1 | -3/+48 | |
| * | | | | | | [ticket/11824] Correct a comment | David King | 2013-09-06 | 1 | -1/+1 | |
| * | | | | | | [ticket/11824] Change copyright year in migration file | David King | 2013-09-06 | 1 | -1/+1 | |
| * | | | | | | [ticket/11824] Remove unused globals | David King | 2013-09-06 | 1 | -1/+1 | |
| * | | | | | | [ticket/11824] Fix smilies | David King | 2013-09-06 | 1 | -2/+2 | |
| * | | | | | | [ticket/11824] Fix logic | David King | 2013-09-06 | 2 | -3/+3 | |
| * | | | | | | [ticket/11824] Add option for mod_rewrite | David King | 2013-09-03 | 8 | -33/+109 | |
* | | | | | | | Merge pull request #1709 from rechosen/ticket/11843 | Nathan Guse | 2013-09-13 | 3 | -2/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ticket/11843] Added newlines and included numbers in the DEFINE vars test | rechosen | 2013-09-13 | 2 | -1/+5 | |
| * | | | | | | | [ticket/11843] Add checking DEFINE variables with underscores to template_test | rechosen | 2013-09-13 | 2 | -1/+3 | |
| * | | | | | | | [ticket/11843] The twig lexer fixes DEFINE variables with underscores again | rechosen | 2013-09-13 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #1622 from EXreaction/ticket/11373 | David King | 2013-09-12 | 5 | -2/+97 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373 | Nathan Guse | 2013-09-12 | 263 | -5514/+7398 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [ticket/11373] Use inheritdoc | Nathan Guse | 2013-08-28 | 1 | -13/+3 | |
| * | | | | | | | | [ticket/11373] Prune old read notifications with cron | Nathan Guse | 2013-07-27 | 5 | -5/+110 | |
* | | | | | | | | | Merge pull request #1689 from EXreaction/ticket/11727 | David King | 2013-09-12 | 2 | -7/+165 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | [ticket/11727] Fix indentation | Nathan Guse | 2013-09-12 | 1 | -1/+1 | |
| * | | | | | | | | [ticket/11727] Fix indentation | Nathan Guse | 2013-09-12 | 1 | -9/+9 | |
| * | | | | | | | | [ticket/11727] Template loader support for safe directories to load files from | Nathan Guse | 2013-09-02 | 2 | -7/+165 | |
* | | | | | | | | | Merge pull request #1620 from EXreaction/ticket/11745 | David King | 2013-09-12 | 7 | -35/+176 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ticket/11745] Correct language, coding guidelines | Nathan Guse | 2013-09-12 | 2 | -3/+5 | |
| * | | | | | | | | | [ticket/11745] Add test for group request approved | Nathan Guse | 2013-07-27 | 1 | -0/+29 | |
| * | | | | | | | | | Merge branch 'ticket/11744' of github.com:EXreaction/phpbb3 into ticket/11745 | Nathan Guse | 2013-07-27 | 3 | -168/+145 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ticket/11745] Group request approved notification | Nathan Guse | 2013-07-27 | 5 | -33/+143 | |
* | | | | | | | | | | | Merge pull request #1617 from EXreaction/ticket/11744 | David King | 2013-09-12 | 14 | -295/+657 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ticket/11744' of github.com:EXreaction/phpbb3 into ticket/11744 | Nathan Guse | 2013-07-28 | 3 | -168/+145 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | [ticket/11744] Helper function to assert notifications in base test | Nathan Guse | 2013-07-27 | 3 | -168/+145 | |
| | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | [ticket/11744] Cast to int | Nathan Guse | 2013-07-28 | 1 | -1/+1 | |
| * | | | | | | | | | | [ticket/11744] Inheritdoc | Nathan Guse | 2013-07-28 | 1 | -54/+7 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | [ticket/11744] Comments | Nathan Guse | 2013-07-27 | 1 | -1/+1 | |
| * | | | | | | | | | [ticket/11744] Language | Nathan Guse | 2013-07-27 | 1 | -1/+1 | |
| * | | | | | | | | | [ticket/11744] Copyright year | Nathan Guse | 2013-07-27 | 1 | -1/+1 | |
| * | | | | | | | | | [ticket/11744] Fix tests for postgresql | Nathaniel Guse | 2013-07-26 | 3 | -50/+31 | |
| * | | | | | | | | | [ticket/11744] spelling | Nathaniel Guse | 2013-07-26 | 1 | -1/+1 |