Commit graph

19330 commits

Author SHA1 Message Date
Cesar G
7ab90c6c82 [ticket/11138] Increase AJAX timeout period to 15 seconds.
PHPBB3-11138
2013-10-23 22:33:02 -07:00
Andreas Fischer
2adf3d7a34 Merge remote-tracking branch 'cyberalien/ticket/fixes-only/11872' into develop
* cyberalien/ticket/fixes-only/11872:
  [ticket/11872] Template syntax typos in oauth templates
2013-10-24 00:05:00 +02:00
Marc Alexander
f617aff182 [ticket/11912] Add tests for content_guesser
PHPBB3-11912
2013-10-23 23:18:40 +02:00
Marc Alexander
63945f3687 [ticket/11912] Add content_guesser
The content_guesser will try to use the function mime_content_type()
if it's available. If that is not the case, the content_guesser will try to
guess the mimetype using the file extension of the supplied file.
Since this guesser will be registered after the other guessers, it will
be only used if the other guessers are not available.

PHPBB3-11912
2013-10-23 23:18:22 +02:00
Joas Schilling
881ad935d5 [ticket/11031] Fix conversion of topic_replies to topic_posts
PHPBB3-11031
2013-10-23 21:13:45 +02:00
Joas Schilling
6dd4620609 [ticket/11031] Fix container construction and missing objects
PHPBB3-11031
2013-10-23 21:13:25 +02:00
Marc Alexander
c8040024cb [ticket/11912] Add tests for phpbb mimetype guesser
PHPBB3-11912
2013-10-23 18:36:11 +02:00
Marc Alexander
36d314e032 [ticket/11912] Add phpbb mimetype guesser
Mimetype guesser will be used as front-end file for mimetype guessing.

PHPBB3-11912
2013-10-23 18:34:35 +02:00
Marc Alexander
789d493595 [ticket/11912] Integrate mimetype guesser with plupload
PHPBB3-11912
2013-10-23 18:34:06 +02:00
Vjacheslav Trushkin
cb21c33a14 [ticket/11872] Template syntax typos in oauth templates
PHPBB3-11872
2013-10-23 19:12:37 +03:00
Marc Alexander
b9f950054a [ticket/11914] Update plupload to 2.0.0
There are no longer seperate javascript files for each type of uploader.
New filenames have been kept as used inside the plupload package.

PHPBB3-11914
2013-10-23 14:44:55 +02:00
Marc Alexander
38eb86fe6d [ticket/11914] Use unix line endings in plupload queue css file
PHPBB3-11914
2013-10-23 14:43:02 +02:00
Joas Schilling
d612041cd1 Merge remote-tracking branch 'Marc/ticket/11916' into develop
* Marc/ticket/11916:
  [ticket/11916] Remove files from hidden attach list after deletion
2013-10-23 12:08:20 +02:00
Marc Alexander
c810f1934e [ticket/11916] Remove files from hidden attach list after deletion
The hidden attachment_data list needs to be updated if a file got removed.
This was not done until now and caused a general error after submitting a
post if a file was removed after uploading it.

PHPBB3-11916
2013-10-23 11:50:41 +02:00
Nils Adermann
a7e41b23fd Merge pull request #1801 from nickvergessen/ticket/11948
Ticket/11948 Extensions should be allowed to have more then 1 routing file
2013-10-22 00:29:20 -07:00
Joas Schilling
96317b2c45 [ticket/11948] Check actual result of routes
PHPBB3-11948
2013-10-21 22:18:03 +02:00
Joas Schilling
51561ed538 [ticket/11948] Allow resource importing for routing
PHPBB3-11948
2013-10-21 21:52:48 +02:00
Andreas Fischer
ba5b53521a Merge remote-tracking branch 'marc1706/ticket/11930' into develop
* marc1706/ticket/11930:
  [ticket/11930] Update docblock of avatar driver constructor
  [ticket/11930] Modify order of properties to fit constructor method
  [ticket/11930] Move path_helper in front of optional cache argument
  [ticket/11930] Fix tests after adding phpbb\path_helper to avatar drivers
  [ticket/11930] Use \phpbb\path_helper for avatar URLs
2013-10-21 11:04:23 +02:00
Marc Alexander
a80d5c93e3 [ticket/11930] Update docblock of avatar driver constructor
PHPBB3-11930
2013-10-21 11:02:59 +02:00
Marc Alexander
acbb1ed3ee [ticket/11930] Modify order of properties to fit constructor method
PHPBB3-11930
2013-10-21 10:47:40 +02:00
Marc Alexander
d7bf50bc80 [ticket/11930] Move path_helper in front of optional cache argument
Optional method arguments should be after any mandatory ones.

PHPBB3-11930
2013-10-21 10:20:12 +02:00
Nils Adermann
4649155f41 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11951] Add MariaDB to platforms we test on.
  [ticket/11951] Add MariaDB to supported DBMSes in requirement section.

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html
2013-10-20 16:05:46 -07:00
Nils Adermann
a5eaaa10dc Merge remote-tracking branch 'github-bantu/ticket/11951' into develop-olympus
* github-bantu/ticket/11951:
  [ticket/11951] Add MariaDB to platforms we test on.
  [ticket/11951] Add MariaDB to supported DBMSes in requirement section.
