1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-28 19:43:16 +01:00

3566 Commits

Author SHA1 Message Date
Marc Alexander
a937e38bd5 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/memberlist_view.html
2016-02-27 10:54:48 +01:00
Marc Alexander
34389df1ae Merge pull request #4049 from rxu/ticket/14316
[ticket/14316] Add events before/after the custom/zebra fields in pfile view
2016-02-27 10:52:09 +01:00
rxu
673acc7313 [ticket/14316] Add events before/after the custom/zebra fields in profile view
PHPBB3-14316
2016-02-27 11:53:19 +07:00
Marc Alexander
1007dea154 Merge pull request #4127 from RMcGirr83/ticket_14416
[ticket/14416] footer nav links have incorrect tooltip styling applied
2016-02-18 16:18:29 +01:00
Tristan Darricau
00d71d854c Merge pull request #4157 from VSEphpbb/ticket/14447
[ticket/14447] Remove trailing white spaces in Prosilver

* VSEphpbb/ticket/14447:
  [ticket/14447] Remove trailing white spaces in Prosilver
2016-02-15 23:08:08 +01:00
Joas Schilling
3e8a62f309 [prep-release-3.1.8] Update version to 3.1.8-RC1 2016-02-13 14:52:57 +01:00
Tristan Darricau
f80ec7e786 [prep-release-3.2.0-b1] Update version to 3.2.0-b1 2016-02-03 21:41:22 +01:00
Richard McGirr
b9df08e97f [ticket/14416] Revert changes and use twig spaceless
PHPBB3-14416
2016-02-03 06:29:21 -05:00
Matt Friedman
93a25893d5 [ticket/14447] Remove trailing white spaces in Prosilver
PHPBB3-14447
2016-02-02 08:42:53 -08:00
Marc Alexander
3a4dae369d Merge branch '3.1.x' 2016-01-27 14:31:29 +01:00
Marc Alexander
3c4f150859 Merge pull request #4029 from RMcGirr83/ticket_14289
[ticket/14289] Add events to navbar header
2016-01-27 14:29:14 +01:00
Crizzo
ca9560fc7a [ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixed
In viewtopic_topic_tools.html was used the language variable L_PM_TOOLS it
had to be changed to L_TOPIC_TOOLS to display the right title in the
moderation wrench in viewtopic.php

PHPBB3-14418
2016-01-24 12:10:03 +01:00
Matt Friedman
98467d2ea5 [ticket/14420] Fix up search results topic lists
PHPBB3-14420
2016-01-18 17:55:31 -08:00
Richard McGirr
8d8f5783c6 [ticket/14416] footer nav links have incorrect tooltip styling applied
PHPBB3-14416
2016-01-17 07:03:21 -05:00
Richard McGirr
469b975f94 [ticket/14289] Change to 3.1.8-RC1 and rename event
PHPBB3-14289
2016-01-10 07:17:43 -05:00
Marc Alexander
0028ed3e95 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2016-01-08 16:39:33 +01:00
Saeed Hubaishan
678ca5dcdc [ticket/13180] Increase dateformat field size
[ticket/13180] Increase dateformat field size

change field size to 64 in these files
add new migration file to update the database schema

PHPBB3-13180
2016-01-07 17:36:02 +01:00
Marc Alexander
d3ca327f2c Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2016-01-07 16:28:44 +01:00
Marc Alexander
a7058d968f Merge pull request #4079 from rxu/ticket/14356
[ticket/14356] Add template events to viewtopic around back2top link
2016-01-07 16:26:16 +01:00
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
rxu
33db45edac [ticket/14356] Add template events to viewtopic around back2top link
PHPBB3-14356
2015-12-17 23:18:37 +07: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
Richard McGirr
7c736d527d [ticket/14289] Add events to navbar header
PHPBB3-14289
2015-11-13 05:50:10 -05:00