Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/13421] Inherit docs | Joas Schilling | 2014-12-06 | 1 | -85/+34 |
* | [ticket/13421] Add an interface for \phpbb\db\tools | Joas Schilling | 2014-12-06 | 2 | -11/+213 |
* | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-29 | 1 | -1/+1 |
|\ | |||||
| * | [ticket/13393] Call user->lang function directly | Oliver Schramm | 2014-11-27 | 1 | -1/+1 |
* | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-26 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge pull request #3075 from Senky/ticket/11613 | Marc Alexander | 2014-11-26 | 1 | -1/+1 |
| |\ | |||||
| | * | [ticket/11613] Allow cookies to work on netbios domains | Jakub Senko | 2014-11-22 | 1 | -1/+1 |
* | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-25 | 1 | -10/+10 |
|\ \ \ | |/ / | |||||
| * | | [ticket/13381] Fix header intendation of v312.php | Joas Schilling | 2014-11-25 | 1 | -10/+10 |
* | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-25 | 2 | -0/+63 |
|\ \ \ | |/ / | |||||
| * | | [prep-release-3.1.2] Add migration to update version to 3.1.2 | Joas Schilling | 2014-11-24 | 1 | -0/+31 |
| * | | [prep-release-3.1.2] Add migration for 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 1 | -0/+32 |
* | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 2 | -20/+33 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #10 from phpbb/ticket/security-171 | Joas Schilling | 2014-11-22 | 2 | -20/+33 |
| |\ \ | |||||
| | * \ | Merge branch 'ticket/13358' into ticket/security-171 | Marc Alexander | 2014-11-22 | 1 | -1/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'ticket/13358' into ticket/security-171 | Marc Alexander | 2014-11-21 | 2 | -5/+136 |
| | |\ \ \ | |||||
| | * | | | | [ticket/security-171] Add tests for retrieved remote data in version_helper | Marc Alexander | 2014-11-21 | 1 | -5/+8 |
| | * | | | | [ticket/security-171] Sanitize data from composer.json | Marc Alexander | 2014-11-21 | 1 | -11/+23 |
| | * | | | | [ticket/security-171] Use type cast helper for json data | Marc Alexander | 2014-11-21 | 1 | -9/+7 |
* | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 1 | -1/+7 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #8 from phpbb/ticket/security-169 | Joas Schilling | 2014-11-22 | 1 | -1/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/security-169] Stop loop through referer dir in top directory | Marc Alexander | 2014-11-09 | 1 | -1/+7 |
* | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 2 | -5/+136 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #3157 from marc1706/ticket/13358 | Joas Schilling | 2014-11-22 | 2 | -5/+136 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | [ticket/13358] Correctly create version_helper in acp_extensions | Marc Alexander | 2014-11-22 | 1 | -1/+1 |
| | | |_|/ / | | |/| | | | |||||
| | * | | | | [ticket/13358] Use protected and public keywords where applicable | Marc Alexander | 2014-11-21 | 1 | -3/+3 |
| | * | | | | [ticket/13358] Do not pass variables by reference | Marc Alexander | 2014-11-21 | 2 | -21/+15 |
| | * | | | | [ticket/13358] Fix tests and use exceptions instead of user object | Marc Alexander | 2014-11-21 | 2 | -20/+13 |
| | * | | | | [ticket/13358] Add file_downloader to version_helper | Marc Alexander | 2014-11-21 | 1 | -2/+9 |
| | * | | | | [ticket/13358] Add file_downloader as replacement for get_remote_file | Marc Alexander | 2014-11-21 | 1 | -0/+137 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3108 from Elsensee/ticket/13284 | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13284] Set message body in topic form too, so it will be sent | Oliver Schramm | 2014-11-04 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3068 from marc1706/ticket/13204 | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13204] Tell user that password was incorrect when exceeding attempts | Marc Alexander | 2014-11-02 | 1 | -1/+1 |
| | |/ / / | |||||
* | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -8/+32 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3064 from marc1706/ticket/13197 | Joas Schilling | 2014-11-21 | 1 | -8/+32 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13197] Fix tabbing | Marc Alexander | 2014-11-09 | 1 | -4/+4 |
| | * | | | | [ticket/13197] Correctly format sql query | Marc Alexander | 2014-11-09 | 1 | -2/+2 |
| | * | | | | [ticket/13197] Also delete group avatar from users that have it set | Marc Alexander | 2014-10-25 | 1 | -7/+31 |
* | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -2/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | [ticket/13316] Ensure Recaptcha image uses https when necessary. | Cesar G | 2014-11-21 | 1 | -2/+4 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3144 from marc1706/ticket/13337 | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13337] Allow empty array passed to sql_in_set() | Marc Alexander | 2014-11-14 | 1 | -1/+1 |
* | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -4/+28 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #3023 from Nicofuma/ticket/13133 | Joas Schilling | 2014-11-21 | 1 | -4/+28 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/13133] Rename $ok variable | Tristan Darricau | 2014-11-07 | 1 | -4/+4 |
| | * | | | | | [ticket/13133] Allow @vendor_name for includecss | Tristan Darricau | 2014-10-08 | 1 | -4/+28 |