1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 14:46:28 +02:00
Commit Graph

2270 Commits

Author SHA1 Message Date
7548bc89ea Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12963] Always use core_path and core_directory()
  [ticket/12963] Remove old migration/ folder from tests
  [ticket/12963] Revert back to "migrations" folder name for extensions
2014-09-18 14:04:22 +02:00
c220fa89a1 [ticket/12963] Revert back to "migrations" folder name for extensions
The issues that can be created with the name change are just too much

PHPBB3-12963
2014-09-18 10:45:08 +02:00
428e492542 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13044] Move GMT out of gmdate in functions_acp
  [ticket/13044] Move GMT out of gmdate()
  [ticket/13044] \G\M\T to GMT in whole project
  [ticket/13044] move GMT string out of gmdate()
  [ticket/13044] Correct Expires headers
2014-09-17 19:51:57 +02:00
7cbd9e9524 [ticket/13044] move GMT string out of gmdate()
PHPBB3-13044
2014-09-17 11:15:24 +02:00
33b2063680 [ticket/13044] Correct Expires headers
PHPBB3-13044
2014-09-17 10:52:19 +02:00
5fa2d19756 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:37:07 +02:00
4a06511d85 Merge pull request #2932 from Nicofuma/ticket/12963
[ticket/12963] Load extensions migrations from /migration
2014-09-17 00:36:38 +02:00
8b16d31413 [ticket/12963] Edit deprecation message
PHPBB3-12963
2014-09-16 20:18:10 +02:00
2634db6031 Merge branch 'develop-ascraeus' into develop 2014-09-14 20:45:11 +02:00
b71571b793 [ticket/13065] Fix rehashing of stored password hash in phpBB2 convertor.
PHPBB3-13065
2014-09-14 10:04:18 -07:00
72ee4b3a7c [ticket/12963] Load extensions migrations from /migration
PHPBB3-12963
2014-09-10 19:21:57 +02:00
a093c28d1a [ticket/12963] Fix the list of migrations in database_update.php
Without this patch the finder grab all the class available in the ext
folder and not only the migrations. This change is backported for the one
done before to the cli tool db:migrate. (see the commit
3420f8f320)

PHPBB3-12963
2014-09-10 12:01:01 +02:00
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +02:00
b18fe1203a [ticket/12990] Fix unit tests
PHPBB3-12990
2014-08-17 16:19:23 +02:00
7faf66c492 [ticket/12974] Update nightly build version to 3.2.0-a1-dev
PHPBB3-12974
2014-08-12 10:56:20 +02:00
483b40dfa3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Prepare Changelog
  [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3

Conflicts:
	phpBB/styles/subsilver2/style.cfg
2014-08-12 10:17:47 +02:00
3be239b864 [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development 2014-08-12 10:15:42 +02:00
b40225c142 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 2014-08-11 19:30:55 +02:00
a60d4b2507 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12970] Regenerate schema.json with new dependencies
2014-08-11 19:26:37 +02:00
edbae9ceaa [ticket/12970] Regenerate schema.json with new dependencies
PHPBB3-12970
2014-08-11 19:09:59 +02:00
f09db1a7b4 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/config/services.yml
2014-08-11 12:23:21 +02:00
850b7dbf07 [ticket/11854] Update the default captcha choosen during the installation
PHPBB3-11854
2014-08-11 01:16:28 +02:00
dd88022a70 [ticket/11854] Add a migration to update the captcha_plugin setting
PHPBB3-11854
2014-08-11 01:15:54 +02:00
d998efcf54 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
2014-08-10 15:24:43 +02:00
a57a96cbdd [ticket/12932] Add method for getting the datetime class and allow overriding
An extension can now override the datetime class by overwriting the
datetime.class parameter in their own yml file.

PHPBB3-12932
2014-08-10 13:41:08 +02:00
59780bbd09 [ticket/12958] Remove more references of subsilver2
PHPBB3-12958
2014-08-10 12:17:03 +02:00
43bef1b5e4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8064] Change the collation of topic_first_poster_name
2014-08-10 11:55:08 +02:00
e7e6d45789 [ticket/12957] Update the constructions of the template engine
PHPBB3-12957
2014-08-10 03:32:27 +02:00
990e64105f [ticket/8064] Change the collation of topic_first_poster_name
PHPBB3-8064
2014-08-10 00:58:22 +02:00
336d7cd41a [ticket/12940] Remove unused use statements.
PHPBB3-12940
2014-08-09 12:04:30 +02:00
50fcd70428 Merge pull request #2815 from dhruvgoel92/ticket/12778
[ticket/12778] Automatically delete files on update

