mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00
Code Issues Releases Wiki Activity
24,671 Commits 18 Branches 192 Tags
Commit Graph

1872 Commits

Author SHA1 Message Date
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
Wardormeur
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
Marc Alexander
dc9245dd7a Merge pull request #3653 from callumacrae/ticket/13882 
[ticket/13882] Lazy load the notification avatars.
 2015-06-16 12:33:17 +02:00
Joas Schilling
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
Joas Schilling
8f5d761112 [prep-release-3.1.5] Add migration for 3.1.5 2015-06-14 16:14:07 +02:00
Marc Alexander
714533d12e [ticket/13942] Check if path to language file contains language path 
PHPBB3-13942
 2015-06-13 17:15:28 +02:00
Andreas Fischer
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
Tristan Darricau
5dbfd14699 [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3 
PHPBB3-13941
 2015-06-13 13:20:55 +02:00
Joas Schilling
7bb617eeb6 Merge branch 'prep-release-3.1.5' into 3.1.x 2015-06-11 23:24:02 +02:00
Andreas Fischer
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
Joas Schilling
23a45fcace [prep-release-3.1.5] Add migration for 3.1.5-RC1 2015-06-09 20:32:15 +02:00
Joas Schilling
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
Marc Alexander
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
Marc Alexander
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
Marc Alexander
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
Marc Alexander
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
Marc Alexander
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
Marc Alexander
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
brunoais
3ac95f48f8 [ticket/13685] phpBB, not PhpBB 
PHPBB3-13685
 2015-06-09 12:55:27 +01:00
Marc Alexander
9203bf3141 [ticket/13930] Add missing spaces to code 
PHPBB3-13930
 2015-06-07 22:53:41 +02:00
brunoais
823783773c [ticket/13685] BUMP version to 3.1.5-dev 
PHPBB3-13685
 2015-06-07 18:40:50 +01:00
brunoais
94aff53e3f [ticket/13685] Allow modifying the query for mysql native fulltext search 
PHPBB3-13685
 2015-06-07 18:40:49 +01:00
brunoais
1e45a05000 [ticket/13685] Add phpbb_dispatcher to fulltext search constructors 
PHPBB3-13685
 2015-06-07 18:40:44 +01:00
CHItA
29cda5f2ad [ticket/13888] Fix sql_freeresult() error on author searches 
PHPBB3-13888
 2015-06-07 17:41:17 +02:00
Marc Alexander
bac02a348e Merge pull request #22 from phpbb/ticket/sec-184 
[ticket/sec-184] Do not output passwords to HTML
 2015-06-07 14:57:06 +02:00
Tristan Darricau
bed8df20d2 Merge pull request #3680 from marc1706/ticket/13917 
[ticket/13917] Use hash_equals() if possible in password driver helper
 2015-06-06 11:45:22 +02:00
Joas Schilling
9005711ad7 Merge pull request #3502 from marc1706/ticket/13564 
[ticket/13564] Unlink user accounts upon deleting user
 2015-06-04 17:30:09 +02:00
Marc Alexander
fb94bd11fb [ticket/13917] Do not pass non-string variables to hash_equals() 
PHPBB3-13917
 2015-06-04 17:16:22 +02:00
Marc Alexander
852337cacd [ticket/13917] Use hash_equals() if it's available 
PHPBB3-13917
 2015-06-04 16:52:08 +02:00
Joas Schilling
78b0c938a2 [ticket/sec-184] Do not output LDAP password to HTML 
SECURITY-184
 2015-06-04 14:29:03 +02:00
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790 
[ticket/13790] Update phpcs
 2015-05-30 10:53:47 +02:00
Callum Macrae
be1d1c7d05 [ticket/13882] Lazy load the notification avatars. 
This moves them further down the waterfall, making the page load
quicker.

PHPBB3-13882
 2015-05-28 18:05:07 +02:00
Marc Alexander
ef39f3a9ab Merge pull request #3633 from nickvergessen/ticket/13872 
[ticket/13872] Allow template events to have a changed version
 2015-05-28 14:16:08 +02:00
Joas Schilling
b1d829c232 Merge pull request #3457 from brunoais/ticket/13661 
[ticket/13661] Add event to allow editing the queries used to get the logs

* brunoais/ticket/13661:
  [ticket/13661] BUMP version to 3.1.5-dev
  [ticket/13661] Brackets in their own line
  [ticket/13661] Re-Fixed  $log_type -> $log_time
  [ticket/13661] Wrong event @since version
  [ticket/13661] Removed superfluous whitespace
  [ticket/13661] bugfix: The conditional is the log_time, not log_type
  [ticket/13661] Fixed the "FROM" in the built query.
  [ticket/13661] Add event to allow editing the queries used to get the logs
  [ticket/13661] Transform queries to get logs and log count into built queries
 2015-05-28 12:52:19 +02:00
Joas Schilling
b00b504343 [ticket/13872] Allow template events to have a changed version 
PHPBB3-13872
 2015-05-28 12:23:24 +02:00
Marc Alexander
5ca77df084 Merge pull request #3624 from VSEphpbb/ticket/13861 
[ticket/13861] Fix undefined variables in style update migration
 2015-05-22 11:49:07 +02:00
Matt Friedman
67502c0d22 [ticket/13861] Fix undefined variables in style update migration 
PHPBB3-13861
 2015-05-21 15:23:17 -07:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs 
PHPBB3-13790
 2015-05-19 22:19:18 +02:00
Nicofuma
309a6b9313 Merge pull request #3601 from nickvergessen/ticket/13827 
[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
 2015-05-17 20:01:18 +02:00
Joas Schilling
502214bf06 [ticket/13827] Use JsonResponse instead of our hacky json_response with exit() 
PHPBB3-13827
 2015-05-14 17:13:47 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style 
PHPBB3-13838
 2015-05-14 15:43:44 +02:00
Joas Schilling
66279e1a57 [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX 
PHPBB3-13827
 2015-05-09 20:48:14 +02:00
Marc Alexander
4fc6e7dbc7 Merge pull request #3598 from VSEphpbb/ticket/13822 
[ticket/13822] Correctly display softdelete and post detail perms
 2015-05-08 10:59:40 +02:00
Matt Friedman
350786c969 [ticket/13822] Correctly display softdelete and post detail perms 
PHPBB3-13822
 2015-05-07 21:10:16 -07:00
brunoais
c701e8a131 [ticket/13694] BUMP version to 3.1.5-dev 
PHPBB3-13694
 2015-05-06 23:05:30 +01:00
brunoais
5465c594ca [ticket/13691] BUMP version to 3.1.5-dev 
PHPBB3-13691
 2015-05-06 23:03:23 +01:00
brunoais
f2fb8e339d [ticket/13686] BUMP version to 3.1.5-dev 
PHPBB3-13686
 2015-05-06 23:02:21 +01:00
brunoais
b8a31241a3 [ticket/13689] BUMP version to 3.1.5-dev 
PHPBB3-13689
 2015-05-06 22:59:05 +01:00
brunoais
684a050916 [ticket/13661] BUMP version to 3.1.5-dev 
PHPBB3-13661
 2015-05-06 22:53:43 +01:00