aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/pagination-as-list] Various fixes and improvementsDrae2012-07-1853-569/+303
| | | | | | | | | | 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
* [ticket/10968] Render pagination within the templateDrae2012-07-1863-268/+1039
| | | | | | | | | | | | | | 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
* Merge remote-tracking branch 'github-bantu/ticket/10969' into developNils Adermann2012-07-172-46/+3
|\ | | | | | | | | | | * github-bantu/ticket/10969: [ticket/10969] Also remove COMMENTS key from data array in get_available_dbms() [ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).
| * [ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()Andreas Fischer2012-07-081-9/+0
| | | | | | | | PHPBB3-10969
| * [ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).Andreas Fischer2012-07-082-37/+3
| | | | | | | | | | | | Merge their bodies into phpbb_remove_comments($input). PHPBB3-10969
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-171-1/+1
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
| * | [ticket/10995] Return false in mssqlnative sql_fetchrow on empty resultPatrick Webster2012-07-171-1/+1
| | | | | | | | | | | | PHPBB3-10995
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-171-3/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10789] Remove unnecessary variables from PM print - prosilver
| * | Merge remote-tracking branch 'mvinny/ticket/10789' into develop-olympusAndreas Fischer2012-07-171-3/+2
| |\ \ | | | | | | | | | | | | | | | | * mvinny/ticket/10789: [ticket/10789] Remove unnecessary variables from PM print - prosilver
| | * | [ticket/10789] Remove unnecessary variables from PM print - prosilverVinny2012-05-221-3/+2
| | | | | | | | | | | | | | | | PHPBB3-10789
* | | | Merge remote-tracking branch 'github-exreaction/ticket/7598' into developNils Adermann2012-07-171-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * github-exreaction/ticket/7598: [ticket/7598] Use $user->lang['COMMA_SEPARATOR'] [ticket/7598] Inactive users action notification (ACP)
| * | | | [ticket/7598] Use $user->lang['COMMA_SEPARATOR']Nathan2012-07-141-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-7598
| * | | | [ticket/7598] Inactive users action notification (ACP)Nathan2012-07-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed PHPBB3-7598
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10942' into developAndreas Fischer2012-07-176-0/+71
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10942: [ticket/10942] Avoid possible conflicts with magic words in unit tests [ticket/10942] Add access modifiers [ticket/10942] Use ANSI SQL standard || in dbal.php [ticket/10942] Fix up unit tests for sql_case() [ticket/10942] Require same data type and do not cast expressions automatically [ticket/10942] Make unit tests for sql_case simpler [ticket/10942] Add a comment why we cast to sql_case() [ticket/10942] Rename method sql_conditional() to sql_case() [ticket/10942] Change term string to expression to avoid confusion [ticket/10942] Fix sql_conditional for mssql, postgre and oracle [ticket/10942] Fix function name on order_lower_test.php [ticket/10942] Add unit tests for sql_concatenate [ticket/10942] Add sql_concatenate to dbal [ticket/10942] Add unit tests for sql_conditional [ticket/10942] Add sql_conditional to dbal
| * | | | [ticket/10942] Add access modifiersJoas Schilling2012-07-046-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | [ticket/10942] Use ANSI SQL standard || in dbal.phpJoas Schilling2012-07-026-25/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | [ticket/10942] Require same data type and do not cast expressions automaticallyJoas Schilling2012-07-026-65/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | [ticket/10942] Add a comment why we cast to sql_case()Joas Schilling2012-06-205-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | [ticket/10942] Rename method sql_conditional() to sql_case()Joas Schilling2012-06-206-39/+39
| | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | [ticket/10942] Change term string to expression to avoid confusionJoas Schilling2012-06-207-17/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | [ticket/10942] Fix sql_conditional for mssql, postgre and oracleJoas Schilling2012-06-205-0/+60
| | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | [ticket/10942] Add sql_concatenate to dbalJoas Schilling2012-06-207-0/+60
| | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | [ticket/10942] Add sql_conditional to dbalJoas Schilling2012-06-201-0/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-10942
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-121-1/+1
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | * develop-olympus: [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
| * | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-121-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
| | * \ \ Merge remote-tracking branch 'Noxwizard/ticket/10978' into prep-release-3.0.11Andreas Fischer2012-07-121-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10978: [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
| | | * | | [ticket/10978] Fix typo in prosilver ucp_groups_membership.htmlPatrick Webster2012-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10978
* | | | | | Merge PR #854 branch 'dhruvgoel92/ticket/10943' into developOleg Pudeyev2012-07-073-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10943: [ticket/10943] displays searched query in search result [ticket/10943] use keywords variable to display in search box
| * | | | | | [ticket/10943] displays searched query in search resultDhruv Goel2012-07-083-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search backend displays an additional normalized search query just above the ignored words. PHPBB3-10943
| * | | | | | [ticket/10943] use keywords variable to display in search boxDhruv Goel2012-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $keywords which contains the string as entered by the user should be used to display in search box instead of search_query. PHPBB3-10943
* | | | | | | Merge PR #856 branch 'develop-olympus' into developOleg Pudeyev2012-07-073-7/+54
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10937] Update documentation to say which comment styles are removed. [ticket/10937] Comment removal functions: Restore backward compatibility
| * | | | | | Merge PR #856 branch 'prep-release-3.0.11' into develop-olympusOleg Pudeyev2012-07-073-7/+54
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10937] Update documentation to say which comment styles are removed. [ticket/10937] Comment removal functions: Restore backward compatibility
| | * | | | | Merge PR #856 branch 'bantu/ticket/10937' into prep-release-3.0.11Oleg Pudeyev2012-07-073-7/+54
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10937: [ticket/10937] Update documentation to say which comment styles are removed. [ticket/10937] Comment removal functions: Restore backward compatibility
| | | * | | | | [ticket/10937] Update documentation to say which comment styles are removed.Andreas Fischer2012-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10937
| | | * | | | | [ticket/10937] Comment removal functions: Restore backward compatibilityAndreas Fischer2012-07-033-7/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10937
* | | | | | | | Merge PR #832 branch 'dhruvgoel92/feature/postgresql-fulltext-search' into ↵Oleg Pudeyev2012-07-077-0/+898
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | | | | [feature/postgresql-fulltext-search] supports_phrase_search functionDhruv Goel2012-07-082-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function to return the value of the the private property phrase_search PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] use proper variable nameDhruv Goel2012-07-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] each config is checked if it is setDhruv Goel2012-07-051-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | [feature/postgresql-fulltext-search] fix formattingDhruv Goel2012-07-052-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds proper spaces after control keywords and comment symbol PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] add docblocks to functionsDhruv Goel2012-07-051-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docblocks are added to the functions of this search backend. PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] remove phrase search codeDhruv Goel2012-07-054-33/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | [feature/postgresql-fulltext-search] define access control specifiersDhruv Goel2012-07-051-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] use version_compareDhruv Goel2012-07-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version_compare is used for version comparision and pgsql version is now a global variable that is displayed in the acp too. PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] fix language keyDhruv Goel2012-07-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Language key name not incompatible_database instead of version which was misleading PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] removes pcre checkDhruv Goel2012-07-052-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PCRE UTF8 support is already checked globally. adds an option of pgsql version to acp. PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] fix language tsearch2 to text searchDhruv Goel2012-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Language is changed according to the current PostgreSQL documentation. PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] remove mbstring supportDhruv Goel2012-07-052-83/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the usage of mbstring regex engine when PCRE does not support UTF8 since its a requirement for phpbb 3.1 PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] change language for pgsql < 8.3Dhruv Goel2012-07-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9730
| * | | | | | | | [feature/postgresql-fulltext-search] use phpbb_pcre_utf8_support()Dhruv Goel2012-07-051-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use phpBB's built in function for checking PCRE lib support. PHPBB3-9730