aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/pagination-as-list] Updates for nils commentsDrae2012-07-1825-193/+57
| | | | | | | Re-remove deprecated functions, change on_page to phpbb_on_page, add null returns, remove globals and pass as params. PHPBB3-10968
* [feature/pagination-as-list] Rename and deprecate functionsDrae2012-07-1825-29/+72
| | | | | | | Returned and marked deprecated topic_generate_pagination. Rename new function in line with coding guidelines. PHPBB3-10968
* [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 branch 'develop-olympus' into developAndreas Fischer2012-07-181-2/+2
|\ | | | | | | | | * develop-olympus: [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
| * Merge remote-tracking branch 'Noxwizard/ticket/10996' into develop-olympusAndreas Fischer2012-07-181-2/+2
| |\ | | | | | | | | | | | | * Noxwizard/ticket/10996: [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
| | * [ticket/10996] Use correct DBMS name in Travis config for PostgreSQLPatrick Webster2012-07-181-2/+2
| |/ | | | | | | PHPBB3-10996
* | Merge branch 'develop-olympus' into developNils Adermann2012-07-175-6/+201
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10678] Typo and formatting [ticket/10678] Add port handling for MSSQL tests [ticket/10678] Move config changes to new location [ticket/10678] Rename helper class file [ticket/10678] Lowercase class name, adjust comment width [ticket/10678] More formatting and docblocks [ticket/10678] More formatting requests [ticket/10678] Fix formatting [ticket/10678] Add better support for Firebird, Oracle, and MSSQL
| * Merge remote-tracking branch 'github-noxwizard/ticket/10678' into ↵Nils Adermann2012-07-175-6/+201
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-noxwizard/ticket/10678: [ticket/10678] Typo and formatting [ticket/10678] Add port handling for MSSQL tests [ticket/10678] Move config changes to new location [ticket/10678] Rename helper class file [ticket/10678] Lowercase class name, adjust comment width [ticket/10678] More formatting and docblocks [ticket/10678] More formatting requests [ticket/10678] Fix formatting [ticket/10678] Add better support for Firebird, Oracle, and MSSQL Conflicts: tests/RUNNING_TESTS.txt
| | * [ticket/10678] Typo and formattingPatrick Webster2012-05-132-6/+6
| | | | | | | | | | | | PHPBB3-10678
| | * [ticket/10678] Add port handling for MSSQL testsPatrick Webster2012-05-081-0/+7
| | | | | | | | | | | | PHPBB3-10678
| | * [ticket/10678] Move config changes to new locationPatrick Webster2012-05-081-1/+3
| | | | | | | | | | | | PHPBB3-10678
| | * [ticket/10678] Rename helper class filePatrick Webster2012-05-082-1/+1
| | | | | | | | | | | | PHPBB3-10678
| | * [ticket/10678] Lowercase class name, adjust comment widthPatrick Webster2012-05-083-14/+18
| | | | | | | | | | | | PHPBB3-10678
| | * [ticket/10678] More formatting and docblocksPatrick Webster2012-05-082-4/+12
| | | | | | | | | | | | PHPBB3-10678
| | * [ticket/10678] More formatting requestsPatrick Webster2012-05-082-8/+5
| | | | | | | | | | | | PHPBB3-10678
| | * [ticket/10678] Fix formattingPatrick Webster2012-05-083-7/+15
| | | | | | | | | | | | PHPBB3-10678
| | * [ticket/10678] Add better support for Firebird, Oracle, and MSSQLPatrick Webster2012-05-084-5/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow ODBC connections for Firebird Capitalize fixture tables and columns for Firebird On database drop failure, drop all tables Provide cleanup utilities for databases that cannot be dropped PHPBB3-10678
* | | 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
| * | | Merge remote-tracking branch 'bantu/ticket/10995' into develop-olympusAndreas Fischer2012-07-171-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10995: [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-179-1/+205
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Avoid possible conflicts with magic words in unit testsJoas Schilling2012-07-161-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | | [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] Fix up unit tests for sql_case()Joas Schilling2012-07-021-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | | [ticket/10942] Require same data type and do not cast expressions automaticallyJoas Schilling2012-07-026-65/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | | [ticket/10942] Make unit tests for sql_case simplerJoas Schilling2012-06-301-31/+19
| | | | | | | | | | | | | | | | | | | | | | | | 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-207-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | 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] Fix function name on order_lower_test.phpJoas Schilling2012-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | | [ticket/10942] Add unit tests for sql_concatenateJoas Schilling2012-06-201-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | | [ticket/10942] Add sql_concatenate to dbalJoas Schilling2012-06-207-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10942
| * | | | | [ticket/10942] Add unit tests for sql_conditionalJoas Schilling2012-06-201-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | 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