Commit graph

24924 commits

Author SHA1 Message Date
Marc Alexander
6bcec956ba [ticket/13684] Prevent horizontal resize of attach comment textarea
PHPBB3-13684
2015-10-14 11:13:15 +02:00
Marc Alexander
f6c8338358 Merge pull request #3864 from Zoddo/ticket/8920
[ticket/8920] Add a MCP PM reports view permission
2015-10-11 10:47:44 +02:00
Marc Alexander
def21f27a2 Merge pull request #3893 from VSEphpbb/ticket/14155
[ticket/14155] Row highlighting for extension/styles management

Conflicts:
	phpBB/adm/style/acp_ext_list.html
2015-10-09 16:51:00 +02:00
Marc Alexander
8683824ed3 Merge pull request #3934 from Zoddo/ticket/14181
[ticket/14181] Fix empty denial reason if the reason isn't translated
2015-10-09 16:43:53 +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
Marc Alexander
a0dafbfb5f Merge pull request #3953 from rxu/ticket/14073-fix-whitespaces
[ticket/14073] Fix trailing whitespaces
2015-10-08 17:21:51 +02:00
rxu
70b5ffc41d [ticket/14073] Fix trailing whitespaces
PHPBB3-14073
2015-10-08 22:19:44 +07:00
Marc Alexander
e63ef0b28f Merge pull request #3814 from rxu/ticket/14073
[ticket/14073] Add several core events to the functions_admin.php
2015-10-08 17:08:15 +02:00
Marc Alexander
6360d748db Merge pull request #3844 from rxu/ticket/14113
[ticket/14113] Add core events for customizing members search
2015-10-08 16:53:08 +02:00
rxu
e5b895de7b [ticket/14113] Add core events for customizing members search
Add core events to the memberlist.php for customizing members search.

PHPBB3-14113
2015-10-08 20:57:10 +07:00
rxu
3469cdce76 [ticket/14073] Add several core events to the functions_admin.php
Add core events to the functions move_posts(), delete_posts(),
delete_attachments().

PHPBB3-14073
2015-10-08 20:53:54 +07:00
Tristan Darricau
7a60cdd1d3 Merge pull request #3951 from RMcGirr83/ticket_14219
[ticket/14219] Add email to inactive user listing

* RMcGirr83/ticket_14219:
  [ticket/14219] Add email to inactive user listing
2015-10-08 15:49:39 +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
Tristan Darricau
542498e457 Merge pull request #3724 from javiexin/ticket/13960
[ticket/13960] Profile field validation breaks ACP

* javiexin/ticket/13960:
  [ticket/13960] Profile field validation breaks ACP
2015-10-08 15:42:33 +02:00
Marc Alexander
c38a128663 Merge pull request #3824 from rxu/ticket/14088
[ticket/14088] Add more core events to the search.php
2015-10-08 15:11:12 +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
Richard McGirr
4830b3eacd [ticket/14219] Add email to inactive user listing
in ACP.  May help in spotting spam accounts quickly

