mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
26,414 Commits 17 Branches 190 Tags
Commit Graph

26414 Commits

This Branch
This Branch
All Branches
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
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
Richard McGirr
8b981f9ccd [ticket/13815] Event parameters in posting have no effect 
PHPBB3-13815
 2015-07-19 06:25:59 -04:00
Matt Friedman
d548a2aa3e [ticket/14018] Update CSS for handling quick link menus 
PHPBB3-14018
 2015-07-17 14:35:14 -07: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
Marc Alexander
100fd39c5e Merge pull request #3593 from satanasov/ticket/13817 
[ticket/13817] Add core.update_session event
 2015-07-17 13:35:15 +02:00
Marc Alexander
29a15710d6 Merge pull request #3773 from Nicofuma/ticket/14015 
[ticket/14015] Update Symfony
 2015-07-17 13:03:07 +02:00
JoshyPHP
903f100c51 [ticket/13986] Add --resume option to reparser CLI 
PHPBB3-13986
 2015-07-17 11:53:28 +02:00
Tristan Darricau
15ea66c096 [ticket/14015] Update Symfony 
- Removing symfony/filesystem (2.8.x-dev 45cc231)
- Installing symfony/filesystem (2.8.x-dev 9f70c56)
	Cloning 9f70c5625a32b2f1e6fc37222f52b4e0eb437b0e

- Removing symfony/config (2.8.x-dev 291e3f1)
- Installing symfony/config (2.8.x-dev 358ec92)
	Cloning 358ec929e494b6f12d8508d88357cbd7383a10ca

- Removing symfony/console (2.8.x-dev 7e857a2)
- Installing symfony/console (2.8.x-dev fd85e75)
	Cloning fd85e7517e79a2bceafcee8f7e8b7bbd0919a90a

- Removing symfony/dependency-injection (2.8.x-dev 90a7527)
- Installing symfony/dependency-injection (2.8.x-dev f279142)
	Cloning f279142fb6bc21e83fcd40e0a01a62ff527268be

- Removing symfony/finder (2.8.x-dev fd26bdb)
- Installing symfony/finder (2.8.x-dev 8712d5e)
	Cloning 8712d5e8c4ad65e6b936ed9b6a581e5e6a87fddf

- Removing symfony/http-foundation (2.8.x-dev 06aa08b)
- Installing symfony/http-foundation (2.8.x-dev 5339030)
	Cloning 5339030f5af0d6fef7c897130291ac168278289f

- Removing symfony/event-dispatcher (2.8.x-dev 8766ceb)
- Installing symfony/event-dispatcher (2.8.x-dev d724688)
	Cloning d7246885b7fe4cb5a2786bda34362d2f0e40b730

- Removing symfony/debug (2.8.x-dev eda866d)
- Installing symfony/debug (2.8.x-dev d1114d8)
	Cloning d1114d892ae70f833871dc55599f17084191efaa

- Removing symfony/http-kernel (2.8.x-dev c587069)
- Installing symfony/http-kernel (2.8.x-dev f24d2cb)
	Cloning f24d2cb4778ecc5f6c8e8f7f31bc4691099a920d

- Removing symfony/routing (2.8.x-dev 76b18ed)
- Installing symfony/routing (2.8.x-dev 9e797cd)
	Cloning 9e797cd70762db18d87c59dc6bc1ab7c3eb963ed

- Removing symfony/security-core (2.8.x-dev 2c21845)
- Installing symfony/security-core (2.8.x-dev 8253e02)
	Cloning 8253e027bf8a1c9c573a7b3c494027847058c959

- Removing symfony/twig-bridge (2.8.x-dev 2e072a1)
- Installing symfony/twig-bridge (2.8.x-dev a02e3a8)
	Cloning a02e3a8ff1f8eda04d0e0655d2cefcbe9ecc4e14

- Removing symfony/yaml (2.8.x-dev 2396832)
- Installing symfony/yaml (2.8.x-dev 000e7fc)
	Cloning 000e7fc2653335cd42c6d21405dac1c74224a387

- Removing symfony/dom-crawler (2.8.x-dev 3a523d1)
- Installing symfony/dom-crawler (2.8.x-dev 3aed431)
	Cloning 3aed431721a4a779d1ec30210bd53075da9623f5

- Removing symfony/browser-kit (2.8.x-dev 4916397)
- Installing symfony/browser-kit (2.8.x-dev 4f297d7)
	Cloning 4f297d7e00c375b6ab03732e076f65799a73937d

- Removing symfony/process (2.8.x-dev daf96f1)
- Installing symfony/process (2.8.x-dev 25d74c9)
	Cloning 25d74c90d79e66905013714d8d188e4ccb5ff466

PHPBB3-14015
 2015-07-17 09:51:49 +02:00
Tristan Darricau
04a8c3c0a4 Merge pull request #3776 from VSEphpbb/ticket/14033 
[ticket/14033] Fix errors in docblocks
 2015-07-17 09:50:15 +02:00
Marc Alexander
e7975ad412 Merge pull request #3777 from s9e/ticket/14034 
[ticket/14034] Fix reparser names that contain "text_reparser" in the middle
 2015-07-17 09:48:47 +02:00
JoshyPHP
e7763cd273 [ticket/14034] Fix reparser names that contain "text_reparser" in the middle 
PHPBB3-14034
 2015-07-17 08:26:14 +02:00
Matt Friedman
af7872473d [ticket/14033] Fix errors in docblocks 
PHPBB3-14033
 2015-07-16 22:52:25 -07:00
Matt Friedman
ae31a604e6 [ticket/14018] Fix responsive quick link menus 
PHPBB3-14018
 2015-07-16 09:11:24 -07:00
Marc Alexander
e6e54430b9 Merge branch '3.1.x' 2015-07-16 08:35:12 +02:00
Marc Alexander
b002948e21 Merge pull request #3755 from RMcGirr83/ticket/14004 
[ticket/14004] Add user_info to core event
 2015-07-16 08:35:10 +02:00
Marc Alexander
f1df8e2688 Merge branch '3.1.x' 2015-07-15 13:44:24 +02:00
Marc Alexander
3768f7f2b8 Merge pull request #3737 from javiexin/ticket/13980 
[ticket/13980] Uploaded avatar not removed when new is uploaded
 2015-07-15 13:44:19 +02:00
Máté Bartus
1127f8bbf8 Merge pull request #3751 from Nicofuma/ticket/11444 
[ticket/11444] Moving the in-board notifications to a method class
 2015-07-14 12:19:52 +02:00
Tristan Darricau
da0897323b Merge pull request #3758 from s9e/ticket/14008 
[ticket/14008] Do not add a user_id value to quotes from guests
 2015-07-13 23:03:44 +02:00
Tristan Darricau
11bef3e22e [ticket/11444] Update tests 
PHPBB3-11444
 2015-07-13 22:43:58 +02:00
Tristan Darricau
c1deeab318 [ticket/11444] Fix services definition 
PHPBB3-11444
 2015-07-13 22:41:14 +02:00
Tristan Darricau
fc34057f28 [ticket/11444] Update tests and cleanup types/methods 
PHPBB3-11444
 2015-07-13 22:41:14 +02:00
Tristan Darricau
f29b12e353 [ticket/11444] Cleanup method constructors 
PHPBB3-11444
 2015-07-13 22:41:14 +02:00
Tristan Darricau
06077d9970 [ticket/11444] BC layer 
PHPBB3-11444
 2015-07-13 22:41:14 +02:00