Commit graph

25837 commits

Author SHA1 Message Date
Tristan Darricau
fcf797c3f2 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14200] Allow hidden users to see himself on viewonline
2015-10-12 09:20:13 +02:00
Tristan Darricau
5f8fb38b52 Merge pull request #3957 from Zoddo/ticket/14200
[ticket/14200] Allow hidden users to see himself on viewonline

* Zoddo/ticket/14200:
  [ticket/14200] Allow hidden users to see himself on viewonline
2015-10-12 09:19:24 +02:00
Tristan Darricau
766fc3a394 Merge pull request #3964 from prototech/ticket/13993
[ticket/13993] Do not parse signatures as posts when editing them.

* prototech/ticket/13993:
  [ticket/13993] Do not parse signatures as posts when editing them.
2015-10-12 08:54:33 +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
Cesar G
0a93db705b [ticket/13993] Do not parse signatures as posts when editing them.
The implementation of PHPBB3-12516 changed the manual use of the message parser
to using generate_text_for_storage(). The function does not support
parse_message::parse()'s mode parameter, thus all the error checks on the sig
are invalid.

PHPBB3-13993
2015-10-11 15:46:43 -07:00
Marc Alexander
87b9cede4b Merge pull request #3962 from hanakin/ticket/14231
[ticket/14231]Fix double icon issue
2015-10-11 20:31:44 +02:00
Marc Alexander
fe175fbcb8 Merge branch '3.1.x' 2015-10-11 20:27:47 +02:00
Marc Alexander
5f05a8a8f8 Merge pull request #3902 from Zoddo/ticket/14161
[ticket/14161] Wrong var name for core.download_file_send_to_browser_before
2015-10-11 20:27:14 +02:00
Zoddo
97118a897a [ticket/14161] Wrong var name for core.download_file_send_to_browser_before
`extension` must be `extensions`

Introduced in fix of PHPBB3-14101 (PR GH-3831)

PHPBB3-14161
2015-10-11 14:20:11 +02: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
Marc Alexander
03cb2a7b0c Merge pull request #3931 from hanakin/ticket/14194
[Ticket/14194] Responsive Quick Links Menu Broken
2015-10-11 13:24:13 +02:00
Michael Miday
8acbb20891 [ticket14194]Remove double inline-block
PHPBB3-14194
2015-10-11 11:43:36 +02:00
Marc Alexander
8c3fdfe4e1 Merge branch '3.1.x' 2015-10-11 10:48:53 +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
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
f6f796770a Merge pull request #3903 from Zoddo/ticket/13101
[ticket/13101] Remove MSN/WLM custom profile field
2015-10-10 20:52:52 +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
8eb9ce50b0 [ticket/14200] Allow hidden users to see himself on viewonline
PHPBB3-14200
2015-10-10 16:33:40 +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
Zoddo
21201aa1ab [ticket/13101] Remove existing MSN/WLM custom profile field
PHPBB3-13101
2015-10-10 15:24:22 +02:00
rxu
d75750fd99 [ticket/14098] Add core events to the search backends
PHPBB3-14098
2015-10-09 23:06:16 +07:00
Marc Alexander
6ebadee5d0 Merge branch '3.1.x' 2015-10-09 16:51:35 +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
b2e7de0379 Merge branch '3.1.x' 2015-10-09 16:45:07 +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
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
Marc Alexander
a0167ad410 [ticket/14168] Fix docblock in manager
PHPBB3-14168
2015-10-09 14:35:40 +02:00
Marc Alexander
53008c8782 [ticket/14168] Fix tabs in manager and add test file
PHPBB3-14168
2015-10-09 12:14:19 +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
Marc Alexander
c78dbd2eea [ticket/14168] Add attachment manager service
PHPBB3-14168
2015-10-09 10:20:30 +02:00
Marc Alexander
22b36d9d0e [ticket/14168] Use correct docblock
PHPBB3-14168
2015-10-09 10:20:30 +02:00
Marc Alexander
ca1308ba5f [ticket/14168] Add services_attachment.yml to services.yml
PHPBB3-14168
2015-10-09 10:20:30 +02:00
Marc Alexander
80e3c79f38 [ticket/14168] Minor coding style fixes
PHPBB3-14168
2015-10-09 10:20:29 +02:00
Marc Alexander
11475283eb [ticket/14168] Move attachment service definitions to services_attachment
PHPBB3-14168
2015-10-09 10:20:27 +02:00
Marc Alexander
36ea105236 [ticket/14168] Move image check and don't use trigger_error()
PHPBB3-14168
2015-10-09 10:18:41 +02:00
Marc Alexander
b7238bca0e [ticket/14168] Fix CS issue
PHPBB3-14168
2015-10-09 10:18:40 +02:00
Marc Alexander
98ebbbdca2 [ticket/14168] No longer use deprecated functions in core files
PHPBB3-14168
2015-10-09 10:18:40 +02:00
Marc Alexander
0478631389 [ticket/14168] Move phpbb_unlink() into attachment delete class
PHPBB3-14168
2015-10-09 10:18:31 +02:00
Marc Alexander
b00c7511f0 [ticket/14168] Add tests for attachment delete class
PHPBB3-14168
2015-10-09 10:15:40 +02:00
Marc Alexander
583f42a2aa [ticket/14168] Add tests for attachment resync class
PHPBB3-14168
2015-10-09 10:15:40 +02:00
Marc Alexander
cebc064f4c [ticket/14168] Coding guidelines fixes
PHPBB3-14168
2015-10-09 10:15:40 +02:00
Marc Alexander
e158db5daa [ticket/14168] Minor coding style fixes
PHPBB3-14168
2015-10-09 10:15:39 +02:00
Marc Alexander
40117c7730 [ticket/14168] Add attachment resync class
PHPBB3-14168
2015-10-09 10:15:38 +02:00
Marc Alexander
ebfdd69525 [ticket/14168] Further split up attachment delete class
PHPBB3-14168
2015-10-09 09:58:18 +02:00
Marc Alexander
4709c8a128 [ticket/14168] Unset prototype classes after use
PHPBB3-14168
2015-10-09 09:53:07 +02:00
Marc Alexander
d1030450f5 [ticket/14168] Move function for attachment deletion into class
PHPBB3-14168
2015-10-09 09:53:05 +02:00