Commit graph

29298 commits

Author SHA1 Message Date
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
2dc19cec9d [ticket/13803] Added poll_option tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
8ef15d10e6 [ticket/13803] Added poll_title tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
b0eb63e5b9 [ticket/13803] Added group_description tests
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
d42b2fe795 [ticket/13803] Sort test rows in SQL to match the expected result
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
6ab524f8dc [ticket/13803] Added tests
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
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
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
Marc Alexander
2e46bef2ec [ticket/6466] Remove createElement function from tooltip.js
PHPBB3-6466
2015-05-30 10:54:32 +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
Callum Macrae
9366f29fd7 [ticket/13882] no more egyptian brackets /o/
PHPBB3-13882
2015-05-30 10:48:38 +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
Marc Alexander
89cb8a3217 [ticket/6466] Minor documentation changes
PHPBB3-6466
2015-05-29 18:06:30 +02:00
Marc Alexander
0d5f074f54 [ticket/6466] Rename variables and remove unused ones
PHPBB3-6466
2015-05-29 17:39:03 +02:00
Marc Alexander
c8bb0fd241 [ticket/6466] Improve code in tooltip.js
PHPBB3-6466
2015-05-29 17:35:53 +02:00
Marc Alexander
120600e055 [ticket/6466] Rename functions and clean up code
PHPBB3-6466
2015-05-29 17:34:42 +02:00
Marc Alexander
abf0be4b4c [ticket/6466] Get rid of useless variables and functions in tooltip.js
PHPBB3-6466
2015-05-29 17:18:03 +02:00