aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11188] add count query to postgres searchDhruv2012-12-301-1/+10
* Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-2919-49/+63
|\
| * [ticket/11259] htmlspecialchars($phpbb_admin_path)Nathan Guse2012-12-105-22/+22
| * [ticket/11259] adm_relative_path -> phpbb_adm_relative_pathNathan Guse2012-12-096-16/+16
| * [ticket/11259] Also make adm_relative_path available in the containerNathan Guse2012-12-091-0/+1
| * [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-0916-32/+45
* | Merge PR #1162 branch 'develop-olympus' into developOleg Pudeyev2012-12-291-9/+33
|\ \
| * \ Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympusOleg Pudeyev2012-12-291-9/+33
| |\ \
| | * | [ticket/11291] phing: Also add checkreturn="true" to composer execution.Andreas Fischer2012-12-291-0/+1
| | * | [ticket/11291] phing: Add checkreturn="true" to all new commands.Andreas Fischer2012-12-291-1/+4
| | * | [ticket/11291] phing: Exclude vendor folder from diffs.Andreas Fischer2012-12-291-0/+1
| | * | [ticket/11291] phing packaging: Export composer.phar and install dependencies.Andreas Fischer2012-12-291-4/+10
| | * | [ticket/11291] phing: Remove no longer needed create-package target.Andreas Fischer2012-12-291-3/+2
| | * | [ticket/11291] phing: The package target does not depend on composer.Andreas Fischer2012-12-291-1/+1
| | * | [ticket/11291] phing: Adjust directory format of composer exec.Andreas Fischer2012-12-291-1/+1
| | * | [ticket/11291] phing: Add description for composer target.Andreas Fischer2012-12-291-0/+5
| | * | [ticket/11291] phing: Add --dev to composer install.Andreas Fischer2012-12-291-1/+1
| | * | [ticket/11291] phing: Correct dependencies of composer target.Andreas Fischer2012-12-291-1/+1
| | * | [ticket/11291] phing: Make sure composer is available before calling it.Andreas Fischer2012-12-231-3/+12
* | | | Merge remote-tracking branch 'p/ticket/11294-develop' into developAndreas Fischer2012-12-271-0/+3
|\ \ \ \
| * | | | [ticket/11294] Update required/optional extension list for develop.Oleg Pudeyev2012-12-271-0/+3
|/ / / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-261-2/+19
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'p/ticket/11294' into develop-olympusAndreas Fischer2012-12-261-2/+19
| |\ \ \
| | * | | [ticket/11294] Capitalize phpunit.Oleg Pudeyev2012-12-261-3/+3
| | * | | [ticket/11294] Update required/optional extension list for olympus.Oleg Pudeyev2012-12-251-1/+18
| |/ / /
* | | | Merge remote-tracking branch 'p/ticket/10758' into developAndreas Fischer2012-12-2511-50/+245
|\ \ \ \
| * | | | [ticket/10758] Add return to the other compat function.Oleg Pudeyev2012-12-241-1/+1
| * | | | [ticket/10758] Add periods.Oleg Pudeyev2012-12-221-2/+2
| * | | | [ticket/10758] Yes, only one empty line.Oleg Pudeyev2012-12-221-1/+0
| * | | | [ticket/10758] Add deprecated tags.Oleg Pudeyev2012-12-201-0/+2
| * | | | [ticket/10758] Add compat functions.Oleg Pudeyev2012-12-201-0/+27
| * | | | [ticket/10758] Admin is not working yet.Oleg Pudeyev2012-12-191-0/+2
| * | | | [ticket/10758] Test moderator and admin permissions.Oleg Pudeyev2012-12-191-5/+60
| * | | | [ticket/10758] Check that acl was changed in the test.Oleg Pudeyev2012-12-191-1/+19
| * | | | [ticket/10758] Extract obtain_user_data for the benefit of tests.Oleg Pudeyev2012-12-192-6/+21
| * | | | [ticket/10758] Functional test for changing a user's permission.Oleg Pudeyev2012-12-151-0/+53
| * | | | [ticket/10758] Spelling fix.Oleg Pudeyev2012-12-151-1/+1
| * | | | [ticket/10758] Add a test for acp login.Oleg Pudeyev2012-12-152-2/+15
| * | | | [ticket/10758] Dependency inject parameters into update_foes.Oleg Pudeyev2012-12-153-8/+12
| * | | | [ticket/10758] Dependency inject parameters into cache_moderators.Oleg Pudeyev2012-12-157-33/+40
* | | | | [develop] Set build version (and thus package name) to 3.1.0-dev.Andreas Fischer2012-12-231-1/+1
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-231-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.Andreas Fischer2012-12-231-3/+3
| | |/ / | |/| |
* | | | Merge PR #1152 branch 'develop-olympus' into developOleg Pudeyev2012-12-221-17/+30
|\ \ \ \ | |/ / /
| * | | Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympusOleg Pudeyev2012-12-221-17/+30
| |\ \ \
| | * | | [ticket/11278] Comment out the code for dropping the Q&A tablesJoas Schilling2012-12-211-6/+20
| | * | | [ticket/11278] Fix not running queries from db tools in database updateJoas Schilling2012-12-191-13/+12
* | | | | Merge remote-tracking branch 'p/ticket/10758-upload' into developAndreas Fischer2012-12-222-1/+19
|\ \ \ \ \
| * | | | | [ticket/10758-upload] Mark tests that don't work incomplete.Oleg Pudeyev2012-12-211-0/+2
| * | | | | [ticket/10758-upload] Convert error to a failure.Oleg Pudeyev2012-12-202-1/+17