mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-12 03:34:15 +01:00
Code Issues Releases Wiki Activity
13,440 Commits 17 Branches 190 Tags
Commit Graph

13440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nils Adermann
9f0259c473 Merge remote-tracking branch 'github-bantu/ticket/10973' into develop 
* github-bantu/ticket/10973:
  [ticket/10973] Drop all require_once for mocks. Use autoloading.
  [ticket/10973] Add autoloader for autoloading phpbb_mock_ in tests.

Conflicts:
	tests/bbcode/url_bbcode_test.php
	tests/text_processing/censor_text_test.php
 2012-07-08 23:12:22 +02:00
Nils Adermann
527f02bb4b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php

Conflicts:
	tests/bbcode/url_bbcode_test.php
 2012-07-08 23:10:42 +02:00
Nils Adermann
088dbc0b54 Merge remote-tracking branch 'github-bantu/ticket/10974' into develop-olympus 
* github-bantu/ticket/10974:
  [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
 2012-07-08 23:03:58 +02:00
Andreas Fischer
d3bbde69c4 [ticket/10973] Drop all require_once for mocks. Use autoloading. 
PHPBB3-10973
 2012-07-08 22:57:23 +02:00
Andreas Fischer
cde5411e8a [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php 
PHPBB3-10974
 2012-07-08 22:46:14 +02:00
Andreas Fischer
932428086e [ticket/10973] Add autoloader for autoloading phpbb_mock_ in tests. 
PHPBB3-10973
 2012-07-08 22:33:27 +02:00
Oleg Pudeyev
576cd6dd1e Merge PR #854 branch 'dhruvgoel92/ticket/10943' into develop 
* dhruvgoel92/ticket/10943:
  [ticket/10943] displays searched query in search result
  [ticket/10943] use keywords variable to display in search box
 2012-07-07 21:30:42 -04:00
Dhruv Goel
b98be2f235 [ticket/10943] displays searched query in search result 
Search backend displays an additional normalized search query just above
the ignored words.

PHPBB3-10943
 2012-07-08 02:51:58 +05:30
Dhruv Goel
615f32cd71 [ticket/10943] use keywords variable to display in search box 
$keywords which contains the string as entered by the user should be used
to display in search box instead of search_query.

PHPBB3-10943
 2012-07-08 02:51:26 +05:30
Oleg Pudeyev
b6a364b706 Merge PR #856 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
 2012-07-07 16:43:30 -04:00
Oleg Pudeyev
a7da376004 Merge PR #856 branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
 2012-07-07 16:43:28 -04:00
Oleg Pudeyev
36a568fd56 Merge PR #856 branch 'bantu/ticket/10937' into prep-release-3.0.11 
* bantu/ticket/10937:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
 2012-07-07 16:43:24 -04:00
Oleg Pudeyev
1526886e3e Merge PR #832 branch 'dhruvgoel92/feature/postgresql-fulltext-search' into develop 
* dhruvgoel92/feature/postgresql-fulltext-search: (28 commits)
  [feature/postgresql-fulltext-search] supports_phrase_search function
  [feature/postgresql-fulltext-search] use proper variable name
  [feature/postgresql-fulltext-search] each config is checked if it is set
  [feature/postgresql-fulltext-search] fix formatting
  [feature/postgresql-fulltext-search] add docblocks to functions
  [feature/postgresql-fulltext-search] remove phrase search code
  [feature/postgresql-fulltext-search] define access control specifiers
  [feature/postgresql-fulltext-search] use version_compare
  [feature/postgresql-fulltext-search] fix language key
  [feature/postgresql-fulltext-search] remove Readme
  [feature/postgresql-fulltext-search] removes pcre check
  [feature/postgresql-fulltext-search] fix language tsearch2 to text search
  [feature/postgresql-fulltext-search] remove mbstring support
  [feature/postgresql-fulltext-search] change language for pgsql < 8.3
  [feature/postgresql-fulltext-search] use phpbb_pcre_utf8_support()
  [feature/postgresql-fulltext-search] fix variable name
  [feature/postgresql-fulltext-search] Fix version comparison for 9.0+.
  [feature/postgresql-fulltext-search] fixing license
  [feature/postgresql-fulltext-search] assign empty stats
  [feature/postgresql-fulltext-search] remove backward compatibility
  ...
 2012-07-07 16:19:53 -04:00
Dhruv Goel
70a0caee28 [feature/postgresql-fulltext-search] supports_phrase_search function 
function to return the value of the the private property phrase_search

PHPBB3-9730
 2012-07-08 01:38:53 +05:30
Dhruv Goel
7a2d36a25e [feature/postgresql-fulltext-search] use proper variable name 
PHPBB3-9730
 2012-07-08 01:38:38 +05:30
Dhruv Goel
d37c9cab6b [feature/postgresql-fulltext-search] each config is checked if it is set 
In database_update.php each config value of postgres fulltext search is
first checked whether it already exists or not and then added.

PHPBB3-9730
 2012-07-05 21:17:29 +05:30
Dhruv Goel
bc699f66cf [feature/postgresql-fulltext-search] fix formatting 
adds proper spaces after control keywords and comment symbol

PHPBB3-9730
 2012-07-05 21:17:26 +05:30
Dhruv Goel
dfbd32ce24 [feature/postgresql-fulltext-search] add docblocks to functions 
Docblocks are added to the functions of this search backend.

PHPBB3-9730
 2012-07-05 21:17:25 +05:30
Dhruv Goel
19d76f76dc [feature/postgresql-fulltext-search] remove phrase search code 
Unused Code for phrase search removed as pgsql doesnt support it. An added
message is displayed if user tries to perform exact phrase search.

PHPBB3-9730
 2012-07-05 21:17:23 +05:30
Dhruv Goel
f2dfaa73ff [feature/postgresql-fulltext-search] define access control specifiers 
PHPBB3-9730
 2012-07-05 21:17:22 +05:30
Dhruv Goel
ebc4c20199 [feature/postgresql-fulltext-search] use version_compare 
version_compare is used for version comparision and pgsql version is now
a global variable that is displayed in the acp too.

PHPBB3-9730
 2012-07-05 21:17:20 +05:30
Dhruv Goel
8ba510a99d [feature/postgresql-fulltext-search] fix language key 
Language key name not incompatible_database instead of version which
was misleading

PHPBB3-9730
 2012-07-05 21:17:19 +05:30
Dhruv Goel
ee8647d9fc [feature/postgresql-fulltext-search] remove Readme 
PHPBB3-9730
 2012-07-05 21:17:17 +05:30
Dhruv Goel
8e035f9141 [feature/postgresql-fulltext-search] removes pcre check 
PCRE UTF8 support is already checked globally. adds an option of
pgsql version to acp.

PHPBB3-9730
 2012-07-05 21:17:16 +05:30
Dhruv Goel
2821dc3325 [feature/postgresql-fulltext-search] fix language tsearch2 to text search 
Language is changed according to the current PostgreSQL documentation.

PHPBB3-9730
 2012-07-05 21:17:14 +05:30
Dhruv Goel
84054afc9d [feature/postgresql-fulltext-search] remove mbstring support 
Remove the usage of mbstring regex engine when PCRE does not support UTF8
since its a requirement for phpbb 3.1

PHPBB3-9730
 2012-07-05 21:13:40 +05:30
Dhruv Goel
8981399ae1 [feature/postgresql-fulltext-search] change language for pgsql < 8.3 
PHPBB3-9730
 2012-07-05 21:13:38 +05:30
Dhruv Goel
8c170eb6a0 [feature/postgresql-fulltext-search] use phpbb_pcre_utf8_support() 
Use phpBB's built in function for checking PCRE lib support.

PHPBB3-9730
 2012-07-05 21:13:36 +05:30
Dhruv Goel
6958e8b6d9 [feature/postgresql-fulltext-search] fix variable name 
Variable name used is now tsearch_usable instead of tsearch_builtin
to reflect its actual purpose.

PHPBB3-9730
 2012-07-05 21:13:35 +05:30
Oleg Pudeyev
d9fd8da37e [feature/postgresql-fulltext-search] Fix version comparison for 9.0+. 
PHPBB3-9730
 2012-07-05 21:13:33 +05:30
Dhruv Goel
26bfeb0016 [feature/postgresql-fulltext-search] fixing license 
PHPBB3-9730
 2012-07-05 21:13:32 +05:30
Dhruv Goel
30508b406b [feature/postgresql-fulltext-search] assign empty stats 
Blank array is assigned to stats incase pgsql fulltext
search backend is not compatible

PHPBB3-9730
 2012-07-05 21:11:28 +05:30
Dhruv Goel
d1a49e01ce [feature/postgresql-fulltext-search] remove backward compatibility 
removes backward compatibility before PostgreSQL ver 8.3
if version is before 8.3 displays error.

PHPBB3-9730
 2012-07-05 21:11:26 +05:30
Dhruv Goel
f83da6c0ef [feature/postgresql-fulltext-search] minor changes 
Changes to comply with other backend conventions. include $user as global
variable to access it inside init();

PHPBB3-9730
 2012-07-05 21:11:23 +05:30
Dhruv Goel
8a659964e4 [feature/postgresql-fulltext-search] database changes in database_update 
config entries are now added by database_update.php as well.
PostgreSQL will work during update too.

PHPBB3-9730
 2012-07-05 21:11:22 +05:30
Dhruv Goel
9f4219b1c7 [feature/postgresql-fulltext-search] minor changes 
Some changes in code to get it work against current develop.
PosgreSQL Fulltext search works for new install now.

PHPBB3-9730
 2012-07-05 21:11:20 +05:30
Oleg Pudeyev
98bc7fa6ce [feature/postgresql-fulltext-search] Fixed braces 
Fixes braces in fulltext_postgres.php to comply with phpbb conventions.

PHPBB3-9730
 2012-07-05 21:10:50 +05:30
Oleg Pudeyev
b1378f20af [feature/postgresql-fulltext-search] Remove closing php tag 
PHPBB3-9730
 2012-07-05 21:09:54 +05:30
Oleg Pudeyev
d9fd0cce0a Merge PR #759 branch 'nickvergessen/ticket/10811' into develop 
* nickvergessen/ticket/10811:
  [ticket/10811] Make toogle_subscribe more generic so it can toogle all links
  [ticket/10811] Make it easier for MODs/Extensions to define the alt-text
  [ticket/10811] Make subscribe/unsubscribe repeatable with AJAX
  [ticket/10811] Fix AJAX callback alt_text so it can be repeated.
 2012-07-05 10:44:48 -04:00
Andreas Fischer
c54d74ec0e Merge remote-tracking branch 'Fyorl/ticket/10963' into develop 
* Fyorl/ticket/10963:
  [ticket/10963] filespec::get_mimetype now used
  [ticket/10963] Removed superfluous ternary statement and strpos now stricter
  [ticket/10963] Modified filespec::is_image() to check actual mimetype
 2012-07-05 02:00:31 +02:00
Joas Schilling
f1056a9b2f [ticket/10811] Make toogle_subscribe more generic so it can toogle all links 
PHPBB3-10811
 2012-07-05 01:03:19 +02:00
Fyorl
4fbcf4eaad [ticket/10963] filespec::get_mimetype now used 
filespec::get_mimetype now uses the finfo class in order to detect the
mimetype of a given filename. filespec::is_image() now uses this method.

PHPBB3-10963
 2012-07-04 13:27:55 +01:00
Andreas Fischer
2c12f31cdf [ticket/10937] Update documentation to say which comment styles are removed. 
PHPBB3-10937
 2012-07-03 01:02:42 +02:00
Andreas Fischer
81d5327e44 [ticket/10937] Comment removal functions: Restore backward compatibility 
PHPBB3-10937
 2012-07-03 01:02:42 +02:00
Fyorl
f208b59c59 [ticket/10963] Removed superfluous ternary statement and strpos now stricter 
PHPBB3-10963
 2012-07-02 23:49:40 +01:00
Fyorl
03ddfbbaf1 [ticket/10963] Modified filespec::is_image() to check actual mimetype 
Modified filespec::is_image() to check the Fileinfo mimetype rather than
trusting the browser.

PHPBB3-10963
 2012-07-02 23:30:47 +01:00
Andreas Fischer
d998ad4b15 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10773] ACP logo with registered trademark symbol
 2012-07-01 00:20:04 +02:00
Andreas Fischer
3ecc43d48c Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10773] ACP logo with registered trademark symbol
 2012-07-01 00:19:52 +02:00
Andreas Fischer
e5364088c3 Merge remote-tracking branch 'Noxwizard/ticket/10773' into prep-release-3.0.11 
* Noxwizard/ticket/10773:
  [ticket/10773] ACP logo with registered trademark symbol
 2012-07-01 00:19:32 +02:00
Patrick Webster
625333ea2e [ticket/10773] ACP logo with registered trademark symbol 
PHPBB3-10773
 2012-06-30 12:21:37 -05:00