Commit graph

30449 commits

Author SHA1 Message Date
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
b635853479 Merge branch '3.1.x' 2015-07-22 10:30:58 +02:00
Marc Alexander
e686f8bbdf Merge pull request #3786 from marc1706/ticket/13311
[ticket/13311] Add core event on acp_forums for forum content deletes
2015-07-22 10:30:52 +02:00
Marc Alexander
b3974ed0f6 Merge branch '3.1.x' 2015-07-22 10:14:50 +02:00
Marc Alexander
d1e6c89b90 Merge pull request #3787 from marc1706/ticket/13843
[ticket/13843] Add templates events to insert custom panel in posting editor
2015-07-22 10:14:43 +02:00
Marc Alexander
23aed66473 [ticket/13311] Remove whitespace at end of line
PHPBB3-13311
2015-07-22 09:54:28 +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
Marc Alexander
ce937346f3 [ticket/13311] Update @since to 3.1.6-RC1
PHPBB3-13311
2015-07-22 09:29:22 +02:00
alf007
e30c6caac8 [ticket/13311] Add core event on acp_forums for forum content deletes
Event added for the function delete_forum_content() in
includes/acp/acp_forums.php, so that you can insert any extension's table(s)
to be updated when forum content is deleted
Incude parameters forum_id, topic_ids and post_counts

PHPBB3-13311
2015-07-22 09:25:19 +02:00
Mate Bartus
0c49b88dde [ticket/13740] Fix CS
PHPBB3-13740
2015-07-22 04:01:52 +02:00
Mate Bartus
97d08d6f56 [ticket/13740] Allow language change in the installer
PHPBB3-13740
2015-07-22 03:16:16 +02:00
Mate Bartus
11642a5f94 [ticket/13740] Keep language file's names
PHPBB3-13740
2015-07-22 02:42:13 +02:00
Jakub Senko
5e3ebda0da [ticket/14043] Add core.get_avatar_after php event
PHPBB3-14043
2015-07-21 21:20:24 +02:00
Zoddo
7e21d1dab5 [ticket/14041] Add viewtopic_dropdown_*_custom template event
Allows an extension to create a custom dropdown menu.

PHPBB3-14041
PHPBB3-14042
2015-07-21 16:33:45 +02:00
Mate Bartus
136ec8d7e2 [ticket/13740] Keep keys when sorting navigation
PHPBB3-13740
2015-07-21 15:53:26 +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
3d4f21c1f8 [ticket/13740] Check navigation requirements
PHPBB3-13740
2015-07-21 15:13:54 +02:00
Mate Bartus
3a3dd94145 [ticket/13740] Remove default config CLI command
PHPBB3-13740
2015-07-21 15:06:15 +02:00
Mate Bartus
b2b9fb1df2 [ticket/13740] Fix CS and docblocks
PHPBB3-13740
2015-07-21 14:42:15 +02:00
Mate Bartus
0488c49116 [ticket/13740] Exit from installation if phpBB is already installed
PHPBB3-13740
2015-07-20 19:26:07 +02:00
Mate Bartus
6216007caa [ticket/13740] Fix docblocks and comments
PHPBB3-13740
2015-07-20 18:47:10 +02:00
Mate Bartus
88bf1d7f58 [ticket/13740] Clean up install config file when installation has finished
PHPBB3-13740
2015-07-20 18:22:53 +02:00
Mate Bartus
846ab1d22f [ticket/13740] Move install-config.yml to docs/
PHPBB3-13740
2015-07-20 18:12:50 +02:00
Mate Bartus
c89b226a7a [ticket/13740] Add more room for further tasks
PHPBB3-13740
2015-07-20 18:06:02 +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
Marc Alexander
6b658874bb Merge pull request #3754 from rxu/ticket/14002
[ticket/14002] Add template events before/after user details in ucp_main_front.html
2015-07-20 13:06:29 +02:00
Marc Alexander
cdaf4381ac Merge branch '3.1.x' 2015-07-20 09:39:42 +02:00
Marc Alexander
ebf0bc2134 Merge pull request #3780 from RMcGirr83/ticket/13815
[ticket/13815] Event parameters in posting have no effect
2015-07-20 09:39:35 +02:00
Tristan Darricau
b39b5d9e56 Merge pull request #3745 from s9e/ticket/13986
[ticket/13986] Add --resume option to reparser CLI

