aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-191-30/+37
|\ | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10441] Make CDB linking more consistent [ticket/10441] Typo [ticket/10441] Update to docs/README.html
| * Merge remote-tracking branch 'github-noxwizard/ticket/10441' into ↵Nils Adermann2012-07-191-30/+37
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * [ticket/10441] Make CDB linking more consistentPatrick Webster2012-07-021-5/+5
| | | | | | | | | | | | PHPBB3-10441
| | * [ticket/10441] TypoPatrick Webster2012-06-291-1/+1
| | | | | | | | | | | | PHPBB3-10441
| | * [ticket/10441] Update to docs/README.htmlOyabun12012-06-291-28/+35
| | | | | | | | | | | | | | | | | | | | | | | | Updated information about styles, languages, and MODs Added a section about the Knowledge Base. Various phrase changes. PHPBB3-10441
* | | Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympusAndreas Fischer2012-07-197-13/+85
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | [ticket/10981] Added check for PHP version before running composerFyorl2012-07-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10981
| * | | [ticket/10981] Modified travis to use composer with --devFyorl2012-07-171-0/+3
| | | | | | | | | | | | | | | | PHPBB3-10981
| * | | [ticket/10981] Removed setupBeforeClassFyorl2012-07-171-8/+0
| | | | | | | | | | | | | | | | PHPBB3-10981
| * | | [ticket/10981] Modified functional framework to account for goutte changesFyorl2012-07-161-3/+6
| | | | | | | | | | | | | | | | PHPBB3-10981
| * | | [ticket/10981] Added goutte via composerFyorl2012-07-166-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | composer.phar added and autoloaded before tests PHPBB3-10981
* | | | 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 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 '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 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 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 remote-tracking branch 'github-bantu/ticket/10974' into develop-olympusNils Adermann2012-07-083-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10974: [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
| * | | | | [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.phpAndreas Fischer2012-07-083-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10974
* | | | | | Merge PR #856 branch 'prep-release-3.0.11' into develop-olympusOleg Pudeyev2012-07-074-8/+55
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | * 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-074-8/+55
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-034-8/+55
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10937
* | | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-013-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10773] ACP logo with registered trademark symbol
| * | | | | Merge remote-tracking branch 'Noxwizard/ticket/10773' into prep-release-3.0.11Andreas Fischer2012-07-013-3/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * Noxwizard/ticket/10773: [ticket/10773] ACP logo with registered trademark symbol
| | * | | | [ticket/10773] ACP logo with registered trademark symbolPatrick Webster2012-06-303-3/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-10773
* | | | | Merge branch 'ticket/brunoais/10850' into develop-olympusAndreas Fischer2012-06-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/brunoais/10850: [ticket/10850] Changed the fopen mode to wb
| * | | | | [ticket/10850] Changed the fopen mode to wbBruno Ais2012-06-281-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the fopen mode from "wt" to "wb" as requested in the PR. The objective behind this is to prevent writting stuff like "\r\r\n" in windows PHPBB3-10850
* | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-06-212-2/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10935] Limit number of PM rules per user to 5000
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10935' into ↵Andreas Fischer2012-06-212-2/+16
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.11 * nickvergessen/ticket/10935: [ticket/10935] Limit number of PM rules per user to 5000
| | * | | [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-202-2/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-10935
* | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-06-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10925] Clarify installation requirements for SQLite
| * | | | Merge remote-tracking branch 'Noxwizard/ticket/10925' into prep-release-3.0.11Andreas Fischer2012-06-201-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * Noxwizard/ticket/10925: [ticket/10925] Clarify installation requirements for SQLite
| | * | | [ticket/10925] Clarify installation requirements for SQLitePatrick Webster2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10925
* | | | | Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into ↵Nils Adermann2012-06-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-dhruvgoel92/ticket/9551: [ticket/9551] uncomment line and change length to 255
| * | | | | [ticket/9551] uncomment line and change length to 255Dhruv Goel2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incase of partial collation change post_subject field will be changed back to the default collation and length 255. PHPBB3-9551
* | | | | | Merge remote-tracking branch 'github-p/ticket/10828' into develop-olympusNils Adermann2012-06-121-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/ticket/10828: [ticket/10828] Connect to postgres database by default.