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

25995 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Callum Macrae
2a83290e7c [ticket/13887] Use correct JSDoc syntax 
PHPBB3-13887
 2015-05-29 12:09:19 +02:00
Joas Schilling
0e48d250d3 Merge pull request #3648 from marc1706/ticket/13872 
[ticket/13872] Remove subsilver2 from md exporter test
 2015-05-29 11:41:31 +02:00
Nils Adermann
da68f62d4f Merge pull request #3554 from Nicofuma/ticket/13770 
[ticket/13770] Wither interface for container_builder
 2015-05-29 10:56:54 +02:00
Marc Alexander
bfba82cd28 Merge branch '3.1.x' 2015-05-28 16:25:28 +02:00
Marc Alexander
518902ef51 Merge pull request #3640 from callumacrae/ticket/13876 
[ticket/13876] Use webfontloader asyncronously.
 2015-05-28 16:25:26 +02:00
Marc Alexander
b02700a62f Merge branch '3.1.x' 2015-05-28 16:03:24 +02:00
Marc Alexander
f5801320b7 Merge pull request #3634 from prototech/ticket/13858 
[ticket/13858] Make Plupload uploader available in the global namespace.
 2015-05-28 16:03:22 +02:00
Callum Macrae
44fcdd007f [ticket/13876] set webfont async to true 
PHPBB3-13876
 2015-05-28 16:01:47 +02:00