makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
13989 commits 18 branches 192 tags 207 MiB
Commit graph

13989 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nils Adermann
1e87e0dab8 Merge remote-tracking branch 'github-bantu/ticket/11009' into develop-olympus 
* github-bantu/ticket/11009:
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
 2012-07-21 00:35:03 +02:00
Andreas Fischer
be44f32008 [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing. 
PHPBB3-11009
 2012-07-21 00:24:09 +02:00
Nils Adermann
b3212bd7f9 Merge pull request #904 from igorw/ticket/11008 
[PHPBB3-11008] Get rid of eval in javascript
 2012-07-20 15:16:07 -07:00
Igor Wiedler
61f7f1b8ed [ticket/11008] Change onunload_functions to not use eval() 
PHPBB3-11008
 2012-07-21 00:12:45 +02:00
Igor Wiedler
ca43a8947a [ticket/11008] Remove eval() calls to get document[id] 
PHPBB3-11008
 2012-07-21 00:12:37 +02:00
Joas Schilling
3036db481a [ticket/10950] Fix grammar in comments 
PHPBB3-10950
 2012-07-20 18:03:06 +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
Joas Schilling
a9c091fad4 [ticket/10950] Fix unit tests to fit the new pm deleting behaviour 
Undelivered PMs should not be delivered to recipients that have not yet received them.

PHPBB3-10950
 2012-07-20 17:08:54 +02:00
Dhruv
a3d103c9c0 [feature/sphinx-fulltext-search] add support for postgres 
Don't generate sphinx config file if database is not supported. Add
property $dbtype to write into sphinx config file according to sql_layer.

PHPBB3-10946
 2012-07-19 23:01:50 +05:30
Dhruv
609ce3ae8f [feature/sphinx-fulltext-search] add pgsql functionality 
PHPBB3-10946
 2012-07-19 23:01:49 +05:30
Dhruv
81959927e5 [feature/sphinx-fulltext-search] use Update in sphinx query 
Instead of REPLACE use UPDATE since pgsql does not support REPLACE.
A row is inserted at time of creating table so REPLACE is no longer
needed.

PHPBB3-10946
 2012-07-19 23:01:49 +05:30
Dhruv
b81941a997 [feature/sphinx-fulltext-search] use CASE instead of IF 
IF is not supported in pgsql, use CASE instead supported in both mysql
and pgsql.

PHPBB3-10946
 2012-07-19 23:01:48 +05:30
Dhruv
118b57f71d [feature/sphinx-fulltext-search] minor changes in sphinx.conf 
PHPBB3-10946
 2012-07-19 23:01:47 +05:30
Dhruv
13c451ca2e [feature/sphinx-fulltext-search] use sql_table_exists 
Use sql_table_exists( ) method in db_tools to support all database types.

PHPBB3-10946
 2012-07-19 23:01:46 +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
78e7f2a529 [feature/sphinx-fulltext-search] improve sphinx helper classes 
add access modifiers and docblocks to properties and methods of
sphinx helper classes.

PHPBB3-10946
 2012-07-19 23:01:44 +05:30
Dhruv
b8103c5c31 [feature/sphinx-fulltext-search] fix comments and indentation 
PHPBB3-10946
 2012-07-19 23:01:43 +05:30
Dhruv
172c583f19 [feature/sphinx-fulltext-search] use new unique id instead of salt 
a new unique id is generated by sphinx and stored in the config table
instead of using avatar_salt.

PHPBB3-10946
 2012-07-19 23:01:42 +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
f0692bb9e8 [feature/sphinx-fulltext-search] modify config class 
Sphinx config class is modified to return the configuration data instead
of writing it to a file. Search backend property config_file_data stores
the generated data.

PHPBB3-10946
 2012-07-19 23:01:39 +05:30
Dhruv Goel
01261179ce [feature/sphinx-fulltext-search] improve formatting 
PHPBB3-10946
 2012-07-19 23:01:38 +05:30
Dhruv Goel
fdb7e64e29 [feature/sphinx-fulltext-search] fix comments 
PHPBB3-10946
 2012-07-19 23:01:37 +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
Dhruv Goel
45c0956bcf [feature/sphinx-fulltext-search] implementing db_tools 
Use db_tools class for creating/dropping sphinx table.

PHPBB3-10946
 2012-07-19 23:01:35 +05:30
Dhruv Goel
79432aa4a0 [feature/sphinx-fulltext-search] assign all globals to class properties 
PHPBB3-10946
 2012-07-19 23:01:34 +05:30
Dhruv Goel
9711da2763 [feature/sphinx-fulltext-search] adds default config values 
Default config values are added to config table in new install as well
as database_update.

PHPBB3-10946
 2012-07-19 23:01:28 +05:30
Nils Adermann
841ea0e494 Merge pull request #898 from bantu/ticket/10993 
[ticket/10993] Use composer.phar from our repository in README.md
 2012-07-19 09:24:58 -07:00
Nils Adermann
5095b6abd2 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html

Conflicts:
	phpBB/docs/README.html
 2012-07-19 17:57:16 +02:00
Nils Adermann
9d099eebab Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html
 2012-07-19 17:55:43 +02:00
Nils Adermann
a65b432165 Merge remote-tracking branch 'github-noxwizard/ticket/10441' into prep-release-3.0.11 
* github-noxwizard/ticket/10441:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html
 2012-07-19 17:55:22 +02:00
Nils Adermann
737828f009 Merge pull request #843 from nickvergessen/feature/new-tz-handling 
Feature/new tz handling
 2012-07-19 08:46:25 -07:00
Joas Schilling
7df1c84447 [feature/new-tz-handling] Don't use global user but make it a parameter 
PHPBB3-9558
 2012-07-19 17:41:27 +02:00
Andreas Fischer
c896cd06dd Merge remote-tracking branch 'Fyorl/ticket/10944' into develop 
* Fyorl/ticket/10944:
  [ticket/10944] strpos now stricter and removed superfluous ternary
  [ticket/10944] Reverted changes in PHPBB3-10963
 2012-07-19 17:16:37 +02:00
Andreas Fischer
415a8c6786 Merge remote-tracking branch 'Fyorl/ticket/10992' into develop 
* Fyorl/ticket/10992:
  [ticket/10992] Changed octetstream to octet-stream
  [ticket/10992] test_empty_file() now tries to upload the correct file
  [ticket/10992] Modified upload tests to work with new version
 2012-07-19 17:08:38 +02:00
Andreas Fischer
db7b879b82 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer

Conflicts:
	.travis.yml
	composer.phar
	phpBB/composer.json
	phpBB/composer.lock
	tests/bootstrap.php
 2012-07-19 16:59:45 +02:00
Andreas Fischer
3bbb882fe8 Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympus 
* Fyorl/ticket/10981:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer
 2012-07-19 16:40:33 +02:00
Andreas Fischer
8b230f59db Merge remote-tracking branch 'mvinny/ticket/10998' into develop 
* mvinny/ticket/10998:
  [ticket/10998] Add border-radius to forum rules block - prosilver
 2012-07-19 16:35:16 +02:00
Joas Schilling
5b7884907c [feature/new-tz-handling] Fix size of suggestion button in chrome 
PHPBB3-9558
 2012-07-19 16:13:16 +02:00
Joas Schilling
196e634370 [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid 
This should avoid problems, when the board files are updated but database isn't.

PHPBB3-9558
 2012-07-19 15:46:12 +02:00
Nils Adermann
b773da2c3e Merge pull request #877 from Drae/feature/pagination-as-list 
[feature/pagination-as-list] Render pagination within the template
 2012-07-19 06:26:30 -07:00
Joas Schilling
6de222065e [feature/new-tz-handling] Add previous selected value to validation if valid 
We also add the selected timezone if we can create an object with it.
DateTimeZone::listIdentifiers seems to not add all identifiers to the list,
because some are only kept for backward compatible reasons. If the user has
a deprecated value, we add it here, so it can still be kept. Once the user
changed his value, there is no way back to deprecated values.

PHPBB3-9558
 2012-07-19 14:36:20 +02:00
Joas Schilling
d099ef8cad [feature/new-tz-handling] Display suggestion when a different value is selected 
PHPBB3-9558
 2012-07-19 14:24:59 +02:00
Vinny
5a068867ee [ticket/10998] Add border-radius to forum rules block - prosilver 
PHPBB3-10998
 2012-07-18 21:42:23 -03:00
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
14a07b1193 [feature/new-tz-handling] Move update helper function to new class 
PHPBB3-9558
 2012-07-18 17:18:10 +02:00
Joas Schilling
f3bd113d06 [feature/new-tz-handling] Fix unit test 
PHPBB3-9558
 2012-07-18 17:16:34 +02:00
Joas Schilling
248a52be2a [feature/new-tz-handling] Delete old variable which is not used anymore 
PHPBB3-9558
 2012-07-18 16:55:14 +02:00
Joas Schilling
a71e60cdbd [feature/new-tz-handling] Rename $user->tz back to $user->timezone 
PHPBB3-9558
 2012-07-18 16:52:52 +02:00
Drae
584d49459d [feature/pagination-as-list] New parameter for name of start var 
Add a new parameter to hold the name of the start variable. This
fulfills ticket PHPBB3-8535.

PHPBB3-10968
 2012-07-18 14:32:42 +01:00