4016 commits

Author	SHA1	Message	Date
Andreas Fischer	6fb9fcd8ec	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/12989] Remove unused "created_by.jpg"	2014-08-19 21:29:18 +02:00
Louis7777	8a5dd101a3	[ticket/12989] Remove unused "created_by.jpg" ... This image is not used anywhere in prosilver. PHPBB3-12989	2014-08-19 20:58:47 +02:00
Andreas Fischer	dc87e581c1	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/12984] Remove blank line when no forum description shown	2014-08-17 22:31:46 +02:00
Pico88	9d7deba67a	[ticket/12991] Have events after/before "add warning" field - user and post ... PHPBB3-12991	2014-08-17 19:04:35 +02:00
Oyabun1	621f8c922f	[ticket/12984] Remove blank line when no forum description shown ... Add a conditional for forum description and move the <br /> within it. Currently if there is no forum description but there is 1. a displayed forum moderator and/or 2. a displayed sub-forum a blank line is added in place of the description PHPBB3-12984	2014-08-17 20:39:22 +10:00
Marc Alexander	bebcd59694	Merge branch 'develop-ascraeus' into develop	2014-08-14 14:47:50 +02:00
Marc Alexander	ad625c1e6d	Merge pull request #2876 from PayBas/ticket/12900 ... [ticket/12900] Fix potential avatar size box overflow	2014-08-14 14:47:20 +02:00
Callum Macrae	9c87972385	[ticket/12982] Refactoring: Cleaned up crazy insert users stuff ... PHPBB3-12982	2014-08-14 00:19:34 +01:00
Callum Macrae	9e3db526d5	[ticket/12982] Refactoring: Cleaned up forum_fn.js ... PHPBB3-12982	2014-08-14 00:04:16 +01:00
Callum Macrae	9578fdf7d7	[ticket/12982] Refactoring: Cleaned up phpbb.search ... PHPBB3-12982	2014-08-13 23:18:50 +01:00
Cesar G	baa9f17f7c	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/12856] Remove images from assets/plupload/img/ [ticket/12856] Copy plupload images to prosilver dir	2014-08-13 15:01:06 -07:00
Callum Macrae	340f48fdeb	[ticket/12982] Refactoring: made most JS nice. ... PHPBB3-12982	2014-08-13 22:44:21 +01:00
PayBas	9db2ff7186	[ticket/12856] Copy plupload images to prosilver dir ... PHPBB3-12856	2014-08-13 16:37:44 +02:00
PayBas	030d1a683b	[ticket/12900] Fix potential avatar size box overflow ... PHPBB3-12900	2014-08-13 16:23:20 +02:00
Joas Schilling	7faf66c492	[ticket/12974] Update nightly build version to 3.2.0-a1-dev ... PHPBB3-12974	2014-08-12 10:56:20 +02:00
Joas Schilling	483b40dfa3	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 [prep-release-3.1.0-RC3] Prepare Changelog [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 Conflicts: phpBB/styles/subsilver2/style.cfg	2014-08-12 10:17:47 +02:00
Joas Schilling	b40225c142	[prep-release-3.1.0-RC3] Update version to 3.1.0-RC3	2014-08-11 19:30:55 +02:00
Nils Adermann	837ed8b6e1	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes Conflicts: phpBB/styles/subsilver2/template/ucp_groups_manage.html phpBB/styles/subsilver2/template/ucp_profile_avatar.html	2014-08-11 17:38:29 +02:00
Nils Adermann	bad90dafbf	Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus ... * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes	2014-08-11 17:37:56 +02:00
Michael Miday	ada35dca00	[ticket/12862] Remove remaining simple-wrap id ... PHPBB3-12862	2014-08-11 00:55:26 +02:00
Marc Alexander	db9bf6da33	Merge branch 'develop-ascraeus' into develop	2014-08-10 17:00:41 +02:00
Marc Alexander	2a5eca0391	Merge pull request #2714 from prototech/ticket/12809 ... [ticket/12809] Fix select button and dropdown list items in RTL.	2014-08-10 17:00:19 +02:00
Joas Schilling	3432257c1c	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/12953] Page title not updated when notifications are marked as read	2014-08-10 13:16:15 +02:00
Joas Schilling	7ae2ceb5cf	Merge pull request #2855 from Geolim4/ticket/12953 ... [ticket/12953] Page title not updated when notifications are marked as read * Geolim4/ticket/12953: [ticket/12953] Page title not updated when notifications are marked as read	2014-08-10 13:13:55 +02:00
Cesar G	4056b84f60	Merge remote-tracking branch 'nickvergessen/ticket/12958' into develop ... * nickvergessen/ticket/12958: [ticket/12958] Remove more references of subsilver2 [ticket/12958] Remove subsilver2 for phpBB 3.2	2014-08-10 13:08:15 +02:00
Joas Schilling	1f6b9628e7	Merge pull request #2852 from bantu/ticket/12938 ... [ticket/12938] Remove the 'Download all attachments' feature. * bantu/ticket/12938: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.	2014-08-10 12:22:22 +02:00
Joas Schilling	8c40574049	[ticket/12958] Remove subsilver2 for phpBB 3.2 ... PHPBB3-12958	2014-08-10 12:05:28 +02:00
Geolim4	39defd0b6b	[ticket/12953] Page title not updated when notifications are marked as read ... PHPBB3-12953	2014-08-09 18:56:36 +02:00
Andreas Fischer	12caf2f03d	[ticket/12938] Remove the 'Download all attachments' feature. ... PHPBB3-12938	2014-08-09 16:33:59 +02:00
Nils Adermann	051466106a	Merge remote-tracking branch 'github-nicofuma/ticket/12693' into develop-ascraeus ... * github-nicofuma/ticket/12693: [ticket/12693] Fix composer.phar path [ticket/12693] The files skipped list can not be empty [ticket/12693] Force the composer.phar to be executable [ticket/12693] All the files in bin/ must be executable [ticket/12693] Expand manually the wildcard [ticket/12693] Fix the query for bin/* [ticket/12693] Extract exceptions, bin/* must be executable [ticket/12693] Remove the executable bit on icon_print.gif [ticket/12693] Check the persmissions of the owner [ticket/12693] Check if the are executable and not if they are 644 [ticket/12693] Fix the permissions [ticket/12693] Check if the files have the right 644 [ticket/12693] Fix indentation [ticket/12693] Add a travis test that checks file permissions	2014-08-09 15:19:27 +02:00
Cesar G	ad97ad07f8	Merge remote-tracking branch 'PayBas/ticket/12535' into develop-ascraeus ... * PayBas/ticket/12535: [ticket/12535] Combine inner clearing CSS rules [ticket/12535] Update events.md to RC3 [ticket/12535] Add events to subsilver2 [ticket/12535] Make <a> adjust to the image width	2014-08-08 13:46:58 +02:00
Cesar G	f1b1bd0de9	Merge remote-tracking branch 'marc1706/ticket/12744' into develop-ascraeus ... * marc1706/ticket/12744: [ticket/12744] Fix additional height of one line in header in rtl languages	2014-08-08 13:41:37 +02:00
Marc Alexander	20f8fd4af2	[ticket/12744] Fix additional height of one line in header in rtl languages ... PHPBB3-12744	2014-08-08 13:26:11 +02:00
Marc Alexander	e4e7a8f849	Merge pull request #2829 from nickvergessen/ticket/12853 ... [ticket/12853] Hide moderator link if it is really necessary	2014-08-07 23:37:35 +02:00
Joas Schilling	9ed71d523a	[ticket/12853] Hide moderator link if it is really necessary ... PHPBB3-12853	2014-08-07 23:27:56 +02:00
Andreas Fischer	8d8d54aac7	Merge pull request #2816 from n-aleha/ticket/12922 ... [ticket/12922] Posts per page in MCP should have a min value of zero * n-aleha/ticket/12922: [ticket/12922] Subsilver2 fix [ticket/12922] Posts per page in MCP should have a min value of zero	2014-08-07 18:23:46 +02:00
PayBas	e6dec0348a	[ticket/12535] Combine inner clearing CSS rules ... PHPBB3-12535	2014-08-07 18:23:01 +02:00
PayBas	e28abe0db2	[ticket/12535] Add events to subsilver2 ... Forgot subsilver... yet again PHPBB3-12535	2014-08-07 18:08:48 +02:00
PayBas	5fedcf0fa8	[ticket/12535] Make <a> adjust to the image width ... PHPBB3-12535	2014-08-07 18:08:46 +02:00
Marc Alexander	4f23bb711c	[ticket/12822] Remove "None" option from avatar select boxes ... This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822	2014-08-07 17:28:21 +02:00
PayBas	802232c907	[ticket/12506] Fix search result h3 margin ... There are no buttons present, so don't need to do all this stuff. PHPBB3-12506	2014-08-07 17:13:22 +02:00
PayBas	3522808528	[ticket/12506] Fix responsive profile min-height (no avatar) ... PHPBB3-12506	2014-08-07 17:13:20 +02:00
PayBas	09e45fee89	[ticket/12506] Reposition buttons to make room for "online" banner ... PHPBB3-12506	2014-08-07 17:13:18 +02:00
PayBas	64dfb3fba9	[ticket/12506] Reposition post-buttons for compact layout ... PHPBB3-12506	2014-08-07 17:13:17 +02:00
Cesar G	742133f6dc	[ticket/12809] Restore text-align for the pagination. ... PHPBB3-12809	2014-08-07 16:40:09 +02:00
Cesar G	cf4fb73440	[ticket/12809] Remove obsolete rules and selector. ... PHPBB3-12809	2014-08-07 16:40:09 +02:00
Cesar G	42afa369a0	[ticket/12809] Fix select button and dropdown list items in RTL. ... PHPBB3-12809	2014-08-07 16:40:09 +02:00
Cesar G	3b7ab23e29	Merge remote-tracking branch 'PayBas/ticket/12832' into develop-ascraeus ... * PayBas/ticket/12832: [ticket/12832] Remove old .quick-links icon reference [ticket/12832] Remove unnecessary attr and classes [ticket/12832] Add footer links to quick-links [ticket/12832] Make .small-icon styling uniform	2014-08-07 16:20:37 +02:00
n-aleha	035f84d2da	[ticket/12922] Subsilver2 fix ... PHPBB3-12922	2014-08-07 17:10:32 +03:00
n-aleha	98155a945f	[ticket/12922] Posts per page in MCP should have a min value of zero ... In order to allow displaying the whole topic in MCP=>Main=>View topic, the min value in the html input field must be 0. PHPBB3-12922	2014-08-07 17:08:33 +03:00