Commit graph

25953 commits

Author SHA1 Message Date
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
Marc Alexander
fc00447520 [ticket/6466] Improve behavior of select and properly save role
PHPBB3-6466
2015-05-29 16:44:12 +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
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
3c3b099f88 Merge pull request #3622 from s9e/ticket/13860
[ticket/13860] Fixed array-to-string conversion
2015-05-29 13:15:33 +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
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
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
Marc Alexander
f5037761f0 Merge branch '3.1.x' 2015-05-28 14:18:20 +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
615761fdf1 Merge branch '3.1.x' 2015-05-28 14:16:11 +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
a8ec353a4f Merge branch '3.1.x'
* 3.1.x:
  [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:31 +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
Joas Schilling
f6d7ea425f Merge branch '3.1.x'
* 3.1.x:
  [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:59:04 +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
7278356936 Merge branch '3.1.x'
* 3.1.x:
  [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

Conflicts:
	phpBB/includes/mcp/mcp_reports.php
2015-05-28 12:56:26 +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
021a2aeb82 Merge branch '3.1.x'
* 3.1.x:
  [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:36 +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
0f689e3cad Merge pull request #3636 from nickvergessen/ticket/13808-master
Ticket/13808 master

Conflicts:
	phpBB/docs/events.md
2015-05-28 12:44:33 +02:00
Marc Alexander
cdc86b3540 Merge branch '3.1.x'
Conflicts:
	phpBB/docs/events.md
2015-05-28 12:42:56 +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
5bf48bddf8 Merge branch 'ticket/13808' into ticket/13808-master
* ticket/13808:
  [ticket/13808] Fix version

Conflicts:
	phpBB/docs/events.md
2015-05-28 12:35:25 +02:00
Joas Schilling
0daa999fd0 [ticket/13808] Fix version
PHPBB3-13808
2015-05-28 12:34:21 +02:00
Marc Alexander
d917e0140f Merge pull request #3632 from prototech/ticket/13871
Fix call to undefined member function when running database_update.php
2015-05-28 12:34:16 +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
JoshyPHP
97d05eb235 [ticket/13860] Fixed PHP notices from undeclared vars/properties
PHPBB3-13860
2015-05-28 12:24:14 +02:00
JoshyPHP
e0f7c225bc [ticket/13860] Fixed array-to-string conversion
PHPBB3-13860
2015-05-28 12:24:14 +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
0f040225d6 [ticket/13871] Fix call to undefined member function on non-object error.
PHPBB3-13871
2015-05-28 11:53:35 +02:00