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

1563 Commits

Author SHA1 Message Date
Nils Adermann
29d2a7bc9f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13271] Disable CC sender feature for anonymous users
  [prep-release-3.1.1] Add 3.1.1 CHANGELOG
  [prep-release-3.1.1] Add 3.1.1 migration file
  [ticket/13263] Make sure default style exists and clean up code
  [ticket/13263] Only install/set prosilver if no style available
  [ticket/13263] Use prosilver as default style if user's style doesn't exist
  [ticket/security-164] Correctly format page_name
  [ticket/security-164] Sanitize all global variables in symfony_request class
  [ticket/13248] Use functional framework login method in tests
  [ticket/13248] Correctly pass provider name
  [ticket/13248] Always use provider collection for getting provider
  [ticket/13248] Allow specifying different auth provider in provider collection
  [ticket/13248] Use auth provider collection for getting provider
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
  [ticket/13267] Update Automatic Update instructions to include vendor directory
  [ticket/13268] Properly append ternary result in get_existing_indexes()
  [prep-release-3.1.1] Update version number to 3.1.1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/memberlist_email.html
 2014-11-02 01:29:04 +01:00
Nils Adermann
aede89d408 [prep-release-3.1.1] Add 3.1.1 CHANGELOG 2014-11-02 00:20:44 +01:00
Nils Adermann
f3588c66ec Merge branch 'ticket/13262' into prep-release-3.1.1 
* ticket/13262:
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
 2014-11-01 19:14:11 +01:00
Matt Friedman
a269929f0e [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 
PHPBB3-13262
 2014-11-01 19:14:00 +01:00
Patrick Webster
8bdbadabb2 [ticket/13267] Update Automatic Update instructions to include vendor directory 
PHPBB3-13267
 2014-11-01 19:13:09 +01:00
Marc Alexander
9908f8e3ea Merge branch 'develop-ascraeus' into develop 2014-11-01 09:10:48 +01:00
Matt Friedman
416577f3dc [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 
PHPBB3-13262
 2014-10-31 13:08:36 -07:00
Joas Schilling
e874e1ea47 Merge branch 'develop-ascraeus' into develop 2014-10-28 13:35:34 +01:00
Joas Schilling
197fed16bd [prep-release-3.1.0] Update changelog with final changes 2014-10-28 13:08:52 +01:00
Nils Adermann
741bac5b2e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0] Update CHANGELOG with last minute changes
 2014-10-26 12:54:09 -07:00
Nils Adermann
51251293ab [prep-release-3.1.0] Update CHANGELOG with last minute changes 2014-10-26 12:53:45 -07:00
Nils Adermann
d70d2cfcd1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0] Add missing CHANGELOG entries for RC6
 2014-10-25 18:11:09 -07:00
Nils Adermann
5cee745fc5 [prep-release-3.1.0] Add missing CHANGELOG entries for RC6 2014-10-25 18:10:30 -07:00
Nils Adermann
cfe1a7d6d1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0] Add CHANGELOG for 3.1.0
 2014-10-25 17:12:42 -07:00
Nils Adermann
c789acc091 [prep-release-3.1.0] Add CHANGELOG for 3.1.0 2014-10-25 17:12:14 -07:00
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
1cd09a03e6 [prep-release-3.1.0] Prepare Changelog 2014-10-23 12:25:52 +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
5847a50334 [prep-release-3.1.0-RC6] Add changelog for 3.1.0-RC6 2014-10-23 01:57:59 +02:00
Joas Schilling
1ade9b39e4 [prep-release-3.1.0-RC6] Prepare Changelog 2014-10-23 01:55:48 +02:00
Marc Alexander
14bfba5070 Merge branch 'develop-ascraeus' into develop 2014-10-21 19:25:09 -05:00
Marc Alexander
e43d1781bf Merge branch 'develop-olympus' into develop-ascraeus 
Conflicts:
	phpBB/docs/AUTHORS
 2014-10-21 19:24:48 -05:00
