1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-09 19:26:53 +02:00
Commit Graph

2306 Commits

Author SHA1 Message Date
b251d98314 [ticket/13891] Fix CS
PHPBB3-13891
2015-07-02 15:26:49 +02:00
5970d0360c [ticket/13891] Handle verbosity
PHPBB3-13891
2015-07-02 13:40:02 +02:00
dd131d7439 [ticket/13891] Added elapsed/estimated time and memory to the progress bar
Also fixed some extra whitespace.

PHPBB3-13891
2015-07-02 12:22:51 +02:00
6b68544483 [ticket/13891] Use the SymfonyStyle in the reparse command
PHPBB3-13891
2015-07-01 15:49:32 +02:00
c7f10ec4d4 [ticket/13891] Updated range description
Does not count #0 as a potential record

PHPBB3-13891
2015-06-30 10:32:00 +02:00
6de5e5cc36 [ticket/13891] Added a progress bar
PHPBB3-13891
2015-06-30 10:32:00 +02:00
fadb192c57 [ticket/13891] Added command-line options
PHPBB3-13891
2015-06-30 10:32:00 +02:00
119f90e363 [ticket/13891] Replaced ContainerBuilder with service_collection
PHPBB3-13891
2015-06-30 10:31:58 +02:00
615ab099e2 [ticket/13891] Added reparser:list and reparser:reparse to CLI
PHPBB3-13891
2015-06-30 10:31:28 +02:00
353b3b4cfd [ticket/13970] Save the value of the optional [code] parameter
PHPBB3-13970
2015-06-27 12:33:44 +02:00
8747c7a2c1 Merge pull request #3579 from s9e/ticket/13803
[ticket/13803] Implement a generic and scalable way to reparse rich text
2015-06-24 16:58:41 +02:00
d430acb568 Merge pull request #3669 from s9e/ticket/13901
[ticket/13901] Add more whitespace to long quotes for readability
2015-06-24 16:34:53 +02:00
8213f24b35 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13952] Fix docblocks
  [ticket/13952] Inject dispatcher dependency to the tidy search cron task
2015-06-22 00:45:42 +02:00
rxu
e0476d4f53 [ticket/13952] Fix docblocks
PHPBB3-13952
2015-06-20 23:41:53 +07:00
rxu
a8fe3926dc [ticket/13952] Inject dispatcher dependency to the tidy search cron task
PHPBB3-13952
2015-06-20 21:39:06 +07:00
9296c75738 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13903] Replacing regexp path naming for container by md5.

Conflicts:
	phpBB/phpbb/di/container_builder.php
2015-06-16 20:06:28 +02:00
08a6f663de [ticket/13903] Replacing regexp path naming for container by md5.
Replacement of the path creation based on a blacklist by a md5 filename to
support broader configurations

