mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
24,868 Commits 17 Branches 190 Tags
Commit Graph

1596 Commits

Author SHA1 Message Date
Joas Schilling
ba90746ce5 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
 2015-01-06 11:25:26 +01:00
Kailey Truscott
652a7630bb [ticket/13437] Change "View" to "view" 
PHPBB3-13437
 2015-01-02 10:38:56 -05:00
Kailey Truscott
7dad863a41 Fix events.md event name 
PHPBB3-13437
 2015-01-02 10:20:36 -05:00
Kailey Truscott
c61fa1aaa1 [ticket/13437] Add template event viewtopic_body_post_author_before/after 
PHPBB3-13437
 2015-01-02 10:00:01 -05:00
Joas Schilling
7b0809414f Merge branch 'develop-ascraeus' into develop 2014-12-27 14:12:31 +01:00
Joas Schilling
6ff0aaaa70 Merge pull request #3225 from prototech/ticket/13302 
[ticket/13302] Fix incorrect links to phpBB.com resources
 2014-12-27 14:12:23 +01:00
Joas Schilling
cf8904bc2c Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_front.html
 2014-12-27 14:09:38 +01:00
Joas Schilling
ffbe1d424b Merge pull request #3224 from prototech/ticket/13427 
[ticket/13427] Add several before/after template events to mcp_front.html
 2014-12-27 14:08:51 +01:00
Joas Schilling
fbe0f04132 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/overall_footer.html
 2014-12-27 14:03:34 +01:00
Cesar G
719aa66224 [ticket/13302] Fix incorrect link to extensions database. 
PHPBB3-13302
 2014-12-09 17:10:08 -08:00
Cesar G
15507ffc16 [ticket/13302] Update translations forum link to 3.1. 
PHPBB3-13302
 2014-12-09 17:10:08 -08:00
Cesar G
bb4b3d2731 [ticket/13302] Update documentation and support forum links to 3.1 versions. 
PHPBB3-13302
 2014-12-09 17:10:03 -08:00
Cesar G
4dab281da1 [ticket/13427] Add several before/after template events to mcp_front.html. 
PHPBB3-13427
 2014-12-09 16:26:32 -08:00
rxu
0a419781c2 [ticket/13419] Add the lowermost template event 
PHPBB3-13419
 2014-12-06 16:36:33 +07:00
Joas Schilling
1a0cba1099 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-11-25 16:47:22 +01:00
Joas Schilling
9264d7c758 [prep-release-3.1.2] Update Changelog with 13376 2014-11-25 15:44:39 +01:00
Joas Schilling
5f3dffa820 [prep-release-3.1.2] Add changelog for 3.1.2-RC1 2014-11-22 19:35:24 +01:00
Joas Schilling
18d5ca9ce5 [prep-release-3.1.2] Prepare Changelog 2014-11-22 19:32:36 +01:00
Joas Schilling
73f1cfd583 Merge branch 'develop-ascraeus' into develop 2014-11-21 20:09:27 +01:00
Joas Schilling
71a015557f Merge pull request #3150 from omniError/ticket/13347 
[ticket/13347] missing acp_forums template events

Conflicts:
	phpBB/docs/events.md
 2014-11-21 20:09:13 +01:00
Joas Schilling
ac33ee2290 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/index_body.html
 2014-11-21 19:54:44 +01:00
Joas Schilling
2d6734cb0a Merge pull request #3126 from VSEphpbb/ticket/13290 
[ticket/13290] Add EVENT index_body_forumlist_body_after
 2014-11-21 19:53:15 +01:00
Joas Schilling
462664b4b4 Merge branch 'develop-ascraeus' into develop 2014-11-21 19:42:28 +01:00
Joas Schilling
7bc1917908 Merge pull request #3122 from Elsensee/ticket/13309 
[ticket/13309] Add event acp_email_options_after
 2014-11-21 19:42:14 +01:00
Joas Schilling
987bd7b3a7 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_search.html
 2014-11-21 19:25:32 +01:00
Joas Schilling
c31b53942d Merge pull request #3071 from rxu/ticket/13220 
[ticket/13220] Add template events to memberlist_search.html
 2014-11-21 19:23:10 +01:00
Cesar G
e1865df7dd Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13023] Add template event posting_editor_buttons_custom_tags_before

Conflicts:
	phpBB/styles/subsilver2/template/posting_buttons.html
 2014-11-18 01:33:13 -08:00
Cesar G
052fdcc8d9 Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeus 
* Nicofuma/ticket/13023:
  [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
 2014-11-18 01:30:06 -08:00
omniError
c1a0d1bf3d [ticket/13347] update event docs 
PHPBB3-13347
 2014-11-17 16:25:56 -06:00
Tristan Darricau
074b91497b [ticket/13023] Add template event posting_editor_buttons_custom_tags_before 
PHPBB3-13023
 2014-11-16 11:52:30 +01:00
Matt Friedman
971b30a76d [ticket/13290] Add EVENT index_body_forumlist_body_after 
PHPBB3-13290
 2014-11-10 13:56:52 -08:00
Oliver Schramm
98711450dd [ticket/13309] Add event acp_email_options_after 
PHPBB3-13309
 2014-11-09 02:31:20 +01:00
rxu
70641e701a [ticket/13220] Add template events to memberlist_search.html 
PHPBB3-13220
 2014-11-08 21:22:59 +07:00
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