Joas Schilling
9cf81ac7f5 [ticket/12120] Remove EXreaction from active authors 
PHPBB3-12120
 2014-10-21 18:17:59 +02:00
Joas Schilling
ac29211f91 Merge branch 'develop-ascraeus' into develop 2014-10-20 16:28:59 +02:00
Oliver Schramm
51044167d1 [ticket/13187] Fix HTML validity of INSTALL.html 
PHPBB3-13187
 2014-10-20 15:36:27 +02:00
Joas Schilling
9c6b3d3931 Merge branch 'develop-ascraeus' into develop 2014-10-20 15:21:11 +02:00
Cesar G
6763de2f25 [ticket/12568] Fix awkward use of "phpBB Limited." 
PHPBB3-12568
 2014-10-16 20:37:26 -07:00
Cesar G
09b6add6ee [ticket/12568] The "Purge cache" option in the Customise tab no longer exists. 
PHPBB3-12568
 2014-10-16 20:33:24 -07:00
Cesar G
810d249ca2 [ticket/12568] Update GitHub link. 
PHPBB3-12568
 2014-10-16 20:20:15 -07:00
Cesar G
29ea1c85b4 [ticket/12568] Fix typo - "directorie" -> "directories" 
PHPBB3-12568
 2014-10-16 20:18:52 -07:00
Cesar G
f19a6b9714 [ticket/12568] Remove various unnecessary references to phpBB3. 
PHPBB3-12568
 2014-10-16 20:17:01 -07:00
Cesar G
d06c2cf0f7 [ticket/12568] Update style installation instructions. 
PHPBB3-12568
 2014-10-16 19:47:02 -07:00
Cesar G
7e08109229 [ticket/12568] Update path to language pack installation page. 
PHPBB3-12568
 2014-10-16 19:47:02 -07:00
Cesar G
defd36ad7f [ticket/12568] Replace modifications explanation with extensions. 
PHPBB3-12568
 2014-10-16 19:47:02 -07: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
366451c11c [prep-release-3.1.0-RC5] Add changelog for 3.1.0-RC5 2014-10-07 21:16:34 +02:00
Joas Schilling
9d13b91f46 [prep-release-3.1.0-RC5] Prepare Changelog 2014-10-07 21:14:55 +02:00
Joas Schilling
1ed3eb7b0b Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
 2014-10-06 22:22:05 +02:00
Jakub Senko
51ece03612 [ticket/13025] Make RC uppercase 
PHPBB3-13025
 2014-10-04 10:36:45 +02:00
Jakub Senko
a0673f8e10 [ticket/13025] rc4 -> rc5 
PHPBB3-13025
 2014-10-03 13:18:41 +02:00
Jakub Senko
4193bf5641 [ticket/13025] Add button template events 
PHPBB3-13025
 2014-10-03 13:16:44 +02:00
Joas Schilling
d3ee8d24bc Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/forumlist_body.html
 2014-10-01 09:53:08 +02:00
rxu
cee8ac9dbe [ticket/13107] Add template events to forum row in forumlist_body.html 
PHPBB3-13107
 2014-09-27 09:26:35 +08:00
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
2c5e184ea1 [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 2014-09-19 19:09:46 +02:00
Joas Schilling
841abf712e [prep-release-3.1.0-RC4] Prepare Changelog 2014-09-19 19:07:41 +02:00
Marc Alexander
f7d41c8465 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_header.html
 2014-09-05 21:07:02 +02:00
Marc Alexander
b854882470 Merge pull request #2868 from rxu/ticket/12969 
[ticket/12969] Add template events around username link on composing pm
 2014-09-05 21:05:33 +02:00
Marc Alexander
da9888d04f Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_warn_post.html
	phpBB/styles/subsilver2/template/mcp_warn_user.html
 2014-09-01 22:46:08 +02:00
Marc Alexander
d86817ef07 Merge pull request #2887 from Pico/ticket/12991 
[ticket/12991] Have events after/before "add warning" field - user and post
 2014-09-01 22:43:54 +02:00