PHPBB3-14219
2015-10-08 06:10:49 -04:00
Marc Alexander
cf62b303a6 Merge pull request #3440 from CHItA/ticket/13636
[ticket/13636] Deleting inactive user in acp_users gives unexpected link
2015-10-07 16:54:50 +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
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
HB
66397ae0e4 [ticket/14181] Fix empty denial reason if the reason isn't translated
PHPBB3-14181
2015-09-27 17:23:49 +02:00
Andreas Fischer
7e379c4cea Merge pull request #3920 from marc1706/ticket/14186
[ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()

* marc1706/ticket/14186:
  [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
2015-09-22 19:14:34 +02:00
Marc Alexander
d62b03e0de [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
PHPBB3-14186
2015-09-22 09:50:17 +02:00
Marc Alexander
d92a46ef02 Merge pull request #3833 from rxu/ticket/14102
[ticket/14102] Add core event to the mcp_topic.php
2015-09-16 22:47:11 +02:00
Tristan Darricau
5b9d828328 Merge pull request #3895 from Zoddo/ticket/14154
[ticket/14154] Add extension composer name as tooltip

* Zoddo/ticket/14154:
  [ticket/14154] Add extension composer name as tooltip
2015-09-16 11:57:28 +02:00
Marc Alexander
2bf9e91101 Merge pull request #3865 from Zoddo/ticket/13992
[ticket/13992] Fix HTML5 error from w3.org validator
2015-09-15 14:35:29 +02:00
Marc Alexander
bc518bf96e Merge pull request #3894 from Nicofuma/ticket/14156
[ticket/14156] Add Symfony ResponseListener
2015-09-13 17:51:02 +02:00
Zoddo
aa01ee1bbc [ticket/8920] Revert update_module_auth() on revert_data()
PHPBB3-8920
2015-09-13 14:06:10 +02:00
Zoddo
a4a99f5ea3 [ticket/14154] Add extension composer name as tooltip
PHPBB3-14154
2015-09-12 14:52:31 +02:00
Marc Alexander
c166adf3c7 Merge pull request #3767 from Zoddo/ticket/14020
[ticket/14089] Add posting_topic_title_after template event

Conflicts:
	phpBB/docs/events.md
2015-09-12 13:23:47 +02:00
Tristan Darricau
7d15704f6a [ticket/14156] Add Symfony ResponseListener
PHPBB3-14156
2015-09-11 18:17:09 +02:00
Marc Alexander
46f6b4459a Merge pull request #3892 from cyberalien/ticket/14153
[ticket/14153] Fix floating elements in notifications dropdown header
2015-09-11 09:35:24 +02:00
Matt Friedman
0f49eaa2e2 [ticket/14155] Row highlighting for extension/styles management
PHPBB3-14155
2015-09-11 00:19:58 -07:00
cyberalien
0744330080 [ticket/14153] Fix floating elements in notifications dropdown header
PHPBB3-14153
2015-09-10 12:03:02 +03:00
Tristan Darricau
c9d159257a Merge pull request #3868 from Zoddo/ticket/7362
[ticket/7362] Add alt attribute on topic icons

* Zoddo/ticket/7362:
  [ticket/7362] Add alt attribute on topic icons
2015-09-09 11:06:36 +02:00
Tristan Darricau
1affd34814 Merge pull request #3890 from marc1706/ticket/13423
[ticket/13423] Set busyTimeout on connect to prevent db locking

* marc1706/ticket/13423:
  [ticket/13423] Set busyTimeout on connect to prevent db locking
2015-09-09 11:00:44 +02:00
Marc Alexander
90d5eefccf Merge pull request #3881 from VSEphpbb/ticket/14142
[ticket/14142] Remove unused ignore_configs from avatar drivers
2015-09-08 13:34:58 +02:00
Marc Alexander
ea594d00f7 [ticket/13423] Set busyTimeout on connect to prevent db locking
PHPBB3-13423
2015-09-07 12:23:49 +02:00
Marc Alexander
9537ec56eb Merge pull request #3884 from Nicofuma/ticket/14143
[ticket/14143] Flush the mail queue when writing it
2015-09-07 12:15:24 +02:00
Tristan Darricau
0e93efd7cb [ticket/14143] Flush the mail queue when writing it
PHPBB3-14143
2015-09-05 17:53:29 +02:00
Andreas Fischer
8cab2374f9 Merge pull request #3877 from Nicofuma/ticket/14140
[ticket/14140] Update Symfony to 2.3.32

* Nicofuma/ticket/14140:
  [ticket/14140] Update SYmfony to 2.3.32
2015-09-05 16:08:13 +02:00
Joas Schilling
f201c22ca7 Merge branch 'prep-release-3.1.6' into 3.1.x
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2015-09-05 15:19:16 +02:00
Joas Schilling
5258fba2e0 [prep-release-3.1.6] Add migration for 3.1.6 2015-09-05 12:45:53 +02:00
Joas Schilling
82a45cd4da [prep-release-3.1.6] Update version for final 3.1.6 release 2015-09-05 12:45:00 +02:00
Matt Friedman
076807c63a [ticket/14142] Remove unused ignore_configs from avatar drivers
PHPBB3-14142
2015-09-04 13:38:14 -07:00
Zoddo
053a6d1d70 [ticket/8800] Add "mark topics read" link to "View unread posts"
PHPBB3-8800
2015-09-04 20:06:13 +02:00
Tristan Darricau
7701034871 [ticket/14140] Update SYmfony to 2.3.32
PHPBB3-14140
2015-09-03 14:57:05 +02:00
Tristan Darricau
5faa12db4c Merge pull request #3855 from VSEphpbb/ticket/14123
[ticket/14123] Add descriptive help to the CLI help output

* VSEphpbb/ticket/14123:
  [ticket/14123] Fix typo
  [ticket/14123] Remove redundant help messages
  [ticket/14123] Add descriptive help to the CLI help output
2015-09-02 12:44:52 +02:00
Tristan Darricau
58af8606c1 Merge pull request #3853 from marc1706/ticket/14075
[ticket/14075] Add template event after poll preview panel

* marc1706/ticket/14075:
  [ticket/14075] Update version to 3.1.7-RC1
  [ticket/14075] Add template event after poll preview panel
2015-09-02 12:03:58 +02:00
Tristan Darricau
48d05bad25 Merge pull request #3860 from kinerity/ticket/14126
[ticket/14126] Add viewtopic_topic_title_after template event

* kinerity/ticket/14126:
  [ticket/14126] Add viewtopic_topic_title_after template event
2015-09-02 11:59:14 +02:00