PHPBB3-13903
2015-06-16 18:29:41 +02:00
80768b526b Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/user_loader.php
2015-06-16 12:35:51 +02:00
dc9245dd7a Merge pull request #3653 from callumacrae/ticket/13882
[ticket/13882] Lazy load the notification avatars.
2015-06-16 12:33:17 +02:00
2a662c5e07 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/phpbb/user.php
2015-06-14 17:40:18 +02:00
7ccb19fa00 Merge branch 'prep-release-3.1.5' into 3.1.x
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2015-06-14 17:38:04 +02:00
8f5d761112 [prep-release-3.1.5] Add migration for 3.1.5 2015-06-14 16:14:07 +02:00
714533d12e [ticket/13942] Check if path to language file contains language path
PHPBB3-13942
2015-06-13 17:15:28 +02:00
e0d1f81114 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
2015-06-13 15:18:44 +02:00
bf7a4f629d Merge pull request #3704 from Nicofuma/ticket/13941
[ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3

* Nicofuma/ticket/13941:
  [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
2015-06-13 15:18:43 +02:00
5dbfd14699 [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
PHPBB3-13941
2015-06-13 13:20:55 +02:00
7bb617eeb6 Merge branch 'prep-release-3.1.5' into 3.1.x 2015-06-11 23:24:02 +02:00
a3883a6f23 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-06-11 21:00:04 +02:00
1f4976f590 Merge pull request #3696 from marc1706/ticket/13930-master
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930-master:
  [ticket/13930] Add missing space to mssql_extractor
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
2015-06-09 21:27:23 +02:00
c952622fa0 Merge pull request #3694 from marc1706/ticket/13930
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930:
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
2015-06-09 21:27:07 +02:00
23a45fcace [prep-release-3.1.5] Add migration for 3.1.5-RC1 2015-06-09 20:32:15 +02:00
00c15c76c3 Merge branch '3.1.x' 2015-06-09 20:23:29 +02:00
832c9f64e0 Merge pull request #3551 from rxu/ticket/13779
[ticket/13779] Set new auth options to the role only if matching the role type
2015-06-09 20:23:08 +02:00
47ef99f6ef Merge branch '3.1.x' 2015-06-09 17:22:02 +02:00
405681f138 Merge pull request #3486 from brunoais/ticket/13693
[ticket/13693] Allow modifying the MySQL author search query
2015-06-09 17:21:54 +02:00
6d3c4d3879 Merge branch '3.1.x' 2015-06-09 17:19:49 +02:00
b7db12a593 Merge pull request #3485 from brunoais/ticket/13694
[ticket/13694] Allow modifying the Postgres native author search query for results
2015-06-09 17:19:42 +02:00
39c273e346 Merge branch '3.1.x' 2015-06-09 17:18:12 +02:00
4143f65b46 Merge pull request #3484 from brunoais/ticket/13691
[ticket/13691] Allow modifying the fulltext native search query for total results for author
2015-06-09 17:18:04 +02:00
35f3c5c4b0 Merge branch '3.1.x' 2015-06-09 17:14:58 +02:00
5f7fa4c89c Merge pull request #3483 from brunoais/ticket/13686
[ticket/13686] Allow modify query used for counting in fulltext_native
2015-06-09 17:14:23 +02:00
a21650e689 Merge branch '3.1.x' 2015-06-09 17:11:20 +02:00
83d8ea013b Merge pull request #3481 from brunoais/ticket/13689
[ticket/13689] Allow modifying the query for postgres native fulltext search

Conflicts:
	phpBB/develop/search_fill.php
	phpBB/includes/acp/acp_main.php
	phpBB/includes/acp/acp_search.php
	phpBB/includes/functions_admin.php
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_main.php
	phpBB/includes/mcp/mcp_post.php
	phpBB/install/install_convert.php
	phpBB/install/install_install.php
	phpBB/phpbb/search/fulltext_mysql.php
	phpBB/phpbb/search/fulltext_native.php
	phpBB/phpbb/search/fulltext_postgres.php
	phpBB/phpbb/search/fulltext_sphinx.php
	phpBB/search.php
	tests/search/mysql_test.php
	tests/search/native_test.php
	tests/search/postgres_test.php
2015-06-09 17:10:44 +02:00
b2ada8ba09 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_main.php
2015-06-09 15:24:08 +02:00
072f4c9260 Merge pull request #3479 from brunoais/ticket/13685
[ticket/13685] Allow modifying the query for mysql native fulltext search
2015-06-09 14:27:13 +02:00
3ac95f48f8 [ticket/13685] phpBB, not PhpBB
PHPBB3-13685
2015-06-09 12:55:27 +01:00
1fae4152ef [ticket/13930] Add missing space to mssql_extractor
PHPBB3-13930
2015-06-08 15:55:03 +02:00
2e31cae7bf Merge branch 'ticket/13930' into ticket/13930-master
Conflicts:
	phpBB/includes/acp/acp_database.php
2015-06-08 15:39:47 +02:00
03bfcba582 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13888] Fix sql_freeresult() error on author searches
2015-06-08 01:59:09 +02:00
9203bf3141 [ticket/13930] Add missing spaces to code
PHPBB3-13930
2015-06-07 22:53:41 +02:00