1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00

2630 Commits

Author SHA1 Message Date
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
7d4bbeef3f Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/notification/type/bookmark.php
	phpBB/phpbb/notification/type/post.php
	phpBB/phpbb/notification/type/quote.php
2015-10-17 12:13:32 +02:00
Cesar G
aaca64e13e [ticket/13892] Replace other uses of self with static.
PHPBB3-13892
2015-10-15 02:39:55 -07:00
Cesar G
9de5668b80 [ticket/13892] Respect "Someone reports a post" notification setting.
report_post inherits from post_in_queue, therefore using self:: instead of
static:: results in the incorrect notification type being used to determine
which users to exclude from the notification.

PHPBB3-13892
2015-10-15 02:28:55 -07:00
Cesar G
90038e32cd [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.
PHPBB3-13789
2015-10-14 19:05:27 -07:00
Tristan Darricau
84150d0d44 [ticket/13652] Fix coding style
PHPBB3-13652
2015-10-14 17:15:09 +02:00
Tristan Darricau
cd114a68e9 Merge pull request #3441 from brunoais/feature/sql-bool-builder
[feature/sql-bool-builder] Extending DBAL query builder for boolean generation

* brunoais/feature/sql-bool-builder:
  [feature/sql-bool-builder] Improved tests output to show the SQL error.
  [feature/sql-bool-builder] Adding the IS operator to predicted operators
  [feature/sql-bool-builder] test_single_not_like
  [feature/sql-bool-builder] test_single_like
  [feature/sql-bool-builder] test_single_not_in
  [feature/sql-bool-builder] test_single_in
  [feature/sql-bool-builder] test_and_of_or_of_and
  [feature/sql-bool-builder] test_triple_and_with_in
  [feature/sql-bool-builder] test_double_and_with_not_of_and
  [feature/sql-bool-builder] test_triple_and_with_is_null
  [feature/sql-bool-builder] Prepare testing class
  [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations
  [feature/sql-bool-builder] Explain better the code in the first
  [feature/sql-bool-builder] Also use parenthesis for the NOT operator
  [feature/sql-bool-builder] AS keyword must be lowercase;
  [feature/sql-bool-builder] Added code to use this feature for the WHERE clause
  [feature/sql-bool-builder] Removed non-necessary spaces
  [feature/sql-bool-builder] First working version
2015-10-14 16:18:46 +02:00
Tristan Darricau
cac090b659 Merge pull request #3913 from marc1706/ticket/14168
[ticket/14168] Refactor attachment management functions into classes

* marc1706/ticket/14168: (36 commits)
  [ticket/14168] Correctly state return type of upload and upload_attachment
  [ticket/14168] Use attachment manager instead of separate classes
  [ticket/14168] Fix docblock in manager
  [ticket/14168] Add more test cases for attachment manager
  [ticket/14168] Add new test method and more tests
  [ticket/14168] Fix tabs in manager and add test file
  [ticket/14168] Fix tests after rebase
  [ticket/14168] Add attachment manager service
  [ticket/14168] Use correct docblock
  [ticket/14168] Add services_attachment.yml to services.yml
  [ticket/14168] Minor coding style fixes
  [ticket/14168] Move attachment service definitions to services_attachment
  [ticket/14168] Improve code coverage in upload class
  [ticket/14168] Move image check and don't use trigger_error()
  [ticket/14168] Add tests for init_error() during upload
  [ticket/14168] Add basic test file for attachments upload
  [ticket/14168] Fix CS issue
  [ticket/14168] No longer use deprecated functions in core files
  [ticket/14168] Move phpbb_unlink() into attachment delete class
  [ticket/14168] Reset sequence before tests in delete tests
  ...
2015-10-14 08:40:01 +02:00
Tristan Darricau
359ef56e35 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13835] Normalize filename for attachments uploaded in chunks.
2015-10-14 08:38:32 +02:00
Cesar G
655f244c4f [ticket/13835] Normalize filename for attachments uploaded in chunks.
PHPBB3-13835
2015-10-13 20:17:26 -07:00
Tristan Darricau
a5ab2eb564 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14098] Add core events to the search backends
2015-10-12 13:38:42 +02:00
Tristan Darricau
1164cc38a2 Merge pull request #3830 from rxu/ticket/14098
[ticket/14098] Add core events to the search backends

* rxu/ticket/14098:
  [ticket/14098] Add core events to the search backends
2015-10-12 13:38:42 +02:00
Marc Alexander
bb2634b5e5 [ticket/14168] Correctly state return type of upload and upload_attachment
PHPBB3-14168
2015-10-12 12:11:26 +02:00
Tristan Darricau
af1597ae25 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14191] Add core.get_gravatar_url_after event
2015-10-12 11:32:05 +02:00
Tristan Darricau
65b13938db Merge pull request #3925 from Senky/ticket/14191
[ticket/14191] Add core.get_gravatar_url_after event

* Senky/ticket/14191:
  [ticket/14191] Add core.get_gravatar_url_after event
2015-10-12 11:32:05 +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
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
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
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
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
80e3c79f38 [ticket/14168] Minor coding style fixes
PHPBB3-14168
2015-10-09 10:20:29 +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
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
d1030450f5 [ticket/14168] Move function for attachment deletion into class
PHPBB3-14168
2015-10-09 09:53:05 +02:00
Marc Alexander
a60beb6f2f [ticket/14168] Further split up attachment upload class
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Marc Alexander
e10aa45470 [ticket/14168] Further split up attachment upload class
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Marc Alexander
6c1cd26b7a [ticket/14168] Split thumbnail creation to separate method
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Marc Alexander
07c8e21e80 [ticket/14168] Use language class and fix incorrect docblock
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Marc Alexander
e50718008a [ticket/14168] Add attachment upload class
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Tristan Darricau
0799a4808d [ticket/14225] Inject the loader resolver when using the delegating loader
PHPBB3-14225
2015-10-08 23:19:09 +02:00
Tristan Darricau
403c647b9e [ticket/14220] Move route loading to services
PHPBB3-14220
2015-10-08 14:15:44 +02:00
Marc Alexander
da4d6dfa28 Merge pull request #3857 from Nicofuma/ticket/14124
[ticket/14124] Automatically translate exceptions in CLI
2015-10-07 14:47:23 +02:00
Marc Alexander
64641f9b1f Merge pull request #3904 from Zoddo/ticket/14162
[ticket/14162] Add CLI commands to manage migrations
2015-10-07 14:03:02 +02:00
Tristan Darricau
f3dc2a801d [ticket/14205] Bump PHP requirement to PHP 5.4
PHPBB3-14205
2015-10-04 16:19:48 +02:00
Jakub Senko
d5f625382b [ticket/14191] Add core.get_gravatar_url_after event
PHPBB3-14191
2015-09-23 18:45:15 +02:00
Andreas Fischer
4972141a14 Merge pull request #3916 from Nicofuma/ticket/12633
[ticket/12633] Doesn't use DEBUG to debug templates events

* Nicofuma/ticket/12633:
  [ticket/12633] Doesn't use DEBUG to debug templates events
2015-09-22 19:29:07 +02:00
Tristan Darricau
a7ba640ea7 [ticket/14182] Move v310\notifications_board migration to v320\...
PHPBB3-14182
2015-09-21 10:47:20 +02:00