1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-27 02:54:04 +01:00

17393 Commits

Author SHA1 Message Date
rxu
b7dea19bf3 [ticket/12213] Add MCP events for custom quick moderation options
Add core events to mcp.php and mcp_main.php. This allows
extensions to add and to handle custom quick moderation options.

PHPBB3-12213
2014-02-20 00:38:28 +08:00
Nathan Guse
bd8951cfbe Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12093] Check that document.selection is supported.

Conflicts:
	phpBB/adm/style/editor.js
	phpBB/assets/javascript/editor.js
	phpBB/styles/prosilver/template/editor.js
2014-02-19 09:23:02 -06:00
Nathan Guse
823dca737f Merge remote-tracking branch 'remotes/prototech/ticket/12093' into develop-olympus
* remotes/prototech/ticket/12093:
  [ticket/12093] Check that document.selection is supported.
2014-02-19 09:06:57 -06:00
Nathan Guse
eaf9a41ed8 Merge pull request #1994 from prototech/ticket/12158
[ticket/12158] The pagination start value should be 0 when there are no items.
2014-02-18 14:25:46 -06:00
Nathan Guse
7015fc8a00 Merge pull request #2002 from prototech/ticket/12153
[ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
2014-02-18 14:11:48 -06:00
Cesar G
c7efadc26d [ticket/12153] Remove duplicate assignment of $u_previous_page & $u_next_page.
PHPBB3-12153
2014-02-18 12:04:31 -08:00
Nathan Guse
74d2d6c66a Merge pull request #2027 from lucifer4o/ticket/12177
[ticket/12177] Add ucp_friend_list_before/after
2014-02-18 12:36:55 -06:00
Nils Adermann
7a21d99b9b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
2014-02-18 19:34:08 +01:00
Nathan Guse
061d9fba5a Merge pull request #2038 from prototech/ticket/12206
[ticket/12206] Fix mismatched Plupload language vars preventing localization.
2014-02-18 12:29:17 -06:00
Nathan Guse
74836f8c64 Merge pull request #2040 from prototech/ticket/12208
[ticket/12208] Remove file from upload queue if deleted before being uploaded.
2014-02-18 12:28:20 -06:00
Nathan Guse
69c119485a Merge pull request #2007 from rxu/ticket/12166
Add template events before/after the textbox in quickreply_editor.html.
2014-02-18 12:27:43 -06:00
Nathan Guse
5fc29e0d2b Merge pull request #2008 from marc1706/ticket/12167
[ticket/12167] Allow users to change style via style parameter by default
2014-02-18 12:26:49 -06:00
Cesar G
627dc886b3 [ticket/12212] Encode the attachment file name before presenting to user.
The uploader inserts the file name directly into the page at the moment without
handling any HTML special chars that may be in the name. This results in HTML
that may be present getting rendered in error messages and the attachments
list. This simply causes layout breakage for the user, since the backend takes
care of sanitizing the name. Once phpBB returns the file data for the uploaded
file, the name in the attachment list gets replaced by the one that phpBB
provides.

PHPBB3-12212
2014-02-18 00:01:05 -08:00
Nathaniel Guse
602f4a2b54 [ticket/12210] dbtools::sql_create_table incorrectly throws error
related to auto-increment length on non auto-increment fields

PHPBB3-12210
2014-02-17 23:46:39 -06:00
rxu
cab8181af1 [ticket/12166] Add template events to quickreply_editor.html.
Add template event pair - quickreply_editor_message_before
and quickreply_editor_message_before to
quickreply_editor.html for both of prosilver and subsilver2 styles.
This allows extensions to modify quick reply
postform. For example, to add BBCode buttons and/or smilies
and so on.

PHPBB3-12166
2014-02-18 10:51:34 +08:00
Cesar G
233bdfa5f6 Merge remote-tracking branch 'Zoddo/ticket/12207' into develop
* Zoddo/ticket/12207:
  [ticket/12207] Forum broken when error thrown
2014-02-17 17:30:44 -08:00
Cesar G
1c56d28d9b [ticket/12208] Remove file from upload queue if deleted before being uploaded.
The table row is removed, but the files aren't actually removed from the
upload queue, so they get uploaded either way.

PHPBB3-12208
2014-02-17 15:11:24 -08:00
Zoddo
fb662ebf50 [ticket/12207] Forum broken when error thrown
Fix display of forum when error is outputted before <html> tag.

PHPBB3-12207
2014-02-17 21:58:39 +01:00
Cesar G
a589c88d25 [ticket/12206] Fix mismatched Plupload language vars preventing localization.
PHPBB3-12206
2014-02-17 12:33:19 -08:00
Cesar G
b3ecb9e1e4 Merge remote-tracking branch 'Zoddo/ticket/12003' into develop
* Zoddo/ticket/12003:
  [ticket/12003] ACP broken when error thrown
2014-02-17 10:27:23 -08:00
Zoddo
b942615c3b [ticket/12003] ACP broken when error thrown
Fix display of ACP when error is outputted before <html> tag.

PHPBB3-12003
2014-02-17 19:21:20 +01:00
Marc Alexander
f1c913f176 [ticket/12183] Move user_newpasswd, user_actkey below user_pass_convert
PHPBB3-12183
2014-02-17 16:28:36 +01:00
Cesar G
b8c836836b [ticket/12080] Stop responsive ACP sig textarea from dropping to second line.
PHPBB3-12080
2014-02-16 13:27:48 -08:00
Cesar G
bfbf0fefbf [ticket/12080] Reduce the palette options in all locations when responsive.
PHPBB3-12080
2014-02-16 13:27:01 -08:00
Cesar G
5ef55d9e45 [ticket/12080] Add classes to color palette table to identify it more easily.
PHPBB3-12080
2014-02-16 13:25:43 -08:00
Cesar G
3bdc1e9e1c [ticket/12138] Replace old code and generate pagination using filetime limit.
PHPBB3-12138
2014-02-16 10:21:10 -08:00
Cesar G
e4685ac80d [ticket/12138] Add methods for attachment manage functionality.
PHPBB3-12138
2014-02-16 10:21:02 -08:00
Cesar G
d4affedaab [ticket/12192] Fix call to undefined method get_user_avatar().
PHPBB3-12192
2014-02-14 19:19:53 -08:00
Andreas Fischer
ccf12ba166 Merge pull request #1964 from prototech/ticket/12136
[ticket/12136] Use new pagination class in generate_smilies().

* prototech/ticket/12136:
  [ticket/12136] Use new pagination class in generate_smilies().
2014-02-15 02:35:19 +01:00
lucifer4o
c20a313ab0 [ticket/12177] Add ucp_friend_list_before/after
Add events before and after list of friends in UCP template
Change Since part from a3 to a4

PHPBB3-12177
2014-02-13 16:23:42 +02:00
lucifer4o
89007db505 [ticket/12177] Add ucp_friend_list_before/after
Add events before and after list of friends in UCP template

PHPBB3-12177
2014-02-13 14:51:53 +02:00
Cesar G
13e7bd76a5 Merge remote-tracking branch 'vinny/ticket/12134' into develop
* vinny/ticket/12134:
  [ticket/12134] Add ucp_pm_viewmessage_print_head_append event to subsilver2
2014-02-12 18:39:39 -08:00
Cesar G
965b3365fe Merge remote-tracking branch 'vinny/ticket/12132' into develop
* vinny/ticket/12132:
  [ticket/12132] Add the event to events.md doc
  [ticket/12132] Add viewtopic_print_head_append event to subsilver2
2014-02-12 18:38:40 -08:00
Joas Schilling
75fa467b7b Merge remote-tracking branch 'bantu/ticket/12180' into develop
* bantu/ticket/12180:
  [ticket/12180] Add "Each file MUST end with exactly one newline character" rule
2014-02-12 22:12:30 +01:00
Joas Schilling
30fbaab8de [ticket/12184] Fix undefined variable tpl_fields in profile field manager
PHPBB3-12184
2014-02-11 19:17:24 +01:00
Marc Alexander
c864d06ac6 [ticket/12183] Add migration file for updating user_newpasswd column
PHPBB3-12183
2014-02-10 22:10:31 +01:00
Marc Alexander
5ce0bb7630 [ticket/12183] Update user_newpasswd column to length of 255 in schema files
PHPBB3-12183
2014-02-10 22:06:42 +01:00
Joas Schilling
5550f0fa87 [ticket/12169] Split mode==headline into it's own function
PHPBB3-12169
2014-02-10 19:04:10 +01:00
Joas Schilling
995019a992 [ticket/12169] Add new option to display profile fields on memberlist
PHPBB3-12169
2014-02-10 16:28:21 +01:00
Joas Schilling
3c46aeb005 [ticket/12169] Allow displaying profile fields on memberlist
We can not sort by profile field values atm. And also I'm not sure
whether this is possible at all.

PHPBB3-12169
2014-02-10 15:58:55 +01:00
Andreas Fischer
1e86f71133 [ticket/12180] Add "Each file MUST end with exactly one newline character" rule
PHPBB3-12180
2014-02-10 15:01:50 +01:00
Joas Schilling
6bee91c429 [ticket/12169] Convert user_from to profile field location
Missing changes on memberlist view due to missing functionality

PHPBB3-12169
2014-02-10 14:38:43 +01:00
Joas Schilling
b088bf864b Merge remote-tracking branch 'Marc/ticket/12170' into develop
* Marc/ticket/12170:
  [ticket/12170] Test for 12170
  [ticket/12170] Assign schema keys in migration helper with data_depth 1
2014-02-10 14:23:09 +01:00
Joas Schilling
ee1c055b70 [ticket/12171] Send correct status 403 when forbidden and 404 when not found
PHPBB3-12171
2014-02-10 12:56:45 +01:00
Joas Schilling
c36b1c16f9 [ticket/12171] Check post visibility before being able to download attachments
PHPBB3-12171
2014-02-10 12:56:41 +01:00
Joas Schilling
e4129687cb [ticket/12171] Split post and pm download links
PHPBB3-12171
PHPBB3-12172
2014-02-10 12:37:10 +01:00
Joas Schilling
8744b0da6d [ticket/12171] Check topic visibility before allowing to download attachments
PHPBB3-12171
2014-02-10 12:36:01 +01:00
Marc Alexander
e8f8dcf0ea [ticket/12170] Assign schema keys in migration helper with data_depth 1
The migration helper currently drops any keys with schema changes that have
the data_depth 1. This change will correctly assign the keys to the steps
array without dropping the keys that might contain important info like the
actual table that should be created.

PHPBB3-12170
2014-02-07 21:13:50 +01:00
Joas Schilling
4663ea7c82 [ticket/12115] Remove space from line ending
PHPBB3-12115
2014-02-06 14:18:30 +01:00
Joas Schilling
26640bad3d [ticket/12115] Add migration file to remove old user columns
PHPBB3-12115
2014-02-06 11:32:13 +01:00