aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [feature/sphinx-fulltext-search] prefix sphinx with constant namesDhruv Goel2012-07-121-7/+7
| | | | | | | | | | | | | | | | | | All constant names are prefixed with SPHINX_ PHPBB3-10946
| * | [feature/sphinx-fulltext-search] remove autoconfDhruv Goel2012-07-121-385/+1
| | | | | | | | | | | | | | | | | | | | | Remove all code related to sphinx automatic configuration and all exec calls. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] add docblock and access modifiersDhruv Goel2012-07-121-15/+70
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10946 Conflicts: phpBB/includes/search/fulltext_sphinx.php
| * | [feature/sphinx-fulltext-search] add class properties indexes & sphinxDhruv Goel2012-07-121-0/+2
| | | | | | | | | | | | PHPBB3-10946
| * | [feature/sphinx-fulltext-search] use keywords_search instead of get_nameDhruv Goel2012-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | using keyword_search method instead of get_name to distinguish between the search backend classes present in includes/search and other helper classes. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] remove unused arraysDhruv Goel2012-07-121-8/+1
| | | | | | | | | | | | PHPBB3-10946
| * | [feature/sphinx-fulltext-search] add sphinx_table constant to constants.phpDhruv Goel2012-07-122-1/+1
| | | | | | | | | | | | PHPBB3-10946
| * | [feature/sphinx-fulltext-search] Make different files for different classesDhruv Goel2012-07-125-239/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Break the classes in functions-sphinx.php into different files with proper class names according to phpbb class auto loader conventions. PHPBB3-10946 Conflicts: phpBB/includes/search/sphinx/config.php
| * | [feature/sphinx-fulltext-search] add binlog_path to configDhruv Goel2012-07-122-0/+2
| | | | | | | | | | | | | | | | | | binlog files are now added to the data folder. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] use sql_build_query for queryDhruv Goel2012-07-121-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses sql_build_query for JOIN query. Remove casting to int and space for phpbb conventions to be followed PHPBB3-10946 Conflicts: phpBB/includes/search/fulltext_sphinx.php
| * | [feature/sphinx-fulltext-search] remove all reference returnsDhruv Goel2012-07-122-9/+9
| | | | | | | | | | | | PHPBB3-10946
| * | [feature/sphinx-fulltext-search] integrate sphinx language keys with coreDhruv Goel2012-07-123-71/+30
| | | | | | | | | | | | | | | | | | | | | Language keys removed from mods folder and added to language/en/acp/search.php PHPBB3-10946
| * | [feature/sphinx-fulltext-search] improve classes in functions-sphinx.phpDhruv Goel2012-07-121-21/+17
| | | | | | | | | | | | PHPBB3-10946
| * | [feature/sphinx-fulltext-search] fix config variablesDhruv Goel2012-07-121-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config variables now use class property for unique id PHPBB3-10946 Conflicts: phpBB/includes/search/fulltext_sphinx.php
| * | [feature/sphinx-fulltext-search] temporary commit to pull out sphinx-apiDhruv Goel2012-07-121-1202/+0
| | | | | | | | | | | | | | | | | | also need to add the latest sphinx api instead of this. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] include sample sphinx.conf in docsDhruv Goel2012-07-121-0/+96
| | | | | | | | | | | | PHPBB3-10946
| * | [feature/sphinx-fulltext-search] minor fixes in formattingDhruv Goel2012-07-124-9/+5
| | | | | | | | | | | | | | | | | | | | | Add a newline at the end of files. Update License information in package docbloc. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] update config fileDhruv Goel2012-07-121-2/+3
| | | | | | | | | | | | | | | | | | Sphinx config file updated according to new documentation. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] minor changesDhruv Goel2012-07-121-14/+18
| | | | | | | | | | | | | | | | | | | | | some minor code changes to make it working against current develop and comply with other search backend coding convetions. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] MOD by naderman installed in phpbbDhruv Goel2012-07-124-0/+2940
| | | | | | | | | | | | PHPBB3-10946
* | | [ticket/11025] Add underline for hover to classesMatt Friedman2012-07-232-0/+8
| | | | | | | | | | | | PHPBB3-11025
* | | [ticket/11025] Replace <b> with <strong> and/or class for semantic styling ↵Matt Friedman2012-07-232-1/+6
| | | | | | | | | | | | | | | | | | in subsilver2 PHPBB3-11025
* | | [ticket/11025] Replace <b> with <strong> and/or class for semantic stylingMatt Friedman2012-07-233-2/+7
| | | | | | | | | | | | PHPBB3-11025
* | | [ticket/11025] Make last topic titles in forum list BoldMatt Friedman2012-07-232-2/+2
| | | | | | | | | | | | | | | | | | | | | This small style tweak will make the truncated last topic titles shown in the forum list BOLD for better visual impact. PHPBB3-11025
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-232-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. Conflicts: phpBB/install/database_update.php
| * \ \ Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-232-0/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | | [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.Andreas Fischer2012-07-231-0/+9
| | | | |
| | * | | [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.Andreas Fischer2012-07-233-3/+7
| | | | |
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-2/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10965] Profile data is only grabbed when show_novalue is enabled
| * | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-2/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Profile data is only grabbed when show_novalue is enabled
| | * | | [ticket/10965] Profile data is only grabbed when show_novalue is enabledNils Adermann2012-07-231-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10965
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
| * | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-0/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
| | * | | [ticket/10965] Make sure all profile fields are always grabbed on viewtopicNils Adermann2012-07-231-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10965
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-2313-13/+46
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-2313-13/+46
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [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
| | * | | [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1Nils Adermann2012-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10965
| | * | | [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-2313-13/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #914 from EXreaction/ticket/10990Nils Adermann2012-07-2218-30/+31
|\ \ \ \ \ | | | | | | | | | | | | Ticket/10990
| * | | | | [ticket/10990] Changes for developNathan Guse2012-07-227-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10990
| * | | | | [ticket/10990] Do not use comma separator when storing it as a log.Nathan Guse2012-07-226-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10990
| * | | | | [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriateNathan2012-07-2222-61/+62
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-10990
* | | | | Merge remote-tracking branch 'github-igorw/ticket/11012' into developNils Adermann2012-07-216-29/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/ticket/11012: [ticket/11012] Fix php_ext change in mock_extension_manager [ticket/11012] Normalize $phpEx member vars to $php_ext
| * | | | | [ticket/11012] Normalize $phpEx member vars to $php_extIgor Wiedler2012-07-216-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11012
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into developNils Adermann2012-07-212-40/+69
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/11002: [ticket/11002] Use translating option to rename the Etc/GMT options
| * | | | | [ticket/11002] Use translating option to rename the Etc/GMT optionsJoas Schilling2012-07-212-40/+69
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-07-212-84/+123
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-212-84/+123
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [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.
| | * | | Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into ↵Nils Adermann2012-07-212-84/+123
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.11 * github-nickvergessen/ticket/10950: [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.
| | | * | | [ticket/10950] Fix grammar in commentsJoas Schilling2012-07-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10950