1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

24752 Commits

Author SHA1 Message Date
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
Callum Macrae
da6f751cef [ticket/13887] Made readable code DRY
PHPBB3-13887
2015-05-29 13:08:31 +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
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
518902ef51 Merge pull request #3640 from callumacrae/ticket/13876
[ticket/13876] Use webfontloader asyncronously.
2015-05-28 16:25:26 +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
Callum Macrae
8b6c6e794a [ticket/13879] Replaced px with em where appropriate.
We're using ems basically everywhere else so ¯\_(ツ)_/¯

PHPBB3-13879
2015-05-28 15:57:31 +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
45d7e18f6b Merge pull request #3637 from callumacrae/ticket/13873
[ticket/13873] Removed broken print stylesheet.
2015-05-28 14:18:18 +02:00
Marc Alexander
ef39f3a9ab Merge pull request #3633 from nickvergessen/ticket/13872
[ticket/13872] Allow template events to have a changed version
2015-05-28 14:16:08 +02:00
Cesar G
f1e11414e8 Merge remote-tracking branch 'marc1706/ticket/12542' into 3.1.x
* marc1706/ticket/12542:
  [ticket/12542] Use more specific CSS for drag-n-drop
  [ticket/12542] Do not use browser specific css for outline
  [ticket/12542] Properly check if textarea is undefined or null
  [ticket/12542] Use extended CSS for all browsers
  [ticket/12542] Rename javascript method and add doc block
  [ticket/12542] Add different outline colors for body & textarea
  [ticket/12542] Add initial drag-n-drop animation
2015-05-28 13:36:15 +02:00
Marc Alexander
ba205a6bce [ticket/13875] Ignore cache, ext, and store folder in lint test
PHPBB3-13875
2015-05-28 13:35:32 +02:00
Nils Adermann
d589142c0b [ticket/13874] Add master to sami API docs
PHPBB3-13874
2015-05-28 13:19:52 +02:00
Joas Schilling
75dd91412b Merge pull request #3469 from brunoais/ticket/13672
[ticket/13672] Allow changing the data from the user-submitted report

* brunoais/ticket/13672:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
2015-05-28 12:58:58 +02:00
Joas Schilling
cf93c6503a Merge pull request #3468 from brunoais/ticket/13668
[ticket/13668] Allow changing the query to obtain the user-submitted report

* brunoais/ticket/13668:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query
2015-05-28 12:55:31 +02:00
Joas Schilling
b1d829c232 Merge pull request #3457 from brunoais/ticket/13661
[ticket/13661] Add event to allow editing the queries used to get the logs

* brunoais/ticket/13661:
  [ticket/13661] BUMP version to 3.1.5-dev
  [ticket/13661] Brackets in their own line
  [ticket/13661] Re-Fixed  $log_type -> $log_time
  [ticket/13661] Wrong event @since version
  [ticket/13661] Removed superfluous whitespace
  [ticket/13661] bugfix: The conditional is the log_time, not log_type
  [ticket/13661] Fixed the "FROM" in the built query.
  [ticket/13661] Add event to allow editing the queries used to get the logs
  [ticket/13661] Transform queries to get logs and log count into built queries
