Commit graph

3847 commits

Author SHA1 Message Date
Marc Alexander
b17fc98043 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
	phpBB/styles/subsilver2/template/memberlist_team.html
2015-10-18 10:33:05 +02:00
DavidIQ
da9a5c70d5 [ticket/10343] Add inactive indicator to subsilver2 memberlist
PHPBB3-10343
2015-10-17 18:39:14 -04:00
DavidIQ
9a8393c912 [ticket/10343] Show clearer indication an account is inactive in memberlist
PHPBB3-10343
2015-10-17 18:38:53 -04:00
Cesar G
90038e32cd [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.
PHPBB3-13789
2015-10-14 19:05:27 -07:00
Erwan Nader
7dec0a6707 [ticket/14235] Font Awesome in simple_header.html
PHPBB3-14235
2015-10-14 16:58:35 +02:00
Tristan Darricau
df723c388a Merge branch '3.1.x'
* 3.1.x:
  [ticket/10343] Add a distinction for inactive users on memberlist
  [ticket/10343] Allows a_user to show inactive accounts in memberlist
2015-10-14 16:32:37 +02:00
Tristan Darricau
bab85da820 Merge pull request #3935 from Zoddo/ticket/10343
[ticket/10343] Allows a_user to show inactive accounts in memberlist

* Zoddo/ticket/10343:
  [ticket/10343] Add a distinction for inactive users on memberlist
  [ticket/10343] Allows a_user to show inactive accounts in memberlist
2015-10-14 16:32:33 +02:00
Cesar G
9ec8faff32 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13684] Prevent horizontal resize of attach comment textarea
2015-10-14 04:29:50 -07:00
Cesar G
50bf3411d4 Merge pull request #3959 from marc1706/ticket/13684
[ticket/13684] Prevent horizontal resize of attach comment textarea
2015-10-14 04:28:34 -07:00
Marc Alexander
6bcec956ba [ticket/13684] Prevent horizontal resize of attach comment textarea
PHPBB3-13684
2015-10-14 11:13:15 +02:00
Jakub Senko
d507bce98a [ticket/14146] Add viewtopic_body_post_subject_before event
PHPBB3-14146
2015-10-12 20:05:48 +02:00
Zoddo
c5752be50c [ticket/10343] Add a distinction for inactive users on memberlist
PHPBB3-10343
2015-10-12 17:11:22 +02:00
Tristan Darricau
b7fe324ed7 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14144] Add quickreply_editor_subject_before event
2015-10-12 12:05:07 +02:00
Tristan Darricau
e87209742b Merge pull request #3887 from Senky/ticket/14144
[ticket/14144] Add quickreply_editor_subject_before event

* Senky/ticket/14144:
  [ticket/14144] Add quickreply_editor_subject_before event
2015-10-12 12:03:17 +02:00
Tristan Darricau
7bbce946de Merge branch '3.1.x'
* 3.1.x:
  [ticket/14163] Properly fix select all for code tag in Edge
2015-10-12 11:52:18 +02:00
Tristan Darricau
d92baaa2f7 Merge pull request #3908 from marc1706/ticket/14163
[ticket/14163] Properly fix select all for code tag in Edge

* marc1706/ticket/14163:
  [ticket/14163] Properly fix select all for code tag in Edge
2015-10-12 11:52:18 +02:00
Jakub Senko
fcf6c20291 [ticket/14144] Add quickreply_editor_subject_before event
PHPBB3-14144
2015-10-12 09:40:08 +02:00
Cesar G
45501e50c9 Merge remote-tracking branch 'marc1706/ticket/14230'
* marc1706/ticket/14230:
  [ticket/14230] Show unread post icon in different color
2015-10-11 16:03:13 -07:00
Michael Miday
07b2f4db08 [ticket/14231]Fix double icon issue
PHPBB3-14231
2015-10-11 14:09:34 +02:00
Marc Alexander
2fd3d9d1c9 [ticket/14230] Show unread post icon in different color
PHPBB3-14230
2015-10-11 14:01:44 +02:00
Michael Miday
8acbb20891 [ticket14194]Remove double inline-block
PHPBB3-14194
2015-10-11 11:43:36 +02:00
Michael Miday
9f651e2777 [ticket/14194]Fix search and quicklinks
PHPBB3-14194
2015-10-11 10:43:49 +02:00
Michael Miday
148d7d9b79 [ticket/14194]Patch dropdown small-icon
PHPBB3-14194
2015-10-11 10:41:18 +02:00
Michael Miday
a5017c7488 [ticket/14194] Fix quick-links responsive menu
PHPBB3-14194
2015-10-11 10:41:08 +02:00
Marc Alexander
d1b7101fed Merge pull request #3896 from Zoddo/ticket/14157
[ticket/14157] Allow to set the alt/title attribute on post icons
2015-10-10 16:43:15 +02:00
Zoddo
3937f1f4ae [ticket/14157] Allow to set the alt/title attribute on post icons
PHPBB3-14157
2015-10-10 15:29:31 +02:00
Marc Alexander
c664bbdf9c Merge pull request #3912 from hanakin/ticket/14175
[ticket/14175] Refactor responsive implementation for easier manipulation
2015-10-09 15:51:31 +02:00
Tristan Darricau
415a9daa6a Merge branch '3.1.x'
* 3.1.x:
  [ticket/8800] Add "mark topics read" link to "View unread posts"
