1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

1597 Commits

Author SHA1 Message Date
Fyorl
5bffd9883d [feature/attach-dl] Added links to the templates
PHPBB3-11042
2012-08-02 20:47:09 +01:00
Senky
d0a1c7bf0a [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
PHPBB3-10568
2012-08-02 20:08:49 +02:00
Dhruv
6fbbb30a81 [ticket/11032] add sphinx errors to error log
PHPBB3-11032
2012-08-01 22:18:12 +05:30
Oleg Pudeyev
7fd1a166da Merge PR #865 branch 'dhruvgoel92/feature/sphinx-fulltext-search' into develop
* dhruvgoel92/feature/sphinx-fulltext-search: (57 commits)
  [feature/sphinx-fulltext-search] add sphinx to Authors file
  [feature/sphinx-fulltext-search] add sphinxapi.php file
  [feature/sphinx-fulltext-search] fix auth bug
  [feature/sphinx-fulltext-search] remove unused property
  [feature/sphinx-fulltext-search] use 9312 as default port
  [feature/sphinx-fulltext-search] fix language of host config
  [feature/sphinx-fulltext-search] fix sphinx for arbitary host
  [feature/sphinx-fulltext-search] coding changes acc to phbb conventions
  [feature/sphinx-fulltext-search] fixing comments
  [feature/sphinx-fulltext-search] add trailing slash in language
  [feature/sphinx-fulltext-search] improve port option
  [feature/sphinx-fulltext-search] remove stopwords and config path
  [feature/sphinx-fulltext-search] makes sql host configurable
  [feature/sphinx-fulltext-search] use readonly instead of disabled
  [feature/sphinx-fulltext-search] fix language keys' typo
  [feature/sphinx-fulltext-search] remove note from db_tools
  [feature/sphinx-fulltext-search] add support for postgres
  [feature/sphinx-fulltext-search] add pgsql functionality
  [feature/sphinx-fulltext-search] use Update in sphinx query
  [feature/sphinx-fulltext-search] use CASE instead of IF
  ...
2012-07-27 22:27:26 -04:00
Dhruv
6547989225 [feature/sphinx-fulltext-search] use 9312 as default port
Uses 9312 instead of 3312 as default port for searchd to listen on
according to latest sphinx documentation. Use filename sphinxapi.php
instead of old one.

PHPBB3-10946
2012-07-27 11:10:04 +05:30
Dhruv
3f4afedad3 [feature/sphinx-fulltext-search] fix language of host config
PHPBB3-10946
2012-07-27 02:40:05 +05:30
Dhruv
9f2faaa8f1 [feature/sphinx-fulltext-search] add trailing slash in language
PHPBB3-10946
2012-07-26 14:29:12 +05:30
Andreas Fischer
9480a5e512 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value

Conflicts:
	phpBB/includes/acp/acp_profile.php
2012-07-23 15:50:54 +02:00
Nils Adermann
10172887fd [ticket/10965] Introduce a new profile field option to display no value
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
2012-07-23 15:45:57 +02:00
Nathan Guse
a5dd64195a [ticket/11021] Add the option to specify a Site home URL and text
PHPBB3-11021
2012-07-22 22:26:38 -05:00
Nils Adermann
147a125f69 Merge pull request #914 from EXreaction/ticket/10990
Ticket/10990
2012-07-22 16:25:17 -07:00
Nathan
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
PHPBB3-10990
2012-07-22 14:32:03 -05:00
Dhruv
39bac86f7d [feature/sphinx-fulltext-search] improve port option
Use listen instead of deprecated port value in sphinx config file.
sqlhost uses default $dbhost.

PHPBB3-10946
2012-07-22 04:24:34 +05:30
Dhruv
e40758db84 [feature/sphinx-fulltext-search] remove stopwords and config path
Remove stopwords and config_path options from ACP.

PHPBB3-10946
2012-07-22 03:16:03 +05:30
Dhruv
161e469b5a [feature/sphinx-fulltext-search] makes sql host configurable
The SQL server host which sphinx connects to index the posts is now
configurable via ACP.

PHPBB3-10946
2012-07-22 02:50:53 +05:30
Dhruv
1f77b95fe7 [feature/sphinx-fulltext-search] fix language keys' typo
PHPBB3-10946
2012-07-22 01:49:30 +05:30
Nils Adermann
61f05e027d Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into develop
* github-nickvergessen/ticket/11002:
  [ticket/11002] Use translating option to rename the Etc/GMT options
2012-07-21 16:35:24 +02:00
Nils Adermann
f7f78adeb9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 16:15:42 +02:00
Joas Schilling
656d2c34e0 [ticket/11002] Use translating option to rename the Etc/GMT options
They have the invers offset of their name. So GMT+2 has the offset -7200.
To avoid additional confusion, we simply overwrite their name.

PHPBB3-11002
2012-07-21 15:18:16 +02:00
Joas Schilling
a3517232f9 [ticket/10950] Delete PMs for users that have not yet read the pm
PHPBB3-10950
2012-07-20 17:11:20 +02:00
Dhruv
609ce3ae8f [feature/sphinx-fulltext-search] add pgsql functionality
PHPBB3-10946
2012-07-19 23:01:49 +05:30
Dhruv
f40da411c3 [feature/sphinx-fulltext-search] modify language keys
Modify language keys according to what the config setting actually does.
Remove references to autoconf.

PHPBB3-10946
2012-07-19 23:01:45 +05:30
Dhruv
4b40f0d3c6 [feature/sphinx-fulltext-search] display config file in ACP
sphinx config file is generated and displayed in the ACP for user to use
it to start sphinx search daemon.

PHPBB3-10946
2012-07-19 23:01:41 +05:30
Dhruv Goel
b16e70ae1d [feature/sphinx-fulltext-search] remove bin_path
fulltext_sphinx_bin_path from ACP as it is no longer required.

PHPBB3-10946
2012-07-19 23:01:40 +05:30
Dhruv Goel
537a16220e [feature/sphinx-fulltext-search] remove recent search queries
remove recent search queries from the stats as they can't be retreived
and remove other language keys being used no more.

PHPBB3-10946
2012-07-19 23:01:36 +05:30
Joas Schilling
81627e2888 [feature/new-tz-handling] Remove additional marking of selected items
PHPBB3-9558
2012-07-18 18:59:25 +02:00
Joas Schilling
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
Dhruv Goel
f609555b1a [feature/sphinx-fulltext-search] integrate sphinx language keys with core
Language keys removed from mods folder and added to
language/en/acp/search.php

PHPBB3-10946
2012-07-12 17:31:49 +05:30
Dhruv Goel
8d76bc45ee [feature/sphinx-fulltext-search] minor fixes in formatting
Add a newline at the end of files. Update License information in package
docbloc.

PHPBB3-10946
2012-07-12 17:27:25 +05:30
Dhruv Goel
a50b0faf4a [feature/sphinx-fulltext-search] MOD by naderman installed in phpbb
PHPBB3-10946
2012-07-12 17:27:22 +05:30
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
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
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
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
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
Andreas Fischer
85ea062a05 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10935] Limit number of PM rules per user to 5000
2012-06-21 10:31:08 +02:00
Joas Schilling
80fafdeb1a [ticket/10935] Limit number of PM rules per user to 5000
PHPBB3-10935
2012-06-20 14:29:48 +02:00
Oleg Pudeyev
820ad818dd Merge PR #844 branch 'dhruvgoel92/ticket/10936' into develop
* dhruvgoel92/ticket/10936:
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
2012-06-19 19:51:39 -04:00
Joas Schilling
5f96e5d374 [feature/new-tz-handling] Fix timezone option when editing a user in the ACP
PHPBB3-9558
2012-06-18 15:09:45 +02:00
Joas Schilling
66f7d45603 [feature/new-tz-handling] Introduce 2 step timezone selection using javascript
PHPBB3-9558
2012-06-18 15:08:57 +02:00
Joas Schilling
00b5e5345d [feature/new-tz-handling] Fix displaying of "All times are" string
PHPBB3-9558
2012-06-18 15:07:44 +02:00
Joas Schilling
50936cb2ef [feature/new-tz-handling] Fix selecting and validating of timezone in UCP
PHPBB3-9558
2012-06-18 15:07:12 +02:00
Dhruv Goel
96cb75dedb [ticket/10936] remove PCRE and mbstring support check
Since PCRE UTF8 support already has a global check no need for mbstring
or PCRE check here.

