| Commit message (Expand) | Author | Age | Files | Lines |
* | [feature/oauth] ACP options for OAuth, needs some work | Joseph Warner | 2013-07-23 | 1 | -0/+9 |
* | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-07-13 | 5 | -10/+10 |
|\ |
|
| * | Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release... | Nils Adermann | 2013-07-13 | 5 | -10/+10 |
| |\ |
|
| | * | [ticket/11112] Do not change opensource.org link to https | Marc Alexander | 2013-07-12 | 1 | -1/+1 |
| | * | [ticket/11112] Use https for user-visible links to phpbb.com | Marc Alexander | 2013-07-12 | 5 | -10/+10 |
* | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-07-13 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". | Andreas Fischer | 2013-07-13 | 1 | -1/+1 |
| |/ |
|
* | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657 | Joas Schilling | 2013-07-13 | 5 | -7/+8 |
|\ \ |
|
| * | | [ticket/11662] Typos: occured -> occurred | Andreas Fischer | 2013-07-12 | 1 | -1/+1 |
| * | | Merge branch 'develop-olympus' into develop | Nathaniel Guse | 2013-07-12 | 3 | -5/+5 |
| |\ \
| | |/ |
|
| | * | [ticket/11662] Typos: occured -> occurred | Andreas Fischer | 2013-07-12 | 3 | -5/+5 |
| | * | Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus | Nathaniel Guse | 2013-07-11 | 1 | -1/+2 |
| | |\ |
|
| * | \ | Merge branch 'ticket/8319' into ticket/8319-develop2 | Joas Schilling | 2013-07-10 | 1 | -1/+2 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL | Joas Schilling | 2013-06-03 | 1 | -1/+2 |
* | | | | [ticket/9657] Remove last references to m_restore permission | Joas Schilling | 2013-07-12 | 1 | -2/+1 |
* | | | | [ticket/9657] Fix english language :( | Joas Schilling | 2013-07-11 | 2 | -2/+2 |
* | | | | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis... | Joas Schilling | 2013-07-11 | 28 | -58/+29 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch 'develop-olympus' into develop | Dhruv | 2013-06-05 | 1 | -1/+1 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | [ticket/11583] Use a new lang key instead of giving the old one a new meaning. | Andreas Fischer | 2013-06-03 | 1 | -1/+1 |
| | * | | [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. | Andreas Fischer | 2013-06-01 | 1 | -1/+1 |
| | |/ |
|
| * | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-05-26 | 1 | -0/+1 |
| |\ \
| | |/ |
|
| | * | [ticket/11538] Simplify colour value check and remove support for '#' | Marc Alexander | 2013-05-14 | 1 | -1/+1 |
| | * | [ticket/11538] Use regex for testing color value and improve tests | Marc Alexander | 2013-05-14 | 1 | -0/+1 |
| * | | Merge remote-tracking branch 'remotes/Senky/ticket/11010' into develop | Nathaniel Guse | 2013-05-21 | 1 | -2/+2 |
| |\ \ |
|
| | * | | [ticket/11010] adding type="number" and type="date" to prosilver | Senky | 2013-05-20 | 1 | -2/+2 |
| * | | | [ticket/11279] Clearer AJAX errors | Vjacheslav Trushkin | 2013-05-20 | 1 | -0/+3 |
| |/ / |
|
| * | | Merge remote-tracking branch 'EXreaction/ticket/11413' into develop | David King | 2013-05-20 | 1 | -0/+1 |
| |\ \ |
|
| | * | | [ticket/11413] Translate the error | Nathan Guse | 2013-05-10 | 1 | -0/+1 |
| * | | | Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop | Oleg Pudeyev | 2013-05-08 | 2 | -0/+3 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | [ticket/10325] fix acp language | Dhruv | 2013-05-04 | 1 | -1/+1 |
| | * | | [ticket/10325] fix language in acp and ucp | Dhruv | 2013-04-30 | 2 | -2/+2 |
| | * | | [ticket/10325] fix language in acp and ucp | Dhruv | 2013-04-25 | 2 | -2/+2 |
| | * | | [ticket/10325] improve acp option language | Dhruv | 2013-04-25 | 1 | -1/+1 |
| | * | | [ticket/10325] fix language key | Dhruv | 2013-04-25 | 1 | -1/+1 |
| | * | | [ticket/10325] fix language variable | Dhruv | 2013-04-25 | 1 | -1/+1 |
| | * | | [ticket/10325] change language var | Dhruv | 2013-04-25 | 1 | -2/+2 |
| | * | | [ticket/10325] fix language | Dhruv | 2013-04-25 | 1 | -1/+1 |
| | * | | [ticket/10325] trigger error if forgot password option disabled | Dhruv | 2013-04-25 | 1 | -0/+1 |
| | * | | [ticket/10325] add allow forgot password option in acp | Dhruv | 2013-04-25 | 1 | -0/+2 |
| * | | | [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language | Nathaniel Guse | 2013-04-25 | 1 | -1/+1 |
| |/ / |
|
| * | | Merge pull request #1361 from MGaetan89/ticket/11471 | Nils Adermann | 2013-04-25 | 20 | -54/+10 |
| |\ \ |
|
| | * | | [ticket/11471] Unrelated text in e-mail templates | Gaëtan Muller | 2013-04-24 | 20 | -54/+10 |
| * | | | Merge remote-tracking branch 'github-asperous/ticket/9975' into develop | Nils Adermann | 2013-04-24 | 3 | -0/+4 |
| |\ \ \ |
|
| | * | | | [ticket/9975] Moved a few E_USER_ERROR errors to /language | asperous | 2013-04-23 | 3 | -0/+5 |
| | |/ / |
|
| * | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-04-24 | 1 | -0/+1 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | * | [ticket/9975] Translate missing style error message | Gaëtan Muller | 2013-04-21 | 1 | -0/+1 |
| * | | Migration file and change board_home_text to board_index_text | Tabitha Backoff | 2013-03-28 | 1 | -2/+2 |
| * | | Ticket# 11477 - Allow customisation of "Board index" | Tabitha Backoff | 2013-03-28 | 1 | -0/+2 |
* | | | [ticket/9657] Remove softdelete reason field when permanent delete is selected | Joas Schilling | 2013-03-11 | 1 | -2/+2 |
* | | | [ticket/9657] Correctly split disapproving from perma deleting posts | Joas Schilling | 2013-03-11 | 1 | -1/+1 |