Marc Alexander
1316fe2084
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/memberlist_group.html
2015-11-26 14:45:36 +01:00
Marc Alexander
8899829752
Merge pull request #4030 from RMcGirr83/ticket_14283
...
[ticket/14283] Add a Manage Group link on a group page
2015-11-26 14:44:51 +01:00
Marc Alexander
797b0c4058
Merge pull request #4034 from hanakin/ticket/14295
...
[ticket/14295]Add approval icon
2015-11-25 20:33:21 +01:00
Marc Alexander
290e23fb2d
Merge pull request #4043 from RMcGirr83/ticket_12649
...
[ticket/12649] Remove duplicated code from viewforum_body
2015-11-25 20:30:50 +01:00
RMcGirr83
08fa0b2323
[ticket/12649] Remove duplicated code from viewforum_body
...
PHPBB3-12649
2015-11-25 11:39:16 -05:00
Marc Alexander
4f0ecb0180
Merge pull request #4015 from RMcGirr83/ticket_12649
...
[ticket/12649] Change sort & display options in footers to dropdown menu
2015-11-25 13:39:58 +01:00
Michael Miday
e0893c27a2
[ticket/14295]fix report icon as well
...
PHPBB3-14295
2015-11-24 18:49:45 +01:00
Michael Miday
21b58dcb6a
[ticket/14295]missed one
...
PHPBB3-14295
2015-11-24 18:40:18 +01:00
Michael Miday
0b444814e5
[ticket/14295]Add approval icon
...
PHPBB3-14295
2015-11-16 19:09:24 +01:00
Michael Miday
e031afc5f7
[ticket/14294]Fix removal of wanted icons
...
PHPBB3-14294
2015-11-16 19:02:28 +01:00
Cesar G
cbf9408e66
Merge pull request #3960 from hanakin/ticket/14229
...
[ticket/14229]Responsive topic specific paging
2015-11-15 11:39:18 -08:00
Marc Alexander
780e472458
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/prosilver/template/viewtopic_body.html
phpBB/styles/subsilver2/template/viewtopic_body.html
2015-11-15 19:56:30 +01:00
Marc Alexander
e3f1cca911
Merge pull request #3888 from Senky/ticket/14146
...
[ticket/14146] Add viewtopic_body_post_subject_before event
2015-11-15 19:48:50 +01:00
Richard McGirr
03662d5a89
[ticket/14283] Add a Manage Group link on a group page
...
PHPBB3-14283
2015-11-14 06:10:41 -05:00
Richard McGirr
7c736d527d
[ticket/14289] Add events to navbar header
...
PHPBB3-14289
2015-11-13 05:50:10 -05:00
Marc Alexander
f7a25ad8c3
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/search_body.html
2015-11-13 09:36:04 +01:00
rxu
9ef06d67e6
[ticket/14066] Add template events to search_body.html
...
PHPBB3-14066
2015-11-12 20:53:35 +07:00
Marc Alexander
a11b900de4
[ticket/14284] Correctly remove link to first unread post
...
PHPBB3-14284
2015-11-11 17:19:10 +01:00
Michael Miday
c3c41d409b
[ticket/14229]Responsive changes to topic paging
2015-11-11 09:26:50 +01:00
Marc Alexander
685449bfe3
[ticket/14272] Fix invalid or missing min/max settings
...
PHPBB3-14272
2015-11-06 10:31:56 +01:00
Marc Alexander
aca6e64669
[ticket/14272] Only use maxlength and size for allowed input elements
...
PHPBB3-14272
2015-11-06 10:20:05 +01:00
RMcGirr83
32d6d2a94e
[ticket/12649] Restore missing css and fix html file
...
PHPBB3-12649
2015-11-04 13:11:15 -05:00
RMcGirr83
b0660c47df
Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649
2015-11-04 11:05:51 -05:00
RMcGirr83
de984caf98
Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649
...
PHPBB3-12649
2015-11-04 11:05:25 -05:00
RMcGirr83
9a4e998f70
[ticket/12649] Change sort & display options in footers to dropdown menu
...
PHPBB3-12649
2015-11-03 14:48:05 -05:00
Richard McGirr
5d7f67105b
[ticket/12649] Change sort & display options in footers to dropdown menu
...
PHPBB3-12649
2015-11-01 06:51:03 -05:00
Tristan Darricau
9ea44abf38
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13799] Split lines in HTML files for better readability
[ticket/13799] Add missing space before checked attribute
[ticket/13799] Correctly urlencode category and show selected avatar
[ticket/13799] Do not rawurlencode category in gallery avatar
2015-10-19 14:40:07 +02:00
Tristan Darricau
a6fd55db35
Merge pull request #3647 from marc1706/ticket/13799
...
[ticket/13799] Do not rawurlencode category in gallery avatar
* marc1706/ticket/13799:
[ticket/13799] Split lines in HTML files for better readability
[ticket/13799] Add missing space before checked attribute
[ticket/13799] Correctly urlencode category and show selected avatar
[ticket/13799] Do not rawurlencode category in gallery avatar
2015-10-19 14:39:14 +02:00
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
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
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
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