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
26162 commits 18 branches 192 tags 207 MiB
Commit graph

26162 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Callum Macrae
be1d1c7d05 [ticket/13882] Lazy load the notification avatars. 
This moves them further down the waterfall, making the page load
quicker.

PHPBB3-13882
 2015-05-28 18:05:07 +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
Marc Alexander
c56e2fa2bf [ticket/13872] Remove subsilver2 from md exporter test 
PHPBB3-13872
 2015-05-28 15:52:18 +02:00
Cesar G
2271f6a9da Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13878] Display background images when printing topic in webkit
 2015-05-28 15:35:04 +02:00
Cesar G
182312010b Merge remote-tracking branch 'marc1706/ticket/13878' into 3.1.x 
* marc1706/ticket/13878:
  [ticket/13878] Display background images when printing topic in webkit
 2015-05-28 15:34:43 +02:00
Marc Alexander
3ec3dfcf3a [ticket/13878] Display background images when printing topic in webkit 
PHPBB3-13878
 2015-05-28 14:58:46 +02:00
Callum Macrae
35e5dc46c7 [ticket/13876] Use webfontloader asyncronously. 
This PR adds typekit and Google's webfontloader and calls it
asyncronously, removing the SPOF in the header. Now, if google
goes down, some buttons display with a different font.

https://github.com/typekit/webfontloader

PHPBB3-13876
 2015-05-28 14:55:27 +02:00
javiexin
e80bb565ce [ticket/13795] Modify core event in posting to include poll data 
Modified the core.posting_modify_template_vars event in posting.php
to extend the content of the page_data array to include poll data.
That required moving the event and merging the new set of template vars.
Also include the poll variable in the parameter list for event
core.posting_modify_submission_errors, as it was missing, and any
modification here on post_data for poll related data is silently
ignored.  Added correct @change tags to both events.

PHPBB3-13795
 2015-05-28 14:39:22 +02:00
javiexin
9951458ebf [ticket/13786] Add events to add MCP post options 
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Remove extra template variable around the new event.

PHPBB3-13786
 2015-05-28 14:28:41 +02:00
Marc Alexander
f5037761f0 Merge branch '3.1.x' 2015-05-28 14:18:20 +02:00