aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11926] Fix plupload migration dependency.Andreas Fischer2013-10-161-1/+1
* [develop] Update version to 3.1.0-a2-devJoas Schilling2013-10-153-3/+3
* Merge remote-tracking branch 'github-phpbb/develop-olympus' into developNils Adermann2013-10-153-1/+76
|\
| * Merge pull request #1780 from bantu/ticket/11920Nils Adermann2013-10-153-1/+76
| |\
| | * [ticket/11920] Have to use empty root password otherwise db creation fails.Andreas Fischer2013-10-152-1/+8
| | * [ticket/11920] Add MariaDB environment to Travis-CI.Andreas Fischer2013-10-153-1/+69
| |/
* | Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into developJoas Schilling2013-10-1516-42/+725
|\ \
| * | [prep-release-3.1.0-a1] Update changelog with the latest changesJoas Schilling2013-10-151-0/+2
| * | Merge remote-tracking branch 'noxwizard/ticket/11919' into prep-release-3.1.0-a1Joas Schilling2013-10-151-2/+2
| |\ \
| | * | [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()Patrick Webster2013-10-141-2/+2
| |/ / |/| |
| * | Merge remote-tracking branch 'noxwizard/ticket/11918' into prep-release-3.1.0-a1Joas Schilling2013-10-158-10/+11
| |\ \
| | * | [ticket/11918] Make sql_freeresult() consistent across all DB driversPatrick Webster2013-10-148-10/+11
| |/ / |/| |
| * | [prep-release-3.1.0-a1] Only build packages for the latest olympus versionsJoas Schilling2013-10-141-1/+1
| * | [prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changesJoas Schilling2013-10-141-21/+701
| * | [prep-release-3.1.0-a1] Update version to 3.1.0-a1Joas Schilling2013-10-146-8/+8
|/ /
* | Merge pull request #1772 from bantu/feature/plupload/integrationNils Adermann2013-10-1319-9/+1108
|\ \
| * | [feature/plupload/integration] Add missing javascript file.Fyorl2013-10-141-0/+281
| * | [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-1118-9/+827
* | | Merge pull request #1582 from bantu/feature/plupload/cronNils Adermann2013-10-133-0/+136
|\ \ \
| * | | [feature/plupload/cron] NamespacificationAndreas Fischer2013-10-112-7/+9
| * | | [feature/plupload/cron] Add cronjob for cleaning plupload temporary directory.Andreas Fischer2013-10-113-0/+134
| |/ /
* | | Merge pull request #1581 from bantu/feature/plupload/depsNils Adermann2013-10-1313-0/+182
|\ \ \
| * | | [feature/plupload/deps] Add information about Plupload to AUTHORS.Andreas Fischer2013-07-171-0/+1
| * | | [feature/plupload/deps] Adding parts of plupload_1_5_7.zipAndreas Fischer2013-07-1712-0/+181
* | | | Merge pull request #1776 from bantu/ticket/11913Nils Adermann2013-10-131-29/+11
|\ \ \ \
| * | | | [ticket/11913] Better download.phpbb.com directory structure for phpBB 3.1+Andreas Fischer2013-10-141-29/+11
|/ / / /
* | | | Merge pull request #1766 from bantu/ticket/11621David King2013-10-133-17/+52
|\ \ \ \
| * | | | [ticket/11621] Add explanation to mysql_fulltext_drop.Andreas Fischer2013-10-131-0/+8
| * | | | [ticket/11621] Correct GPLv2 link in file header.Andreas Fischer2013-10-111-1/+1
| * | | | [ticket/11621] Put mysql_fulltext_drop into alpha1 migration.Andreas Fischer2013-10-111-0/+1
| * | | | Merge remote-tracking branch 'phpbb/develop' into ticket/11621Andreas Fischer2013-10-1131-215/+337
| |\ \ \ \
| * | | | | [ticket/11621] Use effectively_installed() instead.Andreas Fischer2013-10-111-5/+6
| * | | | | [ticket/11621] Add migration dropping MySQL search indexes.Andreas Fischer2013-10-111-0/+38
| * | | | | [ticket/11621] Remove unnecessary things around index_created() return value.Andreas Fischer2013-10-111-1/+1
| * | | | | [ticket/11621] Swap columns of post_content index.Andreas Fischer2013-10-101-1/+1
| * | | | | Merge remote-tracking branch 'phpbb/develop' into ticket/11621Andreas Fischer2013-10-10622-7722/+11991
| |\ \ \ \ \
| * | | | | | [ticket/11621] Remove mysql extra indexesDhruv2013-08-261-16/+3
* | | | | | | Merge remote-tracking branch 'bantu/ticket/11908' into developDhruv2013-10-111-1/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception.Andreas Fischer2013-10-111-1/+3
|/ / / / / /
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11906' into developDhruv2013-10-113-4/+19
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/11906] Fix namespace issues in prune_notificationsJoas Schilling2013-10-111-4/+6
| * | | | | [ticket/11906] Add notification purge cron to cron tasksJoas Schilling2013-10-111-0/+10
| * | | | | [ticket/11906] Add missing configs from notifications cron to schema_data.sqlJoas Schilling2013-10-111-0/+3
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11867' into developDhruv2013-10-117-170/+170
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/11867] Schema files are not created by create_schema_files.phpJoas Schilling2013-10-117-170/+170
|/ / / / /
* | | | | Merge pull request #1767 from EXreaction/ticket/11905Nils Adermann2013-10-102-0/+84
|\ \ \ \ \
| * | | | | [ticket/11905] 3.1.0-a1 MigrationNathan Guse2013-10-102-0/+84
* | | | | | Merge pull request #1764 from EXreaction/ticket/11874Nils Adermann2013-10-105-24/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/11874] Correct when $phpbb_root_path is appended to build_url()Nathan Guse2013-10-101-1/+1
| * | | | | [ticket/11874] Fix testsNathan Guse2013-10-103-16/+21