makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
26028 commits 18 branches 192 tags 207 MiB
Commit graph

26028 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tristan Darricau
59ac18c03e Merge pull request #3682 from marc1706/ticket/13564 
[ticket/13564] Fix user_delete_test on master
 2015-06-05 10:09:05 +02:00
Marc Alexander
c8ccae7a7c Merge branch '3.1.x' 2015-06-05 10:05:50 +02:00
Marc Alexander
20b16fda4f Merge pull request #3684 from CHItA/ticket/13841 
[ticket/13841] Fix tests on 3.1 and master branch
 2015-06-05 10:05:44 +02:00
CHItA
2b0acdcea4 [ticket/13841] Fix tests on 3.1 and master branch 
PHPBB3-13841
 2015-06-05 07:33:40 +02:00
Marc Alexander
49f2dd8c5e [ticket/13564] Fix user_delete_test on master 
PHPBB3-13564
 2015-06-04 19:26:56 +02:00
Joas Schilling
3ce3183e61 Merge branch '3.1.x' 2015-06-04 18:03:35 +02:00
Joas Schilling
7a55bcc0f3 Merge pull request #3611 from Alf007/ticket/13841 
Ticket/13841
 2015-06-04 18:03:19 +02:00
Joas Schilling
a2643f8e67 Merge branch '3.1.x' 2015-06-04 17:51:09 +02:00
Joas Schilling
51831924c5 Merge pull request #3567 from javiexin/ticket/13795 
[ticket/13795] Modify core event in posting to include poll data
 2015-06-04 17:51:00 +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
Joas Schilling
f3f82bd377 Merge branch '3.1.x' 2015-06-04 17:30:16 +02:00
Joas Schilling
9005711ad7 Merge pull request #3502 from marc1706/ticket/13564 
[ticket/13564] Unlink user accounts upon deleting user
 2015-06-04 17:30:09 +02:00
Nils Adermann
6813735d82 Merge pull request #3552 from MateBartus/ticket/13777 
[ticket/13777] Move module management related functionailty into service
 2015-05-31 17:22:21 +02:00
Cesar G
4b46ac78a6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13905] Don't load loading.gif until needed.
 2015-05-31 16:57:38 +02:00
Cesar G
db3782e491 Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x 
* callumacrae/ticket/13905:
  [ticket/13905] Don't load loading.gif until needed.
 2015-05-31 16:56:44 +02:00
MateBartus
8d443c3de7 [ticket/13777] Remove module_class_not_defined_exception 
PHPBB3-13777
 2015-05-31 16:27:16 +02:00
MateBartus
4044b5df89 [ticket/13777] Reorder get_module_infos() method's arguments 
PHPBB3-13777
 2015-05-31 16:03:11 +02:00
Marc Alexander
7a66d62290 Merge branch '3.1.x' 2015-05-31 14:15:19 +02:00
Marc Alexander
189d94e897 Merge pull request #3668 from callumacrae/js-linting 
[ticket/13898] js coding standards
 2015-05-31 14:15:17 +02:00
Callum Macrae
cfbd051d52 [ticket/13898] Moved jshint and jscs rcs to correct dir. 
PHPBB3-13898
 2015-05-31 13:50:48 +02:00
Callum Macrae
d978564600 [ticket/13905] Don't load loading.gif until needed. 
PHPBB3-13905
 2015-05-31 13:46:30 +02:00
MateBartus
fcff3ee4ad [ticket/13777] Fix tests 
PHPBB3-13777
 2015-05-31 13:22:46 +02:00
MateBartus
77ee0e62ca [ticket/13777] Use module manager in phpBB core files 
PHPBB3-13777
 2015-05-31 13:22:45 +02:00
MateBartus
e877a752be [ticket/13777] Deduplicate migration service definitions 
PHPBB3-13777
 2015-05-31 13:22:45 +02:00
MateBartus
71d03647f0 [ticket/13777] Move module management into service 
PHPBB3-13777
 2015-05-31 13:22:44 +02:00
Marc Alexander
c0972f74ca Merge pull request #3670 from s9e/ticket/8420 
[ticket/8420] Emoticon removes space before itself when using preview
 2015-05-31 10:49:05 +02:00