2015-10-09 11:00:39 +02:00
Tristan Darricau
b04b5dea36 Merge pull request #3869 from Zoddo/ticket/8800
[ticket/8800] Add "mark topics read" link to "View unread posts"

* Zoddo/ticket/8800:
  [ticket/8800] Add "mark topics read" link to "View unread posts"
2015-10-09 11:00:09 +02:00
Michael Miday
4c1f7e1134 [ticket/14175]Remove styles in 700 for lastpost
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
b671aae1ec [ticket/14175]Remove "only screen and"
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
ab3af7984a [ticket/14175]Include responsive.css same as rest
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
bb9bfec624 [ticket/14175]Remove max-device width
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
6a17cc5560 [ticket/14175] Fix online overlap issues
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
8062c2a18a [ticket/14175] Refactor the file
PHPBB3-14175
2015-10-09 06:40:07 +02:00
Tristan Darricau
73f9e7936a Merge branch '3.1.x'
* 3.1.x:
  [ticket/13934] Add enctype clause for profile fields
2015-10-08 15:45:46 +02:00
Tristan Darricau
5b7b0894e0 Merge pull request #3733 from javiexin/ticket/13934
[ticket/13934] Add enctype clause for profile fields

* javiexin/ticket/13934:
  [ticket/13934] Add enctype clause for profile fields
2015-10-08 15:45:34 +02:00
Marc Alexander
a0ba6b7dc6 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewforum_body.html
2015-10-08 14:44:58 +02:00
Marc Alexander
c05a27396d Merge pull request #3820 from rxu/ticket/14080
[ticket/14080] Add template events around the topic row in viewforum_body.html
2015-10-08 14:43:12 +02:00
Michael Miday
78babc09fc [ticket/14221]Fix the header
PHPBB3-14221
2015-10-08 08:08:10 +02:00
Marc Alexander
f3ea34b311 Merge branch '3.1.x' 2015-10-07 16:50:43 +02:00
Marc Alexander
e5b2dc922f Merge pull request #3615 from rxu/ticket/13846
[ticket/13846] Fix softdelete feature workflow in viewtopic
2015-10-07 16:50:35 +02:00
Marc Alexander
5e2ccb2dd7 [ticket/14199] Correctly resolve merge conflicts
PHPBB3-14199
2015-10-07 14:38:26 +02:00
Marc Alexander
ebb3169d56 Merge branch '3.1.x' 2015-10-07 14:18:50 +02:00
Marc Alexander
3fd1fa5492 Merge pull request #3716 from javiexin/ticket/13748
[ticket/13748] Wrong tooltip after poll vote change
2015-10-07 14:11:16 +02:00
Marc Alexander
f68d5a59e6 Merge pull request #3927 from hanakin/ticket/14199
[ticket/14199] Fix screen reader compatability

Conflicts:
	phpBB/styles/prosilver/template/mcp_topic.html
	phpBB/styles/prosilver/template/overall_header.html
	phpBB/styles/prosilver/template/pagination.html
	phpBB/styles/prosilver/template/posting_buttons.html
	phpBB/styles/prosilver/template/posting_topic_review.html
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/ucp_pm_history.html
	phpBB/styles/prosilver/template/ucp_pm_message_header.html
	phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/prosilver/template/viewtopic_topic_tools.html
2015-10-07 12:05:38 +02:00
Marc Alexander
2695950a61 Merge pull request #3940 from hanakin/ticket/14206
[Ticket/14206]Fix jumpbox UI consistency
2015-10-07 11:52:08 +02:00
Michael Miday
8907a66156 [ticket/14193]Minor cleanups
PHPBB3-14193
2015-10-03 05:16:08 +02:00
Michael Miday
6b7fa249f1 [ticket/14193]Fix posting buttons
PHPBB3-14193
2015-10-03 05:15:16 +02:00
Michael Miday
9da14c9b24 [ticket/14199]Add aria-hidden to all icons
PHPBB3-14199
2015-10-01 20:21:38 +02:00