2013-10-20 16:03:23 -07:00
Matt Friedman
67beb97efe Merge branch 'develop' into ticket/11935 2013-10-20 15:57:57 -07:00
Nils Adermann
1aa80b47b1 Merge pull request #1789 from VSEphpbb/ticket/11936
[Ticket/11936] Notification Avatars - Fixes and Restyling
2013-10-20 15:42:49 -07:00
Matt Friedman
b9358e75bf [ticket/11936] Update color scheme of new no_avatar.gif
PHPBB3-11936
2013-10-20 14:53:44 -07:00
Matt Friedman
3c38f4e20a [ticket/11936] Merge branch 'develop' into ticket/11936
PHPBB3-11936
2013-10-20 14:30:29 -07:00
Andreas Fischer
eda35d15f8 Merge remote-tracking branch 'prototech/ticket/11939' into develop
* prototech/ticket/11939:
  [ticket/11939] Removed unneeded data attribute.
2013-10-20 23:15:25 +02:00
Andreas Fischer
953d31dc75 Merge remote-tracking branch 'prototech/ticket/11923' into develop
* prototech/ticket/11923:
  [ticket/11923] Attempt to translate errors only if user can change avatar.
2013-10-20 22:14:58 +02:00
Andreas Fischer
9c299ad759 Merge remote-tracking branch 'cyberalien/ticket/11945' into develop
* cyberalien/ticket/11945:
  [ticket/11945] Change color for focused button
2013-10-20 22:05:26 +02:00
Nils Adermann
e08db41d0d Merge pull request #1719 from cyberalien/ticket/11552
Responsive design for prosilver
2013-10-20 11:12:55 -07:00
Nils Adermann
3b39a44b00 Merge pull request #1799 from cyberalien/ticket/11947
[ticket/11947] Notification link fixes
2013-10-20 11:07:51 -07:00
Vjacheslav Trushkin
ff10f1ab6a [ticket/11552] Fix non-square avatars in notifications
Old code was changing all avatars to square. This code
will keep 50px height limit without changing aspect ratio.

PHPBB3-11552
2013-10-20 20:48:57 +03:00
Vjacheslav Trushkin
61b5ebfdd3 [ticket/11552] Padding for lists with checkbox
PHPBB3-11552
2013-10-20 20:45:59 +03:00
Vjacheslav Trushkin
2bb094cc19 [ticket/11552] More responsive design adjustments
PHPBB3-11552
2013-10-20 13:12:03 +03:00
Vjacheslav Trushkin
076198da7b [ticket/11552] Adjustments for responsive post buttons
PHPBB3-11552
2013-10-20 11:54:51 +03:00
Vjacheslav Trushkin
87194d6000 [ticket/11552] Better responsive post buttons
PHPBB3-11552
2013-10-20 11:50:47 +03:00
Vjacheslav Trushkin
fef51d199b [ticket/11552] Fixing incorrect min-height
PHPBB3-11552
2013-10-20 11:49:54 +03:00
Vjacheslav Trushkin
87134080b3 [ticket/11552] Responsive design fixes
PHPBB3-11552
2013-10-20 10:35:41 +03:00
Vjacheslav Trushkin
806a9d37f3 [ticket/11552] Adjustments for table headers
PHPBB3-11552
2013-10-20 10:16:27 +03:00
Vjacheslav Trushkin
ff7b140c75 [ticket/11552] Responsive polls
PHPBB3-11552
2013-10-20 09:57:55 +03:00
Joas Schilling
bd86dea16c [ticket/11948] Use basename and dirname
PHPBB3-11948
2013-10-20 00:02:15 +02:00
Andreas Fischer
7df35a288a [ticket/11951] Add MariaDB to platforms we test on.
PHPBB3-11951
2013-10-19 23:08:04 +02:00
Andreas Fischer
6de519431d [ticket/11951] Add MariaDB to supported DBMSes in requirement section.
PHPBB3-11951
2013-10-19 23:05:27 +02:00
Vjacheslav Trushkin
2c15b653cc [ticket/11552] Tweaks to responsive navigation
PHPBB3-11552
2013-10-19 22:30:03 +03:00
Vjacheslav Trushkin
7b972204ae [ticket/11552] Do not hide all links at once
Do not hide some links as long as their is enough space
to keep them out of dropdown menu

PHPBB3-11552
2013-10-19 22:19:32 +03:00
Vjacheslav Trushkin
e9481c41f8 [ticket/11552] Fix online users list and popups
PHPBB3-11552
2013-10-19 21:10:33 +03:00
Vjacheslav Trushkin
734131d750 [ticket/11552] Responsive member list
Responsive member list and better responsive tables

PHPBB3-11552
2013-10-19 21:01:25 +03:00
Matt Friedman
dd25b83ee4 [ticket/11935] Tweak colour swatch table
PHPBB3-11935
2013-10-19 10:14:46 -07:00
Matt Friedman
f003c35fdc [ticket/11935] Replace obsolete table attributes in Admin with CSS
PHPBB3-11935
2013-10-19 08:59:08 -07:00