Tristan Darricau
a0258ae25c
Merge pull request #3514 from CHItA/ticket/13740
...
[ticket/13740] Refactoring installer
* CHItA/ticket/13740: (75 commits)
[ticket/13740] Reduce number of references in nav provider
[ticket/13740] Move handle_language_select calls to the controllers
[ticket/13740] Fix infinite config.php check loop
[ticket/13740] Move default data settings out of constructors
[ticket/13740] Deduplicate container builder's checks
[ticket/13740] Use JSON for installer config
[ticket/13740] Fix comment
[ticket/13740] Use language service in console application
[ticket/13740] Fix CS in compatibilty_globals.php
[ticket/13740] Fix message element creation in JS
[ticket/13740] Replace more spaces with tabs
[ticket/13740] Fix CS
[ticket/13740] Filter basic directory change attempts in lang change
[ticket/13740] Use tabs instead of spaces in JS file
[ticket/13740] Add success message when install finished
[ticket/13740] Fix $script_path in obtain_data
[ticket/13740] Fix is_phpbb_installed() method
[ticket/13740] Login admin when install finished
[ticket/13740] Enhance server output buffer bypass
[ticket/13740] Secure installer config against corrupted config data
...
2015-07-27 11:24:43 +02:00
Mate Bartus
0e3b7e2de6
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13982] Remove extra new line
2015-07-23 21:32:01 +02:00
Marc Alexander
4bf0534bf9
[ticket/13982] Remove extra new line
...
PHPBB3-13982
2015-07-23 18:05:12 +02:00
Marc Alexander
b677bc41c9
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/memberlist_body.html
phpBB/styles/subsilver2/template/memberlist_view.html
phpBB/styles/subsilver2/template/viewtopic_body.html
2015-07-23 12:12:03 +02:00
Marc Alexander
da53d95b95
Merge pull request #3739 from javiexin/ticket/13982
...
[ticket/13982] Add events around ranks
Conflicts:
phpBB/docs/events.md
2015-07-23 12:10:27 +02:00
Marc Alexander
8bfbd77828
Merge branch '3.1.x'
...
Conflicts:
phpBB/includes/acp/acp_profile.php
2015-07-22 10:38:35 +02:00
Marc Alexander
5da50fcf6e
Merge pull request #3719 from javiexin/ticket/13911
...
[ticket/13911] Add events to configure options for profile fields
2015-07-22 10:37:16 +02:00
Marc Alexander
b3974ed0f6
Merge branch '3.1.x'
2015-07-22 10:14:50 +02:00
Marc Alexander
49bffc1851
[ticket/13843] Fix merge issues and update @since version
...
PHPBB3-13843
2015-07-22 09:45:55 +02:00
alf007
8b21e7c0d9
[ticket/13843] Add templates events to insert custom panel in posting
...
Events added in events.md
Add in template posting_editor.html for link to custom panel
Add in template posting_layout.html for include of custom panel template body
PHPBB3-13843
2015-07-22 09:43:59 +02:00
Mate Bartus
030f6da911
[ticket/13740] Remove extra dot from config sample's name
...
PHPBB3-13740
2015-07-21 15:30:31 +02:00
Mate Bartus
846ab1d22f
[ticket/13740] Move install-config.yml to docs/
...
PHPBB3-13740
2015-07-20 18:12:50 +02:00
Marc Alexander
69c66db459
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/ucp_main_front.html
2015-07-20 13:07:32 +02:00
rxu
42dc7eb0f5
[ticket/14002] Add template events before/after user details in ucp_main_front
...
PHPBB3-14002
2015-07-11 17:51:03 +07:00
Marc Alexander
01097a24b5
Merge branch '3.1.x'
...
Conflicts:
tests/template/template_includecss_test.php
2015-07-08 22:54:26 +02:00
Matt Friedman
6294c45bd3
[ticket/13995] Remove invalid name element from anchors in Docs
...
PHPBB3-13995
2015-07-07 20:09:47 -07:00
Matt Friedman
498a516017
[ticket/13995] Remove deprecated projection media type
...
PHPBB3-13995
2015-07-07 20:09:01 -07:00
javiexin
ed3f46a9b1
[ticket/13982] Add events around ranks
...
Add events to present information around ranks in the memberlist,
user profile, viewtopic profile and private message profile.
PHPBB3-13982
2015-07-04 01:51:06 +02:00
javiexin
d0cf674f33
[ticket/13911] Add events to configure options for profile fields
...
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fixed version number again.
PHPBB3-13911
2015-06-27 12:45:56 +02:00
Andreas Fischer
65fef50869
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13931] Wrong order in docs/events.md
Conflicts:
phpBB/docs/events.md
2015-06-16 14:32:01 +02:00
Andreas Fischer
e8769fd561
Merge pull request #3695 from javiexin/ticket/13931
...
[ticket/13931] Wrong order in docs/events.md
* javiexin/ticket/13931:
[ticket/13931] Wrong order in docs/events.md
Conflicts:
phpBB/docs/events.md
2015-06-16 14:29:18 +02:00
CHItA
d5414592f1
Merge branch '3.1.x'
2015-06-16 01:20:22 +02:00
Joas Schilling
002f08ba35
[ticket/13947] Add CHItA to the list of developers
...
PHPBB3-13947
2015-06-16 00:17:00 +02:00
Joas Schilling
2a662c5e07
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/phpbb/user.php
2015-06-14 17:40:18 +02:00
Joas Schilling
38a1442d40
[prep-release-3.1.5] Update version for final 3.1.5 release
2015-06-14 16:11:22 +02:00
Joas Schilling
a3883a6f23
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
2015-06-11 21:00:04 +02:00
Joas Schilling
790f7ded5b
[prep-release-3.1.5] Add changelog for 3.1.5-RC1
2015-06-09 20:45:37 +02:00
javiexin
41f78b5c49
[ticket/13931] Wrong order in docs/events.md
...
Reordered alphabetically (mcp before memberlist).
PHPBB3-13931
2015-06-08 11:26:59 +02:00
javiexin
9057f72fc7
[ticket/13911] Add events to configure options for profile fields
...
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fixed version number and event name.
PHPBB3-13911
2015-06-04 19:13:23 +02:00
Joas Schilling
c28a213b1b
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/mcp_post.html
2015-06-04 17:46:36 +02:00
Joas Schilling
bb7f843344
Merge pull request #3558 from javiexin/ticket/13786
...
[ticket/13786] Add events to add MCP post options
2015-06-04 17:45:21 +02:00
javiexin
0f6d16920b
[ticket/13911] Add events to configure options for profile fields
...
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields.
PHPBB3-13911
2015-06-02 13:18:33 +02:00
Joas Schilling
5bf48bddf8
Merge branch 'ticket/13808' into ticket/13808-master
...
* ticket/13808:
[ticket/13808] Fix version
Conflicts:
phpBB/docs/events.md
2015-05-28 12:35:25 +02:00
Joas Schilling
0daa999fd0
[ticket/13808] Fix version
...
PHPBB3-13808
2015-05-28 12:34:21 +02:00
Joas Schilling
c5b2822cf5
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13808] search_body_form_before
Conflicts:
phpBB/styles/subsilver2/template/search_body.html
2015-05-28 11:09:24 +02:00
Joas Schilling
8fda16527e
Merge pull request #3600 from dragosvr92/ticket/13808
...
[ticket/13808] search_body_form_before
2015-05-28 11:05:32 +02:00
Oliver Schramm
c1ab364e28
Merge branch '3.1.x'
2015-05-15 17:54:10 +02:00
Oliver Schramm
1c0c9c1bca
Merge pull request #3563 from rxu/ticket/13791
...
[ticket/13791] Add more post buttons template events to viewtopic_body.html
2015-05-15 17:52:44 +02:00
Marc Alexander
11167f6060
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/viewforum_body.html
2015-05-14 15:57:41 +02:00
Marc Alexander
d004a1c6b8
Merge pull request #3540 from RMcGirr83/ticket/13699
...
[ticket/13699] Add event before and after forum title in viewforum
2015-05-14 15:56:05 +02:00
dragosvr92
345c25c367
[ticket/13808] search_body_form_before
...
Extensions may be designed to add secondary search options,
such as Google search in the search_body.html.
There are no events in the searchbody, so this should be merged.
PHPBB3-13808
2015-05-09 16:41:18 +03:00
Marc Alexander
83e9cdeebc
Merge branch '3.1.x'
2015-05-08 11:19:59 +02:00
Marc Alexander
b3b7f8e925
Merge pull request #3530 from VSEphpbb/ticket/13753
...
[ticket/13753] Add template events to forum category row headers
2015-05-08 11:19:53 +02:00
Richard McGirr
c2b4636008
[ticket/13699] Add event before and after forum title in viewforum
...
PHPBB3-13699
2015-05-05 13:37:46 -04:00
Joas Schilling
36abb61d39
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
2015-05-03 18:44:34 +02:00
Joas Schilling
005c27e73d
[prep-release-3.1.4] Add security issue to changelog
2015-05-03 17:14:55 +02:00
Andreas Fischer
9074738a10
Merge branch '3.1.x'
...
* 3.1.x:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
2015-05-03 16:45:10 +02:00
Andreas Fischer
dde72c58b0
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* prep-release-3.0.14:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-05-03 16:39:51 +02:00
Andreas Fischer
11242dd07d
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
2015-05-03 16:22:28 +02:00
rxu
aef5be3d17
[ticket/13791] Add more post buttons template events to viewtopic_body.html
...
The purpose is to allow adding custom post buttons outside of original post
buttons conditionals/list in prosilver (for subsilver2 it's not the issue).
PHPBB3-13791
2015-05-01 10:59:18 +07:00
