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
Callum Macrae
d1c4f5bc35
[ticket/13882] Added tiny docblock to lazyLoadAvatars
...
PHPBB3-13882
2015-05-30 12:18:44 +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
Marc Alexander
75e1cbdc77
[ticket/6466] Remove double semicolon
...
PHPBB3-6466
2015-05-29 17:08:17 +02:00
Marc Alexander
795776db4b
[ticket/6466] Removed link tooltip
...
It wasn't being used anymore and didn't work anymore.
PHPBB3-6466
2015-05-29 17:07:47 +02:00
Marc Alexander
faa5ab5899
[ticket/6466] Improved code in tooltip.js
...
PHPBB3-6466
2015-05-29 17:06:14 +02:00
Marc Alexander
4d827b5b99
[ticket/6466] Remove remnants of old code
...
PHPBB3-6466
2015-05-29 16:56:24 +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
Tristan Darricau
6656567424
[ticket/13388] Address comments
...
PHPBB3-13388
2015-05-29 16:48:51 +02:00
Tristan Darricau
66c0e0c6a8
[ticket/13388] Integrate routing and di parameters resolution
...
PHPBB3-13388
2015-05-29 16:48:51 +02:00
Marc Alexander
fc00447520
[ticket/6466] Improve behavior of select and properly save role
...
PHPBB3-6466
2015-05-29 16:44:12 +02:00
Oliver Schramm
13955a3e13
Merge pull request #3660 from Nicofuma/ticket/13890
...
[ticket/13890] Fix di tests
2015-05-29 16:40:42 +02:00
Tristan Darricau
86ad1a92c8
Merge pull request #3561 from s9e/ticket/10922
...
[ticket/10922] Added support for body and subject in email BBCode
2015-05-29 16:15:04 +02:00
Marc Alexander
467c794b97
[ticket/6466] Use jQuery and custom dropdown for permission roles tooltips
...
PHPBB3-6466
2015-05-29 16:05:16 +02:00
Tristan Darricau
2aecb94068
Merge pull request #3383 from nickvergessen/ticket/9109
...
Ticket/9109 Properly document and calculate the group settings with value 0
2015-05-29 16:04:56 +02:00
Tristan Darricau
a3d46575c7
Merge pull request #3613 from nickvergessen/ticket/13844
...
Ticket/13844 Better FAQ language files
2015-05-29 15:44:39 +02:00
Tristan Darricau
f5dbc3b6f2
Merge pull request #3616 from s9e/ticket/13847
...
[ticket/13847] Move quote generation to text_formatter.utils
2015-05-29 15:42:14 +02:00
Tristan Darricau
6641ed6478
[ticket/13890] Fix di tests
...
PHPBB3-13890
2015-05-29 14:54:08 +02:00
Tristan Darricau
3c3b099f88
Merge pull request #3622 from s9e/ticket/13860
...
[ticket/13860] Fixed array-to-string conversion
2015-05-29 13:15:33 +02:00
Callum Macrae
da6f751cef
[ticket/13887] Made readable code DRY
...
PHPBB3-13887
2015-05-29 13:08:31 +02:00
Tristan Darricau
835a2ebcb8
Merge pull request #3625 from s9e/ticket/11742
...
[ticket/11742] Remove tabs-to-space conversion in [code]
2015-05-29 13:03:12 +02:00
Callum Macrae
0fc6816be6
[ticket/13887] Made unreadable code readable
...
PHPBB3-13887
2015-05-29 13:01:33 +02:00
Callum Macrae
143578ad09
[ticket/13887] Minor JS refactoring
...
PHPBB3-13887
2015-05-29 12:51:28 +02:00