2015-05-28 12:52:19 +02:00
Callum Macrae
39cd228e06 [ticket/13873] Removed broken print stylesheet.
PHPBB3-13873
2015-05-28 12:46:19 +02:00
Marc Alexander
16deefa7f8 Merge pull request #3635 from nickvergessen/ticket/13808
[ticket/13808] Fix version
2015-05-28 12:40:29 +02:00
Joas Schilling
0daa999fd0 [ticket/13808] Fix version
PHPBB3-13808
2015-05-28 12:34:21 +02:00
Cesar G
30f256102f [ticket/13858] Make Plupload uploader available in the global namespace.
PHPBB3-13858
2015-05-28 12:25:43 +02:00
Joas Schilling
b00b504343 [ticket/13872] Allow template events to have a changed version
PHPBB3-13872
2015-05-28 12:23:24 +02:00
Cesar G
080690073a Merge remote-tracking branch 'Wolfsblvt/ticket/13787' into 3.1.x
* Wolfsblvt/ticket/13787:
  [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
2015-05-28 11:16:22 +02:00
Joas Schilling
8fda16527e Merge pull request #3600 from dragosvr92/ticket/13808
[ticket/13808] search_body_form_before
2015-05-28 11:05:32 +02:00
Marc Alexander
abef078ab9 [ticket/12542] Use more specific CSS for drag-n-drop
Otherwise the CSS gets overwritten by other CSS rules.

PHPBB3-12542
2015-05-28 11:04:22 +02:00
Joas Schilling
7580798a5a Merge pull request #3435 from rxu/ticket/13648
[ticket/13648] Allow extensions using custom bbcode validation methods
2015-05-28 10:49:33 +02:00
Marc Alexander
cc134d5fed Merge pull request #3631 from rxu/ticket/13868
[ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
2015-05-28 10:42:40 +02:00
rxu
33239183ae [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
PHPBB3-13868
2015-05-27 02:15:12 +07:00
alf007
6025c40cab Merge pull request #1 from phpbb/develop-ascraeus
Develop ascraeus
2015-05-25 00:14:48 +02:00
Marc Alexander
622d5b2643 [ticket/12542] Do not use browser specific css for outline
Also, the CSS selector for the drag'n'drop was simplified to only use the
class.

PHPBB3-12542
2015-05-23 10:51:04 +02:00
Marc Alexander
5ca77df084 Merge pull request #3624 from VSEphpbb/ticket/13861
[ticket/13861] Fix undefined variables in style update migration
2015-05-22 11:49:07 +02:00
Matt Friedman
67502c0d22 [ticket/13861] Fix undefined variables in style update migration
PHPBB3-13861
2015-05-21 15:23:17 -07:00
Marc Alexander
b7a89187b5 [ticket/12542] Properly check if textarea is undefined or null
PHPBB3-12542
2015-05-20 15:47:26 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs
PHPBB3-13790
2015-05-19 22:19:18 +02:00
Tristan Darricau
1d2a127144 Merge pull request #3619 from javiexin/ticket/13852
[ticket/13852] Consistent tab navigation when login in
2015-05-19 09:43:29 +02:00
javiexin
cb12a065df [ticket/13852] Consistent tab navigation when login in
Added tabindex attribute to input elements in index_body.html to make
tab navigation consistent with that of login_body.html.

PHPBB3-13852
2015-05-18 19:38:48 +02:00
Nicofuma
309a6b9313 Merge pull request #3601 from nickvergessen/ticket/13827
[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
2015-05-17 20:01:18 +02:00
Joas Schilling
e52bc2d022 Merge pull request #3606 from Nicofuma/ticket/13838
[ticket/13838] Check braces for control structures
2015-05-16 13:39:45 +02:00
Oliver Schramm
1c0c9c1bca Merge pull request #3563 from rxu/ticket/13791
[ticket/13791] Add more post buttons template events to viewtopic_body.html
2015-05-15 17:52:44 +02:00
Marc Alexander
dcb36d572d Merge pull request #3607 from Nicofuma/ticket/13830
[ticket/13830] Fix unsused used statements and catch blocks
2015-05-14 18:14:26 +02:00
Joas Schilling
502214bf06 [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()
PHPBB3-13827
2015-05-14 17:13:47 +02:00
Nicofuma
3bc2b54128 [ticket/13830] Fix unsused used statements and catch blocks
PHPBB3-13830
2015-05-14 16:02:05 +02:00
Marc Alexander
d004a1c6b8 Merge pull request #3540 from RMcGirr83/ticket/13699
[ticket/13699] Add event before and after forum title in viewforum
2015-05-14 15:56:05 +02:00