PHPBB3-10936
2012-06-13 01:43:32 +05:30
Dhruv Goel
e127ba17ea [ticket/10936] fix language key
Language key changes from INCOMPATIBLE_VERSION to INCOMPATIBLE_DATABASE to
make it more meaningfull.

PHPBB3-10936
2012-06-12 18:40:48 +05:30
Nils Adermann
5acbf0980d Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' into develop
* github-dhruvgoel92/feature/delete-auto-logins:
  [feature-delete-auto-logins] adds module to database update
  [feature/delete-auto-logins] fixes style
  [feature/delete-auto-logins] improves styling
  [feature/delete-auto-logins] fixes language entry
  [feature/delete-auto-logins] fix language keys and styling
  [feature/delete-auto-logins] explain persistent keys in the ucp.
  [feature/delete-auto-logins] template added for subsilver2
  [feature/delete-auto-logins] improved styling and fixes language
  [feature/delete-auto-logins] using loop for errors
  [feature/delete-auto-logins] fixes css corners
  [feature/delete-auto-logins] Fixes language entries
  [feature/delete-auto-logins] checks form key
  [feature/delete-auto-logins] Fixes language entries and redirection.
  [feature/delete-auto-logins] User can view/delete auto logins.
2012-06-11 23:39:09 +02:00
wagnerch
0191e1313c [feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 1.
PHPBB3-9730
2012-06-08 21:28:23 +05:30