mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 14:47:52 +02:00
Code Issues Releases Wiki Activity
24,160 Commits 18 Branches 192 Tags
Commit Graph

2291 Commits

Author SHA1 Message Date
Andreas Fischer
f6d8183f47 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13208] Add security issues to the final changelog
  [prep-release-3.1.0] Prepare Changelog
  [prep-release-3.1.0] Update version to 3.1.0

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-10-25 19:46:24 +02:00
Joas Schilling
80a9c24b6b [prep-release-3.1.0] Update version to 3.1.0 2014-10-23 12:22:02 +02:00
Joas Schilling
947ab91473 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-10-23 02:45:54 +02:00
Joas Schilling
7a90184421 [prep-release-3.1.0-RC6] Update phpBB Version for RC7 development 2014-10-23 02:44:18 +02:00
Joas Schilling
d640a37984 [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6 2014-10-23 01:48:38 +02:00
Joas Schilling
9d6cef2225 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-10-07 22:12:37 +02:00
Joas Schilling
eed4d0d30f [prep-release-3.1.0-RC5] Update phpBB Version for RC6 development 2014-10-07 22:10:45 +02:00
Joas Schilling
7137dc387a [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5 2014-10-07 21:10:14 +02:00
Andreas Fischer
10e99b018a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
 2014-10-07 20:30:40 +02:00
Joas Schilling
4fe95d6870 [ticket/13137] Generate the schema when the schema.json file is not available 
PHPBB3-13137
 2014-10-07 14:55:08 +02:00
Joas Schilling
943f2e1a7b [ticket/13137] Remove schema.json file 
PHPBB3-13137
 2014-10-07 14:55:05 +02:00
Nils Adermann
c8c50b3c89 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13136] Update schema.json with latest changes
 2014-10-07 13:58:12 +02:00
Joas Schilling
7bd5c793bb [ticket/13136] Update schema.json with latest changes 
PHPBB3-13136
 2014-10-07 13:14:33 +02:00
Andreas Fischer
01e200d49a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13077] Move extension module to the top of the Customise tab
 2014-10-06 23:35:35 +02:00
Joas Schilling
6d0697eb89 [ticket/13077] Move extension module to the top of the Customise tab 
PHPBB3-13077
 2014-09-24 00:34:17 +02:00
Dhruv
93dc33b002 Merge branch 'develop-ascraeus' into develop 
# By Jakub Senko
# Via Dhruv Goel (1) and Jakub Senko (1)
* develop-ascraeus:
  [ticket/13045] Remove Pragma headers
 2014-09-21 11:31:13 +05:30
Dhruv Goel
84e68b3a73 Merge pull request #2963 from Senky/ticket/13045 
[ticket/13045] Remove Pragma headers
 2014-09-21 11:29:56 +05:30
Joas Schilling
e23d2e7b20 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Prepare Changelog
  [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-09-20 09:55:56 +02:00
Joas Schilling
26c6ffa458 [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development 2014-09-20 09:52:53 +02:00
Joas Schilling
301694e922 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 2014-09-19 19:02:31 +02:00
Tristan Darricau
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
Joas Schilling
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
Jakub Senko
e59222496a [ticket/13045] Remove Pragma headers 
PHPBB3-13045
 2014-09-17 20:10:01 +02:00
Joas Schilling
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
Jakub Senko
7cbd9e9524 [ticket/13044] move GMT string out of gmdate() 
PHPBB3-13044
 2014-09-17 11:15:24 +02:00
Jakub Senko
33b2063680 [ticket/13044] Correct Expires headers 
PHPBB3-13044
 2014-09-17 10:52:19 +02:00
Marc Alexander
5fa2d19756 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:37:07 +02:00
Marc Alexander
4a06511d85 Merge pull request #2932 from Nicofuma/ticket/12963 
[ticket/12963] Load extensions migrations from /migration
 2014-09-17 00:36:38 +02:00
Tristan Darricau
8b16d31413 [ticket/12963] Edit deprecation message 
PHPBB3-12963
 2014-09-16 20:18:10 +02:00
Marc Alexander
2634db6031 Merge branch 'develop-ascraeus' into develop 2014-09-14 20:45:11 +02:00
Cesar G
b71571b793 [ticket/13065] Fix rehashing of stored password hash in phpBB2 convertor. 
PHPBB3-13065
 2014-09-14 10:04:18 -07:00
Tristan Darricau
72ee4b3a7c [ticket/12963] Load extensions migrations from /migration 
PHPBB3-12963
 2014-09-10 19:21:57 +02:00
Tristan Darricau
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
3420f8f3201ac337434f73ee00bda6df7b378212)

PHPBB3-12963
 2014-09-10 12:01:01 +02:00
Marc Alexander
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +02:00
Tristan Darricau
b18fe1203a [ticket/12990] Fix unit tests 
PHPBB3-12990
 2014-08-17 16:19:23 +02:00
Joas Schilling
7faf66c492 [ticket/12974] Update nightly build version to 3.2.0-a1-dev 
PHPBB3-12974
 2014-08-12 10:56:20 +02:00
Joas Schilling
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
Joas Schilling
3be239b864 [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development 2014-08-12 10:15:42 +02:00
Joas Schilling
b40225c142 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 2014-08-11 19:30:55 +02:00
Tristan Darricau
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
Joas Schilling
edbae9ceaa [ticket/12970] Regenerate schema.json with new dependencies 
PHPBB3-12970
 2014-08-11 19:09:59 +02:00
Marc Alexander
f09db1a7b4 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/config/services.yml
 2014-08-11 12:23:21 +02:00
Tristan Darricau
850b7dbf07 [ticket/11854] Update the default captcha choosen during the installation 
PHPBB3-11854
 2014-08-11 01:16:28 +02:00
Tristan Darricau
dd88022a70 [ticket/11854] Add a migration to update the captcha_plugin setting 
PHPBB3-11854
 2014-08-11 01:15:54 +02:00
Joas Schilling
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
Marc Alexander
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
Joas Schilling
59780bbd09 [ticket/12958] Remove more references of subsilver2 
PHPBB3-12958
 2014-08-10 12:17:03 +02:00
Nils Adermann
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
Tristan Darricau
e7e6d45789 [ticket/12957] Update the constructions of the template engine 
PHPBB3-12957
 2014-08-10 03:32:27 +02:00
Tristan Darricau
990e64105f [ticket/8064] Change the collation of topic_first_poster_name 
PHPBB3-8064
 2014-08-10 00:58:22 +02:00