aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11935] Fix <p> tags not allowed inside <strong> tagsMatt Friedman2013-10-191-1/+1
| | | | PHPBB3-11935
* Merge remote-tracking branch 'prototech/ticket/10948' into developJoas Schilling2013-10-182-2/+7
|\ | | | | | | | | * prototech/ticket/10948: [ticket/10948] Separate color swatch cells.
| * [ticket/10948] Separate color swatch cells.Cesar G2013-10-172-2/+7
|/ | | | PHPBB3-10948
* Merge pull request #1781 from VSEphpbb/ticket/11921Nathan Guse2013-10-1614-56/+23
|\ | | | | Ticket/11921 - Streamline PMs and Notifications in Header Link List
| * [ticket/11921] Directly inject unread messages count into the templateMatt Friedman2013-10-161-8/+2
| | | | | | | | PHPBB3-11921
| * [ticket/11921] Only get the count of unread PMsMatt Friedman2013-10-161-4/+1
| | | | | | | | PHPBB3-11921
| * [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-167-10/+9
| | | | | | | | PHPBB3-11921
| * [ticket/11921] Remove "l_" from non-lang variablesMatt Friedman2013-10-151-5/+5
| | | | | | | | PHPBB3-11921
| * [ticket/11921] Improve appearance of PM notifications in linklistMatt Friedman2013-10-158-21/+15
| | | | | | | | PHPBB3-11921
| * [ticket/11921] Improve appearance of Notifications in linklistMatt Friedman2013-10-158-26/+9
| | | | | | | | PHPBB3-11921
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-10-162-0/+6
|\ \ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11920] Print MariaDB version after successful setup. [ticket/11920] Manually purge mysql-common. [ticket/11920] Actually call travis/setup-mariadb.sh.
| * \ Merge pull request #1782 from bantu/ticket/11920Nils Adermann2013-10-152-0/+6
| |\ \ | | | | | | | | [ticket/11920] Actually call travis/setup-mariadb.sh.
| | * | [ticket/11920] Print MariaDB version after successful setup.Andreas Fischer2013-10-161-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11920
| | * | [ticket/11920] Manually purge mysql-common.Andreas Fischer2013-10-161-0/+3
| | | | | | | | | | | | | | | | PHPBB3-11920
| | * | [ticket/11920] Actually call travis/setup-mariadb.sh.Andreas Fischer2013-10-151-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11920
* | | | Merge pull request #1783 from bantu/ticket/11926Joas Schilling2013-10-151-1/+1
|\ \ \ \ | | | | | | | | | | [ticket/11926] Fix plupload migration dependency.
| * | | | [ticket/11926] Fix plupload migration dependency.Andreas Fischer2013-10-161-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-11926
* | | | [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
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop-olympus: [ticket/11920] Have to use empty root password otherwise db creation fails. [ticket/11920] Add MariaDB environment to Travis-CI. Conflicts: .travis.yml
| * | | Merge pull request #1780 from bantu/ticket/11920Nils Adermann2013-10-153-1/+76
| |\ \ \ | | |/ / | | | | [ticket/11920] Add MariaDB environment to Travis-CI.
| | * | [ticket/11920] Have to use empty root password otherwise db creation fails.Andreas Fischer2013-10-152-1/+8
| | | | | | | | | | | | | | | | PHPBB3-11920
| | * | [ticket/11920] Add MariaDB environment to Travis-CI.Andreas Fischer2013-10-153-1/+69
| |/ / | | | | | | | | | PHPBB3-11920
* | | Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into developJoas Schilling2013-10-1516-42/+725
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * p/prep-release-3.1.0-a1: [prep-release-3.1.0-a1] Update changelog with the latest changes [ticket/11919] Remove extra argument to notification manager's sql_fetchfield() [ticket/11918] Make sql_freeresult() consistent across all DB drivers [prep-release-3.1.0-a1] Only build packages for the latest olympus versions [prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes [prep-release-3.1.0-a1] Update version to 3.1.0-a1
| * | [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
| |\ \ | | | | | | | | | | | | | | | | * noxwizard/ticket/11919: [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
| | * | [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()Patrick Webster2013-10-141-2/+2
| |/ / |/| | | | | | | | PHPBB3-11919
| * | Merge remote-tracking branch 'noxwizard/ticket/11918' into prep-release-3.1.0-a1Joas Schilling2013-10-158-10/+11
| |\ \ | | | | | | | | | | | | | | | | * noxwizard/ticket/11918: [ticket/11918] Make sql_freeresult() consistent across all DB drivers
| | * | [ticket/11918] Make sql_freeresult() consistent across all DB driversPatrick Webster2013-10-148-10/+11
| |/ / |/| | | | | | | | PHPBB3-11918
| * | [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
|\ \ | | | | | | [ticket/10929] Integration of Plupload
| * | [feature/plupload/integration] Add missing javascript file.Fyorl2013-10-141-0/+281
| | | | | | | | | | | | PHPBB3-10929
| * | [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-1118-9/+827
| | | | | | | | | | | | | | | | | | | | | | | | This commit is a highly-refactored and up-to-date version of Fyorl's work which was part of his Google Summer of Code 2012 project "Attachment Improvements". PHPBB3-10929
* | | Merge pull request #1582 from bantu/feature/plupload/cronNils Adermann2013-10-133-0/+136
|\ \ \ | | | | | | | | [ticket/10929] Cron Job for Plupload Upload Directory Cleaning
| * | | [feature/plupload/cron] NamespacificationAndreas Fischer2013-10-112-7/+9
| | | | | | | | | | | | | | | | PHPBB3-10929
| * | | [feature/plupload/cron] Add cronjob for cleaning plupload temporary directory.Andreas Fischer2013-10-113-0/+134
| |/ / | | | | | | | | | PHPBB3-10929
* | | Merge pull request #1581 from bantu/feature/plupload/depsNils Adermann2013-10-1313-0/+182
|\ \ \ | | | | | | | | [ticket/10929] Plupload dependencies
| * | | [feature/plupload/deps] Add information about Plupload to AUTHORS.Andreas Fischer2013-07-171-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10929
| * | | [feature/plupload/deps] Adding parts of plupload_1_5_7.zipAndreas Fischer2013-07-1712-0/+181
| | | | | | | | | | | | | | | | PHPBB3-10929
* | | | Merge pull request #1776 from bantu/ticket/11913Nils Adermann2013-10-131-29/+11
|\ \ \ \ | | | | | | | | | | [ticket/11913] Better download.phpbb.com directory structure for phpBB 3...
| * | | | [ticket/11913] Better download.phpbb.com directory structure for phpBB 3.1+Andreas Fischer2013-10-141-29/+11
|/ / / / | | | | | | | | | | | | PHPBB3-11913
* | | | Merge pull request #1766 from bantu/ticket/11621David King2013-10-133-17/+52
|\ \ \ \ | | | | | | | | | | [ticket/11621] Improve MySQL fulltext search indexes
| * | | | [ticket/11621] Add explanation to mysql_fulltext_drop.Andreas Fischer2013-10-131-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11621
| * | | | [ticket/11621] Correct GPLv2 link in file header.Andreas Fischer2013-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11621
| * | | | [ticket/11621] Put mysql_fulltext_drop into alpha1 migration.Andreas Fischer2013-10-111-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11621
| * | | | Merge remote-tracking branch 'phpbb/develop' into ticket/11621Andreas Fischer2013-10-1131-215/+337
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: [ticket/11867] Schema files are not created by create_schema_files.php [ticket/11905] 3.1.0-a1 Migration [ticket/11903] Speed up paging test [ticket/11703] Extend the correct migration class. [ticket/11874] Correct when $phpbb_root_path is appended to build_url() [ticket/11703] Also use empty() for T_JQUERY_LINK. [ticket/11703] Add effectively_installed(). [ticket/11703] Make jQuery CDN switch more generic. [ticket/11874] Fix tests [ticket/11874] Do not always prepend the web path; only replace phpbb_root_path [ticket/11345] Don't include scheme, so HTTPS is used where necessary. [ticket/11345] Wrap remote webfonts in S_ALLOW_CDN. [ticket/11345] Move css import to template [ticket/11345] Add Droid Sans as fallback font [ticket/11345] Change font for buttons
| * | | | | [ticket/11621] Use effectively_installed() instead.Andreas Fischer2013-10-111-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11621
| * | | | | [ticket/11621] Add migration dropping MySQL search indexes.Andreas Fischer2013-10-111-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Possibly time-consuming index-regeneration will be left to the user. PHPBB3-11621
| * | | | | [ticket/11621] Remove unnecessary things around index_created() return value.Andreas Fischer2013-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11621