aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
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-192-0/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 goutte via composerFyorl2012-07-162-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | composer.phar added and autoloaded before tests PHPBB3-10981
* | | | [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 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 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
| * | | | [ticket/10773] ACP logo with registered trademark symbolPatrick Webster2012-06-303-3/+3
| | |/ / | |/| | | | | | | | | | PHPBB3-10773
* | | | [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
* | | | | [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.Andreas Fischer2012-05-313-3/+3
| |/ / / |/| | |
* | | | [develop-olympus] Add changelog for 3.0.11 release.Andreas Fischer2012-05-311-19/+136
| | | |
* | | | [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-313-5/+5
| | | |
* | | | [develop-olympus] Bumping version numbers to final for 3.0.11 releases.Andreas Fischer2012-05-3110-11/+11
| | | |
* | | | Merge remote-tracking branch 'github-bantu/ticket/10788' into develop-olympusNils Adermann2012-05-311-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10788: [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
| * | | | [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.Andreas Fischer2012-05-311-0/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-10788
* | | | Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympusNils Adermann2012-05-311-6/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10790: [ticket/10790] Remove a (kind of) dead code section from submit_pm().
| * | | | [ticket/10790] Remove a (kind of) dead code section from submit_pm().Andreas Fischer2012-05-221-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of $user->data['user_id'] is (almost) guranteed to be integer since session::session_create() casts it to integer. The type of $row['user_id'] is only an integer if the DB driver adjusts the PHP type according to the DB type. This is only done by some of our not-so-popular DB drivers and is not the case for MySQL. As such this comparison is (almost) never true and a PM is also sent to the author itself when it is sent to a group the author is also a member of. Since this behaviour seems to have been accepted by the communty, the dead code is removed and current behaviour is kept. Also, checking this in the loop seems to be a rather bad idea. Introduced by 78b1c4caaa17cc8760b685ad41c19f15f9d89b68. PHPBB3-10790
* | | | | Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympusNils Adermann2012-05-311-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10550: [ticket/10550] Sort not installed styles list in the styles section of the ACP.
| * | | | | [ticket/10550] Sort not installed styles list in the styles section of the ACP.Andreas Fischer2012-05-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10550
* | | | | | Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympusNils Adermann2012-05-311-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10611: [ticket/10611] Filter out not existing database tables when making a backup. [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables(). [ticket/10611] Generate db_tools instance in acp_database module.
| * | | | | | [ticket/10611] Filter out not existing database tables when making a backup.Andreas Fischer2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using $this->db_tools->sql_list_tables() as the first argument gives us table names as array keys as a by-product which might be useful at some point. PHPBB3-10611
| * | | | | | [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().Andreas Fischer2012-05-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_tables() was deprecated by phpbb_db_tools::sql_list_tables() This prevents unnecessarily loading functions_install.php PHPBB3-10611
| * | | | | | [ticket/10611] Generate db_tools instance in acp_database module.Andreas Fischer2012-05-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10611
* | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympusNils Adermann2012-05-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10162: [ticket/10162] Increase maximum length of email address TLD from 6 to 63. [ticket/10162] Add test cases for top level domain names longer than 6 chars.
| * | | | | | | [ticket/10162] Increase maximum length of email address TLD from 6 to 63.Andreas Fischer2012-05-301-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase maximum length of email address top level domains from 6 to 63. PHPBB3-10162
* | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympusNils Adermann2012-05-315-1/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10751: [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column. [ticket/10751] Add sql_lower_text() to database abstraction layer.
| * | | | | | | [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.Andreas Fischer2012-05-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10751
| * | | | | | | [ticket/10751] Add sql_lower_text() to database abstraction layer.Andreas Fischer2012-05-314-0/+36
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MSSQL, LOWER() can only be called on bounded strings (i.e. varchar or char). So, in order to use it on a text column, we have to convert it to an appropriate type. We do so using the SUBSTRING function. PHPBB3-10751
* | | | | | | Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympusAndreas Fischer2012-05-313-6/+31
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10908: [ticket/10908] Document that 0 filesize configuration means limited by PHP [ticket/10908] Download files only up to max_upload_filesize if limit is 0
| * | | | | | [ticket/10908] Document that 0 filesize configuration means limited by PHPNils Adermann2012-05-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10908
| * | | | | | [ticket/10908] Download files only up to max_upload_filesize if limit is 0Nils Adermann2012-05-291-4/+29
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10908