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
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
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
2e20bae695
[ticket/9563] Do not show empty categories on index
...
PHPBB3-9563
2015-05-31 11:08:00 +02:00
JoshyPHP
b69e33c2b0
[ticket/13901] Add whitespace to short, multiline quotes for readability
...
PHPBB3-13901
2015-05-30 22:20:52 +02:00
JoshyPHP
2f0d11ba3c
[ticket/13901] Add more whitespace to long quotes for readability
...
PHPBB3-13901
2015-05-30 22:17:14 +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
JoshyPHP
2a7d26d3de
[ticket/13803] Use accurate flags for generate_text_for_edit()
...
PHPBB3-13803
2015-05-30 17:29:49 +02:00
JoshyPHP
25ce302a60
[ticket/13803] Added text_reparser_collection service
...
PHPBB3-13803
2015-05-30 17:29:43 +02:00
JoshyPHP
1275f77da5
[ticket/13803] Renamed var
...
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
f463b99ad0
[ticket/13803] Updated services.yml [ci skip]
...
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
1bff7d1175
[ticket/13803] Fixed method name
...
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
75eb283f8d
[ticket/13803] Renamed methods
...
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
54b18df084
[ticket/13803] Added contact_admin_info tests
...
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
3827a131ae
[ticket/13803] Rewrote the poll_option plugin
...
As it turns out, poll_option_id is not a primary key.
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
7a8ac4bb71
[ticket/13803] Added get_max_id() tests
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
ae6ad754a4
[ticket/13803] Moved the add_missing_fields() call to the base class
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
a870f8f860
[ticket/13803] Added user_signature tests
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
212fc277b4
[ticket/13803] Reordered methods [ci skip]
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
70cd911281
[ticket/13803] Added tests
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
9bf0f794b5
[ticket/13803] Added pm_text tests
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
ea445ffa47
[ticket/13803] Added methods to detect whether a given feature is in use
...
They test whether a given BBCode was enabled and has been used in a text,
or smilies, or magic URLs.
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
459f1d4c1f
[ticket/13803] Refactored test
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
b5911281ae
[ticket/13803] Added tests, fixed param order in generate_text_for_storage()
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
986af43f37
[ticket/13803] Added plugins
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
e11ae7e9cd
[ticket/13803] Hyphenated class names
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
de52580a78
[ticket/13803] WIP implementation
...
PHPBB3-13803
2015-05-30 17:26:00 +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
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
Tristan Darricau
41efc55be9
[ticket/13896] Fix coding style
...
PHPBB3-13896
2015-05-30 12:27:31 +02:00
Marc Alexander
e04f9a2425
[ticket/9252] Do not try to disapprove a post that was just approved
...
Without this change, posts that are approved by someone right before
another moderator is trying to disapprove a post are actually deleted
instead of disapproved.
PHPBB3-9252
2015-05-30 12:27:00 +02:00
Callum Macrae
d1c4f5bc35
[ticket/13882] Added tiny docblock to lazyLoadAvatars
...
PHPBB3-13882
2015-05-30 12:18:44 +02:00
Marc Alexander
1ba86eaa8e
[ticket/13799] Correctly urlencode category and show selected avatar
...
PHPBB3-13799
2015-05-30 11:54:54 +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
Marc Alexander
44b8dafb23
[ticket/6466] Support form reset and do not loose role upon resubmit
...
PHPBB3-6466
2015-05-30 11:24:00 +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
