Andreas Fischer
878cb836f5
[ticket/11920] Actually call travis/setup-mariadb.sh.
...
PHPBB3-11920
2013-10-15 22:44:49 +02:00
Nils Adermann
437d38bc05
Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop
...
* 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
2013-10-15 13:36:42 -07:00
Nils Adermann
8131700330
Merge pull request #1780 from bantu/ticket/11920
...
[ticket/11920] Add MariaDB environment to Travis-CI.
2013-10-15 13:34:51 -07:00
Matt Friedman
8608204097
[ticket/11921] Improve appearance of PM notifications in linklist
...
PHPBB3-11921
2013-10-15 10:29:15 -07:00
Matt Friedman
9363986f43
[ticket/11921] Improve appearance of Notifications in linklist
...
PHPBB3-11921
2013-10-15 10:27:00 -07:00
Joas Schilling
3521dfc278
Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into develop
...
* 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
2013-10-15 18:40:43 +02:00
Andreas Fischer
55e24eb4f8
[ticket/11920] Have to use empty root password otherwise db creation fails.
...
PHPBB3-11920
2013-10-15 16:57:16 +02:00
Andreas Fischer
cdaea7a406
[ticket/11920] Add MariaDB environment to Travis-CI.
...
PHPBB3-11920
2013-10-15 16:28:59 +02:00
Joas Schilling
a35721f68c
[prep-release-3.1.0-a1] Update changelog with the latest changes
2013-10-15 15:46:11 +02:00
Joas Schilling
532b124115
Merge remote-tracking branch 'noxwizard/ticket/11919' into prep-release-3.1.0-a1
...
* noxwizard/ticket/11919:
[ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
2013-10-15 15:41:09 +02:00
Joas Schilling
8dc824d4b3
Merge remote-tracking branch 'noxwizard/ticket/11918' into prep-release-3.1.0-a1
...
* noxwizard/ticket/11918:
[ticket/11918] Make sql_freeresult() consistent across all DB drivers
2013-10-15 15:39:12 +02:00
Patrick Webster
2b1ee16e4f
[ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
...
PHPBB3-11919
2013-10-14 21:18:41 -05:00
Patrick Webster
76ddf1ca41
[ticket/11918] Make sql_freeresult() consistent across all DB drivers
...
PHPBB3-11918
2013-10-14 16:37:23 -05:00
Marc Alexander
87bd628241
[feature/passwords] Minor cleanup in passwords files
...
PHPBB3-11610
2013-10-14 14:31:00 +02:00
Joas Schilling
7a46976a78
[prep-release-3.1.0-a1] Only build packages for the latest olympus versions
2013-10-14 12:21:54 +02:00
Joas Schilling
a953a65b6c
[prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes
2013-10-14 12:08:00 +02:00
Joas Schilling
4709cbbed3
[prep-release-3.1.0-a1] Update version to 3.1.0-a1
2013-10-14 12:04:18 +02:00
Nils Adermann
40932c26ea
Merge pull request #1772 from bantu/feature/plupload/integration
...
[ticket/10929] Integration of Plupload
2013-10-13 16:01:00 -07:00
Nils Adermann
5927f0dbf2
Merge pull request #1582 from bantu/feature/plupload/cron
...
[ticket/10929] Cron Job for Plupload Upload Directory Cleaning
2013-10-13 16:00:43 -07:00
Nils Adermann
b9ca3dc354
Merge pull request #1581 from bantu/feature/plupload/deps
...
[ticket/10929] Plupload dependencies
2013-10-13 16:00:33 -07:00
Fyorl
9f1c627988
[feature/plupload/integration] Add missing javascript file.
...
PHPBB3-10929
2013-10-14 00:52:37 +02:00
Nils Adermann
5f82eccc44
Merge pull request #1776 from bantu/ticket/11913
...
[ticket/11913] Better download.phpbb.com directory structure for phpBB 3...
2013-10-13 15:22:01 -07:00
Andreas Fischer
7e96b663f1
[ticket/11913] Better download.phpbb.com directory structure for phpBB 3.1+
...
PHPBB3-11913
2013-10-14 00:15:10 +02:00
David King
1769135eaf
Merge pull request #1766 from bantu/ticket/11621
...
[ticket/11621] Improve MySQL fulltext search indexes
2013-10-13 13:45:41 -07:00
Marc Alexander
61f60d395a
[feature/passwords] Use passwords manager service instead of functions
...
The old functions phpbb_hash() and phpbb_check_hash() have been replaced with
the passwords manager service in all front-end related files. The phpBB2
converter and the release_3_0_5_rc1 migration file have not been changed.
The same applies to the security/hash_test that still tests the function
phpbb_check_hash(). This will however make sure that the old function
still works.
PHPBB3-11610
2013-10-13 16:32:37 +02:00
Marc Alexander
e674313559
[feature/passwords] Use passwords.manager service in login_forum_box()
...
Additionally, unused variables have been removed from the globals and
the request class is now used instead of the request_var() function.
PHPBB3-11610
2013-10-13 16:09:55 +02:00
Andreas Fischer
6ccceca064
[ticket/11621] Add explanation to mysql_fulltext_drop.
...
PHPBB3-11621
2013-10-13 14:25:28 +02:00
Marc Alexander
0f64843ac8
[feature/passwords] Use VCHAR_UNI instead of VCHAR_CI for user_passwords
...
PHPBB3-11610
2013-10-13 12:06:02 +02:00
Marc Alexander
1d57ec1f65
[feature/passwords] Add functional tests for forum passwords
...
PHPBB3-11610
2013-10-13 12:06:02 +02:00
Marc Alexander
841dd6b19f
[feature/passwords] Modify forum_password column type for new hash types
...
PHPBB3-11610
2013-10-13 12:05:55 +02:00
Andreas Fischer
2050a39da7
[feature/plupload/integration] Integration of Plupload
...
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
2013-10-11 17:40:16 +02:00
Andreas Fischer
4c56080608
[ticket/11621] Correct GPLv2 link in file header.
...
PHPBB3-11621
2013-10-11 16:02:56 +02:00
Andreas Fischer
beda12c055
[feature/plupload/cron] Namespacification
...
PHPBB3-10929
2013-10-11 15:53:22 +02:00
Dhruv
6bf03cc48c
Merge remote-tracking branch 'bantu/ticket/11908' into develop
...
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11908:
[ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception.
2013-10-11 19:18:17 +05:30
Andreas Fischer
67530d132a
[feature/plupload/cron] Add cronjob for cleaning plupload temporary directory.
...
PHPBB3-10929
2013-10-11 15:48:04 +02:00
Andreas Fischer
d310c17c7f
[ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception.
...
PHPBB3-11908
2013-10-11 14:52:07 +02:00
Dhruv
659236a32f
Merge remote-tracking branch 'nickvergessen/ticket/11906' into develop
...
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11906:
[ticket/11906] Fix namespace issues in prune_notifications
[ticket/11906] Add notification purge cron to cron tasks
[ticket/11906] Add missing configs from notifications cron to schema_data.sql
2013-10-11 17:57:16 +05:30
Andreas Fischer
a049c4f0af
[ticket/11621] Put mysql_fulltext_drop into alpha1 migration.
...
PHPBB3-11621
2013-10-11 14:16:58 +02:00
Andreas Fischer
cab660f909
Merge remote-tracking branch 'phpbb/develop' into ticket/11621
...
* 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
2013-10-11 14:15:46 +02:00
Andreas Fischer
a30f1729d8
[ticket/11621] Use effectively_installed() instead.
...
PHPBB3-11621
2013-10-11 14:09:29 +02:00
Joas Schilling
9e0fd29820
[ticket/11906] Fix namespace issues in prune_notifications
...
PHPBB3-11906
2013-10-11 13:56:00 +02:00
Marc Alexander
b795ce8b7d
[feature/passwords] Remove obsolete hashing functions from functions.php
...
These hashing functions have been worked into the salted md5 driver.
PHPBB3-11610
2013-10-11 13:34:40 +02:00
Marc Alexander
da39707d16
[feature/passwords] Mark old hashing functions as deprecated
...
PHPBB3-11610
2013-10-11 13:34:15 +02:00
Dhruv
2198c29c20
Merge remote-tracking branch 'nickvergessen/ticket/11867' into develop
...
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11867:
[ticket/11867] Schema files are not created by create_schema_files.php
2013-10-11 15:58:35 +05:30
Joas Schilling
698a2236a5
[ticket/11867] Schema files are not created by create_schema_files.php
...
PHPBB3-11867
2013-10-11 11:59:28 +02:00
Joas Schilling
5d28d22976
[ticket/11906] Add notification purge cron to cron tasks
...
PHPBB3-11906
2013-10-11 11:51:37 +02:00
Joas Schilling
287400cdf8
[ticket/11906] Add missing configs from notifications cron to schema_data.sql
...
PHPBB3-11906
2013-10-11 11:47:42 +02:00
Marc Alexander
ce51f878eb
[feature/passwords] Add phpass copyright notice to salted md5 driver
...
PHPBB3-11610
2013-10-11 09:43:30 +02:00
Nils Adermann
230c1ecb6a
Merge pull request #1767 from EXreaction/ticket/11905
...
[ticket/11905] 3.1.0-a1 Migration
2013-10-10 17:35:26 -07:00
Nathan Guse
3b1eccbf74
[ticket/11905] 3.1.0-a1 Migration
...
Created a migration tips develop tool to help find the migration tree tips so
they can be copied to versions released.
With this, A1 is the only current tree tip (it depends on all other migrations).
PHPBB3-11905
2013-10-10 18:19:20 -05:00