1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-30 04:38:21 +02:00

3545 Commits

Author SHA1 Message Date
Melvin García
5e8105a1cd [ticket/14371] Small fix for the quick links alignment
PHPBB3-14371
2015-12-24 14:00:34 +01:00
Marc Alexander
6a4e296c43 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_im.html
2015-12-23 13:32:44 +01:00
Marc Alexander
84ed888cb9 Merge pull request #4084 from exussum12/ticket/14046
[ticket/14046] Jabber message incorrect
2015-12-23 13:32:23 +01:00
Marc Alexander
d033597c5d Merge branch '3.1.x'
Conflicts:
	phpBB/adm/style/installer_footer.html
2015-12-22 19:51:21 +01:00
Matt Friedman
1654caf34b [ticket/14374] Update dynamic fallback jquery CDN script tag
PHPBB3-14374
2015-12-22 09:29:29 -08:00
Marc Alexander
96bd531701 Merge pull request #4087 from VSEphpbb/ticket/14368
[ticket/14368] Fix color of post editor input boxes
2015-12-20 11:03:44 +01:00
Matt Friedman
11ad71b381 [ticket/14368] Fix color of post editor input boxes
https://tracker.phpbb.com/browse/PHPBB3-14368

PHPBB3-14368
2015-12-19 10:29:22 -08:00
Tristan Darricau
6b09dbe16c [prep-release-3.2.0-a2] Update version to 3.2.0-a2 2015-12-19 17:17:01 +01:00
Scott Dutton
7ebbc69dbd [ticket/14046] Jabber message incorrect
When making a Jabber message, the page says the message has been sent
when loading the page for the first time, This message should only be
shown after the message has actually been sent

PHPBB3-14046
2015-12-16 22:15:29 +00:00
Joas Schilling
d2acccf92c [prep-release-3.1.7] Update version to 3.1.7-RC1 2015-12-12 01:31:31 +01:00
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
Marc Alexander
b81db686a8 Merge pull request #4031 from hanakin/ticket/14293
[ticket/14293]Fix postbody and profile responsive widths
2015-11-24 22:19:37 +01:00
Michael Miday
e0893c27a2 [ticket/14295]fix report icon as well
PHPBB3-14295
2015-11-24 18:49:45 +01:00
Michael Miday
eb7b0afede [ticket/14295]fix bidi
PHPBB3-14295
2015-11-24 18:40:42 +01:00
Michael Miday
21b58dcb6a [ticket/14295]missed one
PHPBB3-14295
2015-11-24 18:40:18 +01:00
Michael Miday
9225507c45 [ticket/14295]Fix spacing
PHPBB3-14295
2015-11-24 18:38:48 +01:00
Tristan Darricau
3698e9b8e0 Merge branch 'prep-release-3.2.0-a1'
* prep-release-3.2.0-a1:
  [prep-release-3.2.0-a1] Add changelog for 3.2.0-a1
  [prep-release-3.2.0-a1] Add migration for 3.2.0-a1
  [prep-release-3.2.0-a1] Update version to 3.2.0-a1
2015-11-23 23:17:01 +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
Michael Miday
c9ea49e1c2 [ticket/14293]Fix postbody and profile widths
PHPBB3-14293
2015-11-16 17:59:48 +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
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
34cf357599 [ticket/14229] fix inline-block link on row-item
PHPBB3-14229
2015-11-11 09:26:51 +01:00
Michael Miday
39f1c24af9 [ticket/14229] fix paging spacing
PHPBB3-14229
2015-11-11 09:26:51 +01:00
Michael Miday
c3c41d409b [ticket/14229]Responsive changes to topic paging 2015-11-11 09:26:50 +01:00
Michael Miday
0e22521aab [ticket/14229]topictitle should be inline
PHPBB3-14229
2015-11-11 09:26:50 +01:00
Tristan Darricau
f8236cc907 [prep-release-3.2.0-a1] Update version to 3.2.0-a1 2015-11-09 20:20:26 +01:00
RMcGirr83
ffc4b5a6df [ticket/12649] Fix buttons css file
PHPBB3-12649
2015-11-04 13:14:22 -05: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
f518a57d0d [ticket/12649] Fix bidi.css
PHPBB3-12649
2015-11-03 14:48:06 -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
Marc Alexander
8b7f711a18 Merge branch '3.1.x' 2015-11-03 09:36:43 +01: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
Richard McGirr
22d234a345 [ticket/14228] Vertical align of numbers in polls
PHPBB3-14228
2015-11-01 05:39:07 -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
da9a5c70d5 [ticket/10343] Add inactive indicator to subsilver2 memberlist
PHPBB3-10343
2015-10-17 18:39:14 -04:00