* s9e/ticket/13986:
  [ticket/13986] Replaced hardcoded value
  [ticket/13986] Fixed resume data to carry through multiple runs
  [ticket/13986] Add --resume option to reparser CLI
2015-07-19 22:42:03 +02:00
Tristan Darricau
85f89a0417 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14018] Update CSS for handling quick link menus
  [ticket/14018] Fix responsive quick link menus
2015-07-19 22:23:02 +02:00
Tristan Darricau
203bd4edd5 Merge pull request #3772 from VSEphpbb/ticket/14018
[ticket/14018] Fix responsive quick link menus

* VSEphpbb/ticket/14018:
  [ticket/14018] Update CSS for handling quick link menus
  [ticket/14018] Fix responsive quick link menus
2015-07-19 22:22:17 +02:00
Tristan Darricau
4c687194bf Merge pull request #3778 from s9e/ticket/14036
[ticket/14036] Replace path_helper with a mock

* s9e/ticket/14036:
  [ticket/14036] Fixed mocked web root path
  [ticket/14036] Replace path_helper with a mock
2015-07-19 22:20:23 +02:00
Oliver Schramm
7d31232846 [ticket/8708] Apply permission 'f_announce_global'
PHPBB3-8708
2015-07-19 21:26:47 +02:00
Oliver Schramm
df56b2ed36 [ticket/8708] Add f_announce_global permission
PHPBB3-8708
2015-07-19 21:26:47 +02:00
Richard McGirr
8b981f9ccd [ticket/13815] Event parameters in posting have no effect
PHPBB3-13815
2015-07-19 06:25:59 -04:00
Zoddo
7e1b0330a3 [ticket/13988] Update tests
PHPBB3-13988
2015-07-18 21:18:49 +02:00
Matt Friedman
d548a2aa3e [ticket/14018] Update CSS for handling quick link menus
PHPBB3-14018
2015-07-17 14:35:14 -07:00
javiexin
11256cd167 [ticket/13981] Add events to capture avatar deletion or overwriting
An event to capture overwriting, and another to capture deletion.
Includes better error processing. Replaced global by dependency injection.
Fix typo.

PHPBB3-13981
2015-07-17 23:03:19 +02:00
javiexin
4d3188ba57 [ticket/13981] Add events to capture avatar deletion or overwriting
An event to capture overwriting, and another to capture deletion.
Includes better error processing. Replaced global by dependency injection.

PHPBB3-13981
2015-07-17 19:40:33 +02:00
JoshyPHP
6cc2510cee [ticket/14036] Fixed mocked web root path
...to match what it would return normally

PHPBB3-14036
2015-07-17 19:10:36 +02:00
JoshyPHP
ca141f2e1e [ticket/14036] Replace path_helper with a mock
PHPBB3-14036
2015-07-17 18:28:27 +02:00
JoshyPHP
c8e209a2de [ticket/13986] Replaced hardcoded value
PHPBB3-13986
2015-07-17 16:52:52 +02:00
Marc Alexander
39f3313534 Merge branch '3.1.x' 2015-07-17 16:15:25 +02:00
Marc Alexander
56251adc24 Merge pull request #3732 from kinerity/ticket/13974
[ticket/13974] Add core.mcp_change_poster_after event
2015-07-17 16:15:22 +02:00
Marc Alexander
24625d3afc Merge branch '3.1.x' 2015-07-17 16:08:31 +02:00
Marc Alexander
4262dfeaef Merge pull request #3731 from marcovo/ticket/13971
[ticket/13971] Add draft_id var to core.posting_modify_template_vars
2015-07-17 16:08:28 +02:00
JoshyPHP
9274bc4e32 [ticket/13986] Fixed resume data to carry through multiple runs
Options restored from a previous execution should carry to the
next resumed execution

PHPBB3-13986
2015-07-17 14:02:19 +02:00
Marc Alexander
12f85a6a89 Merge branch '3.1.x' 2015-07-17 13:35:34 +02:00