Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/11935] Fix <p> tags not allowed inside <strong> tags | Matt Friedman | 2013-10-19 | 1 | -1/+1 |
| | | | | PHPBB3-11935 | ||||
* | Merge remote-tracking branch 'prototech/ticket/10948' into develop | Joas Schilling | 2013-10-18 | 2 | -2/+7 |
|\ | | | | | | | | | * prototech/ticket/10948: [ticket/10948] Separate color swatch cells. | ||||
| * | [ticket/10948] Separate color swatch cells. | Cesar G | 2013-10-17 | 2 | -2/+7 |
|/ | | | | PHPBB3-10948 | ||||
* | Merge pull request #1781 from VSEphpbb/ticket/11921 | Nathan Guse | 2013-10-16 | 14 | -56/+23 |
|\ | | | | | Ticket/11921 - Streamline PMs and Notifications in Header Link List | ||||
| * | [ticket/11921] Directly inject unread messages count into the template | Matt Friedman | 2013-10-16 | 1 | -8/+2 |
| | | | | | | | | PHPBB3-11921 | ||||
| * | [ticket/11921] Only get the count of unread PMs | Matt Friedman | 2013-10-16 | 1 | -4/+1 |
| | | | | | | | | PHPBB3-11921 | ||||
| * | [ticket/11921] Move any HTML for Notifications to the templates | Matt Friedman | 2013-10-16 | 7 | -10/+9 |
| | | | | | | | | PHPBB3-11921 | ||||
| * | [ticket/11921] Remove "l_" from non-lang variables | Matt Friedman | 2013-10-15 | 1 | -5/+5 |
| | | | | | | | | PHPBB3-11921 | ||||
| * | [ticket/11921] Improve appearance of PM notifications in linklist | Matt Friedman | 2013-10-15 | 8 | -21/+15 |
| | | | | | | | | PHPBB3-11921 | ||||
| * | [ticket/11921] Improve appearance of Notifications in linklist | Matt Friedman | 2013-10-15 | 8 | -26/+9 |
| | | | | | | | | PHPBB3-11921 | ||||
* | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-10-16 | 2 | -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/11920 | Nils Adermann | 2013-10-15 | 2 | -0/+6 |
| |\ \ | | | | | | | | | [ticket/11920] Actually call travis/setup-mariadb.sh. | ||||
| | * | | [ticket/11920] Print MariaDB version after successful setup. | Andreas Fischer | 2013-10-16 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-11920 | ||||
| | * | | [ticket/11920] Manually purge mysql-common. | Andreas Fischer | 2013-10-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-11920 | ||||
| | * | | [ticket/11920] Actually call travis/setup-mariadb.sh. | Andreas Fischer | 2013-10-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11920 | ||||
* | | | | Merge pull request #1783 from bantu/ticket/11926 | Joas Schilling | 2013-10-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [ticket/11926] Fix plupload migration dependency. | ||||
| * | | | | [ticket/11926] Fix plupload migration dependency. | Andreas Fischer | 2013-10-16 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | PHPBB3-11926 | ||||
* | | | | [develop] Update version to 3.1.0-a2-dev | Joas Schilling | 2013-10-15 | 3 | -3/+3 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop | Nils Adermann | 2013-10-15 | 3 | -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/11920 | Nils Adermann | 2013-10-15 | 3 | -1/+76 |
| |\ \ \ | | |/ / | | | | | [ticket/11920] Add MariaDB environment to Travis-CI. | ||||
| | * | | [ticket/11920] Have to use empty root password otherwise db creation fails. | Andreas Fischer | 2013-10-15 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | PHPBB3-11920 | ||||
| | * | | [ticket/11920] Add MariaDB environment to Travis-CI. | Andreas Fischer | 2013-10-15 | 3 | -1/+69 |
| |/ / | | | | | | | | | | PHPBB3-11920 | ||||
* | | | Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into develop | Joas Schilling | 2013-10-15 | 16 | -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 changes | Joas Schilling | 2013-10-15 | 1 | -0/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'noxwizard/ticket/11919' into prep-release-3.1.0-a1 | Joas Schilling | 2013-10-15 | 1 | -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 Webster | 2013-10-14 | 1 | -2/+2 |
| |/ / |/| | | | | | | | | PHPBB3-11919 | ||||
| * | | Merge remote-tracking branch 'noxwizard/ticket/11918' into prep-release-3.1.0-a1 | Joas Schilling | 2013-10-15 | 8 | -10/+11 |
| |\ \ | | | | | | | | | | | | | | | | | * noxwizard/ticket/11918: [ticket/11918] Make sql_freeresult() consistent across all DB drivers | ||||
| | * | | [ticket/11918] Make sql_freeresult() consistent across all DB drivers | Patrick Webster | 2013-10-14 | 8 | -10/+11 |
| |/ / |/| | | | | | | | | PHPBB3-11918 | ||||
| * | | [prep-release-3.1.0-a1] Only build packages for the latest olympus versions | Joas Schilling | 2013-10-14 | 1 | -1/+1 |
| | | | |||||
| * | | [prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes | Joas Schilling | 2013-10-14 | 1 | -21/+701 |
| | | | |||||
| * | | [prep-release-3.1.0-a1] Update version to 3.1.0-a1 | Joas Schilling | 2013-10-14 | 6 | -8/+8 |
|/ / | |||||
* | | Merge pull request #1772 from bantu/feature/plupload/integration | Nils Adermann | 2013-10-13 | 19 | -9/+1108 |
|\ \ | | | | | | | [ticket/10929] Integration of Plupload | ||||
| * | | [feature/plupload/integration] Add missing javascript file. | Fyorl | 2013-10-14 | 1 | -0/+281 |
| | | | | | | | | | | | | PHPBB3-10929 | ||||
| * | | [feature/plupload/integration] Integration of Plupload | Andreas Fischer | 2013-10-11 | 18 | -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/cron | Nils Adermann | 2013-10-13 | 3 | -0/+136 |
|\ \ \ | | | | | | | | | [ticket/10929] Cron Job for Plupload Upload Directory Cleaning | ||||
| * | | | [feature/plupload/cron] Namespacification | Andreas Fischer | 2013-10-11 | 2 | -7/+9 |
| | | | | | | | | | | | | | | | | PHPBB3-10929 | ||||
| * | | | [feature/plupload/cron] Add cronjob for cleaning plupload temporary directory. | Andreas Fischer | 2013-10-11 | 3 | -0/+134 |
| |/ / | | | | | | | | | | PHPBB3-10929 | ||||
* | | | Merge pull request #1581 from bantu/feature/plupload/deps | Nils Adermann | 2013-10-13 | 13 | -0/+182 |
|\ \ \ | | | | | | | | | [ticket/10929] Plupload dependencies | ||||
| * | | | [feature/plupload/deps] Add information about Plupload to AUTHORS. | Andreas Fischer | 2013-07-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-10929 | ||||
| * | | | [feature/plupload/deps] Adding parts of plupload_1_5_7.zip | Andreas Fischer | 2013-07-17 | 12 | -0/+181 |
| | | | | | | | | | | | | | | | | PHPBB3-10929 | ||||
* | | | | Merge pull request #1776 from bantu/ticket/11913 | Nils Adermann | 2013-10-13 | 1 | -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 Fischer | 2013-10-14 | 1 | -29/+11 |
|/ / / / | | | | | | | | | | | | | PHPBB3-11913 | ||||
* | | | | Merge pull request #1766 from bantu/ticket/11621 | David King | 2013-10-13 | 3 | -17/+52 |
|\ \ \ \ | | | | | | | | | | | [ticket/11621] Improve MySQL fulltext search indexes | ||||
| * | | | | [ticket/11621] Add explanation to mysql_fulltext_drop. | Andreas Fischer | 2013-10-13 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11621 | ||||
| * | | | | [ticket/11621] Correct GPLv2 link in file header. | Andreas Fischer | 2013-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11621 | ||||
| * | | | | [ticket/11621] Put mysql_fulltext_drop into alpha1 migration. | Andreas Fischer | 2013-10-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11621 | ||||
| * | | | | Merge remote-tracking branch 'phpbb/develop' into ticket/11621 | Andreas Fischer | 2013-10-11 | 31 | -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 Fischer | 2013-10-11 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11621 | ||||
| * | | | | | [ticket/11621] Add migration dropping MySQL search indexes. | Andreas Fischer | 2013-10-11 | 1 | -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 Fischer | 2013-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11621 |