JoshyPHP
6ac37145ec [ticket/8420] Added regression test 
PHPBB3-8420
 2015-05-31 10:13:20 +02:00
alf007
1f385b536a [ticket/13841] Add core event on functions_admin for topics move 
Event added for the function move_topics() in
includes/functions_admin.php, so that you can insert any extension's table(s)
to be updated when topics are moved between forums
Added parameters topic_ids, forum_id, forum_ids and auto_sync

PHPBB3-13841
 2015-05-30 17:48:18 +02:00
Callum Macrae
27a70f573f [ticket/13898] Fixed all the forum_fn.js violations I understood 
PHPBB3-13898
 2015-05-30 15:03:56 +02:00
Callum Macrae
a39a421acb [ticket/13898] Allow underscores :( 
PHPBB3-13898
 2015-05-30 14:55:42 +02:00
Callum Macrae
bafd649eea [ticket/13898] 4 spaces, not 2 
PHPBB3-13898
 2015-05-30 14:50:35 +02:00
Callum Macrae
e3090e04c3 [ticket/13898] js coding standaaards 
PHPBB3-13898
 2015-05-30 14:44:48 +02:00
Nils Adermann
073f3e6fdc Merge pull request #3592 from Nicofuma/ticket/13388 
[ticket/13388] Integrate routing and di parameters resolution
 2015-05-30 13:21:22 +02:00
Tristan Darricau
ea7114e785 [ticket/13388] Fix coding style 
PHPBB3-13388
 2015-05-30 13:14:27 +02:00
Oliver Schramm
cdd76da6a3 Merge branch '3.1.x' 2015-05-30 12:55:21 +02:00
Oliver Schramm
049f584111 Merge pull request #3638 from naderman/ticket/13874 
[ticket/13874] Add master to sami API docs
 2015-05-30 12:54:27 +02:00
Marc Alexander
e9601813c1 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
 2015-05-30 12:41:24 +02:00
Marc Alexander
d6cd90d325 Merge pull request #3658 from callumacrae/js-refactoring-again 
JS Refactoring
 2015-05-30 12:40:46 +02:00
Nils Adermann
03cb588ac6 Merge pull request #3665 from Nicofuma/ticket/13896 
Fix conding style
 2015-05-30 12:30:51 +02:00
Tristan Darricau
41efc55be9 [ticket/13896] Fix coding style 
PHPBB3-13896
 2015-05-30 12:27:31 +02:00
Marc Alexander
b499a1ce06 Merge branch '3.1.x' 2015-05-30 11:33:50 +02:00
Marc Alexander
df4b391baa Merge pull request #3545 from VSEphpbb/ticket/13771 
[ticket/13771] Allow AJAX errors to support exceptions messages
 2015-05-30 11:33:48 +02:00
Nils Adermann
f958d05aed Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2015-05-30 10:58:40 +02:00
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790 
[ticket/13790] Update phpcs
 2015-05-30 10:53:47 +02:00
Andreas Fischer
3f4206e012 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13875] Ignore cache, ext, and store folder in lint test
 2015-05-29 22:46:34 +02:00
Andreas Fischer
b5fed65fe3 Merge branch '3.0.x' into 3.1.x 
* 3.0.x:
  [ticket/13875] Ignore cache, ext, and store folder in lint test

Conflicts:
	tests/lint_test.php
 2015-05-29 22:46:28 +02:00
Andreas Fischer
fedd0ae7f3 Merge pull request #3639 from marc1706/ticket/13875 
[ticket/13875] Ignore cache, ext, and store folder in lint test

* marc1706/ticket/13875:
  [ticket/13875] Ignore cache, ext, and store folder in lint test
 2015-05-29 22:31:41 +02:00
Tristan Darricau
d129ee6c94 [ticket/13388] Fix deprecations 
PHPBB3-13388
 2015-05-29 16:53:54 +02:00
Tristan Darricau
80375c98f0 [ticket/13388] Fix rebase 
PHPBB3-13388
 2015-05-29 16:52:21 +02:00