mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
13,825 Commits 17 Branches 190 Tags
Commit Graph

13825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Drae
27d8aef528 [feature/pagination-as-list] Updates for nils comments 
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.

PHPBB3-10968
 2012-07-18 14:32:18 +01:00
Drae
cf4d6e926d [feature/pagination-as-list] Rename and deprecate functions 
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.

PHPBB3-10968
 2012-07-18 14:31:50 +01:00
Drae
dc71c0629e [feature/pagination-as-list] Various fixes and improvements 
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
 2012-07-18 14:31:21 +01:00
Drae
922147f05a [ticket/10968] Render pagination within the template 
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
 2012-07-18 14:30:20 +01:00
Joas Schilling
515e1662a9 [feature/new-tz-handling] Remove "timezone might be numeric" 
As we updated all of the used values, there really shouldn't be one anymore.

PHPBB3-9558
 2012-07-18 15:01:29 +02:00
Joas Schilling
8078a04f3a [feature/new-tz-handling] Add function to update the timezone 
PHPBB3-9558
 2012-07-18 15:01:29 +02:00
Joas Schilling
7ce66deca8 [feature/new-tz-handling] Correctly update user and board timezones on update 
PHPBB3-9558
 2012-07-18 15:01:09 +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
Andreas Fischer
b176b86f11 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
 2012-07-18 09:46:32 +02:00
Andreas Fischer
eeef82ecc5 Merge remote-tracking branch 'Noxwizard/ticket/10996' into develop-olympus 
* Noxwizard/ticket/10996:
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
 2012-07-18 09:46:14 +02:00
Patrick Webster
d157c3b3f4 [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL 
PHPBB3-10996
 2012-07-18 01:22:24 -05:00
Fyorl
aa2f7bcc2c [ticket/10981] Added check for PHP version before running composer 
PHPBB3-10981
 2012-07-17 21:39:49 +01:00
Fyorl
74074994ba [ticket/10981] Modified travis to use composer with --dev 
PHPBB3-10981
 2012-07-17 21:39:49 +01:00
Fyorl
7a412f846a [ticket/10981] Removed setupBeforeClass 
PHPBB3-10981
 2012-07-17 21:39:48 +01:00