aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11935] Remove obsolete table attributes from ProsilverMatt Friedman2013-10-1913-19/+19
* [ticket/11935] Fix invalid HTML usage of <label> tag in prosilverMatt Friedman2013-10-196-6/+12
* [ticket/11935] Fix stray </a> tagsMatt Friedman2013-10-191-2/+2
* [ticket/11935] Fix incorrect alt tags that should be title tagsMatt Friedman2013-10-191-2/+2
* [ticket/11935] Fix <p> tags not allowed inside <strong> tagsMatt Friedman2013-10-191-1/+1
* Merge remote-tracking branch 'prototech/ticket/10948' into developJoas Schilling2013-10-182-2/+7
|\
| * [ticket/10948] Separate color swatch cells.Cesar G2013-10-172-2/+7
|/
* Merge pull request #1781 from VSEphpbb/ticket/11921Nathan Guse2013-10-1614-56/+23
|\
| * [ticket/11921] Directly inject unread messages count into the templateMatt Friedman2013-10-161-8/+2
| * [ticket/11921] Only get the count of unread PMsMatt Friedman2013-10-161-4/+1
| * [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-167-10/+9
| * [ticket/11921] Remove "l_" from non-lang variablesMatt Friedman2013-10-151-5/+5
| * [ticket/11921] Improve appearance of PM notifications in linklistMatt Friedman2013-10-158-21/+15
| * [ticket/11921] Improve appearance of Notifications in linklistMatt Friedman2013-10-158-26/+9
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-10-162-0/+6
|\ \
| * \ Merge pull request #1782 from bantu/ticket/11920Nils Adermann2013-10-152-0/+6
| |\ \
| | * | [ticket/11920] Print MariaDB version after successful setup.Andreas Fischer2013-10-161-0/+2
| | * | [ticket/11920] Manually purge mysql-common.Andreas Fischer2013-10-161-0/+3
| | * | [ticket/11920] Actually call travis/setup-mariadb.sh.Andreas Fischer2013-10-151-0/+1
* | | | Merge pull request #1783 from bantu/ticket/11926Joas Schilling2013-10-151-1/+1
|\ \ \ \
| * | | | [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