aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'prep-release-3.1.0-RC5' into develop-ascraeusJoas Schilling2014-10-078-42/+143
|\
| * [prep-release-3.1.0-RC5] Update phpBB Version for RC6 developmentJoas Schilling2014-10-073-5/+5
| |
| * [prep-release-3.1.0-RC5] Add changelog for 3.1.0-RC5Joas Schilling2014-10-071-0/+65
| |
| * [prep-release-3.1.0-RC5] Prepare ChangelogJoas Schilling2014-10-071-32/+35
| |
| * [prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5Joas Schilling2014-10-071-0/+33
| |
| * [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5Joas Schilling2014-10-076-8/+8
|/
* Merge pull request #3027 from nickvergessen/ticket/13137Andreas Fischer2014-10-077-3384/+69
|\ | | | | | | | | | | | | | | | | | | | | [ticket/13137] Remove schema.json from repository * nickvergessen/ticket/13137: [ticket/13137] Create schema.json in build script [ticket/13137] Improve output of create_schema_files.php [ticket/13137] Add schema.json file to .gitignore [ticket/13137] Generate the schema when the schema.json file is not available [ticket/13137] Remove schema.json file
| * [ticket/13137] Create schema.json in build scriptJoas Schilling2014-10-071-0/+3
| | | | | | | | PHPBB3-13137
| * [ticket/13137] Improve output of create_schema_files.phpJoas Schilling2014-10-071-1/+1
| | | | | | | | PHPBB3-13137
| * [ticket/13137] Add schema.json file to .gitignoreJoas Schilling2014-10-071-0/+1
| | | | | | | | PHPBB3-13137
| * [ticket/13137] Generate the schema when the schema.json file is not availableJoas Schilling2014-10-073-27/+64
| | | | | | | | PHPBB3-13137
| * [ticket/13137] Remove schema.json fileJoas Schilling2014-10-071-3356/+0
|/ | | | PHPBB3-13137
* Merge pull request #3026 from nickvergessen/ticket/13136Nils Adermann2014-10-071-1/+1
|\ | | | | [ticket/13136] Update schema.json with latest changes
| * [ticket/13136] Update schema.json with latest changesJoas Schilling2014-10-071-1/+1
|/ | | | PHPBB3-13136
* Merge pull request #2942 from Senky/ticket/12489Joas Schilling2014-10-071-1/+1
|\ | | | | | | [ticket/12489] Description for Contact link in custom profile fields
| * [ticket/12489] Language correctionJakub Senko2014-10-071-1/+1
| | | | | | | | PHPBB3-12489
| * [ticket/12489] Add notice about %s wildcard in FIELD_IS_CONTACT_EXPLAINJakub Senko2014-09-181-1/+1
| | | | | | | | PHPBB3-12489
* | Merge pull request #3002 from Nicofuma/ticket/12987Andreas Fischer2014-10-0715-284/+313
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12987] Cleanup the services.yml file * Nicofuma/ticket/12987: [ticket/12987] Cleanup the services.yml file
| * | [ticket/12987] Cleanup the services.yml fileTristan Darricau2014-10-0315-284/+313
| | | | | | | | | | | | PHPBB3-12987
* | | Merge pull request #2307 from PayBas/ticket/12408Joas Schilling2014-10-062-4/+52
|\ \ \ | | | | | | | | | | | | [ticket/12408] Add quick setting for "default guest style" to ACP
| * | | [ticket/12408] Fix white-space snifferPayBas2014-09-151-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12408
| * | | [ticket/12408] Clarify the behavior of "override style"PayBas2014-09-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12408
| * | | [ticket/12408] Changed lang vars, added fieldset and removed "default"PayBas2014-09-152-9/+12
| | | | | | | | | | | | | | | | PHPBB3-12408
| * | | [ticket/12408] Public functions and updated doc blockPayBas2014-09-151-2/+4
| | | | | | | | | | | | | | | | PHPBB3-12408
| * | | [ticket/12408] Code cleanupPayBas2014-09-151-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | Rebased to see if travis will finally play along PHPBB3-12408
| * | | [ticket/12408] Simplified queriesPayBas2014-09-151-15/+7
| | | | | | | | | | | | | | | | PHPBB3-12408
| * | | [ticket/12408] Add quick setting for "default guest style" to ACPPayBas2014-09-152-1/+58
| | | | | | | | | | | | | | | | PHPBB3-12408
* | | | Merge pull request #2991 from nickvergessen/ticket/13077Andreas Fischer2014-10-061-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13077] Move extension module to the top of the Customise tab * nickvergessen/ticket/13077: [ticket/13077] Move extension module to the top of the Customise tab
| * | | | [ticket/13077] Move extension module to the top of the Customise tabJoas Schilling2014-09-241-0/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-13077
* | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-10-060-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge pull request #2460 from Nicofuma/ticket/11224Joas Schilling2014-10-064-2/+286
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/11224] SQL cache destroy does not destroy queries to tables joined
* | \ \ \ \ \ Merge pull request #3016 from Nicofuma/ticket/11224-ascraeusJoas Schilling2014-10-064-2/+284
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11224][ascraeus] SQL cache destroy does not destroy queries to tables joined
| * | | | | | | [ticket/11224] Updates testsTristan Darricau2014-10-033-27/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11224
| * | | | | | | [ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224"Tristan Darricau2014-10-034-2/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 40cd7570e6f4da7cc60d83a3e99c72a2fb99e3f7.
* | | | | | | | Merge pull request #2828 from brunoais/ticket/12930Joas Schilling2014-10-061-2/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_after
| * | | | | | | | [ticket/12930] BUMP to RC5brunoais2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12930
| * | | | | | | | [ticket/12930] Fixing event comment block and variablebrunoais2014-09-191-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to comments on pull request PHPBB3-12930
| * | | | | | | | [ticket/12930] Adding more variables to the eventbrunoais2014-08-101-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More variables, according to comments, were added to the event. PHPBB3-12930
| * | | | | | | | [ticket/12930] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12930
| * | | | | | | | [ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_afterbrunoais2014-08-081-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.ucp_pm_compose_compose_pm_quotepost_query_after event to ucp backend. PHPBB3-12930
* | | | | | | | | Merge pull request #2827 from brunoais/ticket/12929Joas Schilling2014-10-061-0/+36
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_before
| * | | | | | | | | [ticket/12929] BUMP to RC5brunoais2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12929
| * | | | | | | | | [ticket/12929] Fixing event comment block and variablebrunoais2014-09-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12929
| * | | | | | | | | [ticket/12929] Adding more variables to event.brunoais2014-08-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More variables added that may be useful to events at this stage. PHPBB3-12929
| * | | | | | | | | [ticket/12929] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12929
| * | | | | | | | | [ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_beforebrunoais2014-08-091-0/+22
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.ucp_pm_compose_compose_pm_basic_info_query_before event to mcp backend. PHPBB3-12929
* | | | | | | | | Merge pull request #3019 from Senky/ticket/13025Joas Schilling2014-10-065-4/+106
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13025] Add template events for buttons on viewforum and viewtopic
| * | | | | | | | | [ticket/13025] Correct events in subsilver2 viewforum_bodyJakub Senko2014-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13025
| * | | | | | | | | [ticket/13025] Make RC uppercaseJakub Senko2014-10-041-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13025
| * | | | | | | | | [ticket/13025] rc4 -> rc5Jakub Senko2014-10-031-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13025