* dhruvgoel92/ticket/12778:
  [ticket/12778] Rename the file to *.bak instead of deleting
  [ticket/12778] Automatically delete files on update
2014-08-08 16:01:42 +02:00
5488541640 [ticket/12778] Rename the file to *.bak instead of deleting
PHPBB3-12778
2014-08-07 16:52:49 +02:00
9b36b5283c Merge pull request #2761 from Nicofuma/ticket/12873
[ticket/12873] Test the correct identifier in \phpbb\db\tools

* Nicofuma/ticket/12873:
  [ticket/12873] Add migration to rename the index
  [ticket/12873] Don not touch the existing migrations
  [ticket/12873] Test the good identifier in \phpbb\db\tools
2014-08-07 16:49:37 +02:00
07a92d29df [ticket/12778] Automatically delete files on update
PHPBB3-12778
2014-08-07 15:49:41 +02:00
2b3e15cf64 [ticket/12873] Add migration to rename the index
PHPBB3-12873
2014-08-07 14:27:12 +02:00
a8e81b6e9f [ticket/12870] Create the migrations table with a method in the migrator
PHPBB3-12870
2014-07-27 11:08:13 +02:00
919aeb3879 [ticket/12873] Test the good identifier in \phpbb\db\tools
We need to rename the index key because with the default prefix (phpbb_)
this key has a length of 31. And because we don't accept the keys longer
than 30 characters we should ensure that by default no key is longer than
30 characters.

PHPBB3-12873
2014-07-20 23:15:34 +02:00
b5492a07da [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development 2014-07-11 17:22:16 +02:00
c0e0011b10 [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2 2014-07-11 16:03:44 +02:00
58a52fe5b9 [ticket/12775] Set dbal.conn.driver as synthetic during installation
PHPBB3-12775
2014-07-07 01:10:24 +02:00
285656a6d4 [ticket/12775] Extract the vars later in install/install_update.php
PHPBB3-12775
2014-07-07 01:02:47 +02:00
d226a73111 [ticket/12775] Remove useless includes of config.php
PHPBB3-12775
2014-07-07 01:02:42 +02:00
ed812a9dfb [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
PHPBB3-12775
2014-07-07 01:02:40 +02:00
15c23e60b8 [ticket/12775] Update doc blocks
PHPBB3-12775
2014-07-07 01:02:37 +02:00
f2e8e928c0 [ticket/12775] Fix container_builder
PHPBB3-12775
2014-07-07 01:02:36 +02:00
2db160ff87 [ticket/12775] Rename config_php to config_php_file
PHPBB3-12775
2014-07-07 01:02:34 +02:00
40937e21c5 [ticket/12775] Renamed to \phpbb\di\container_builder
PHPBB3-12775
2014-07-07 01:02:33 +02:00
11ff91c87d [ticket/12775] Remove the last include of functions_container
PHPBB3-12775
2014-07-07 01:02:31 +02:00
91ca12f20e [ticket/12775] Update container and config in install/
PHPBB3-12775
2014-07-07 01:02:24 +02:00
cefffe0777 [ticket/12775] Load the config file before constants.php
PHPBB3-12775
2014-07-07 01:02:23 +02:00