aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-3/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [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.
| * | | | | | | 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 branch 'develop-olympus' into developNils Adermann2012-05-312-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [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.
| * | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympusNils Adermann2012-05-312-1/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | [ticket/10162] Add test cases for top level domain names longer than 6 chars.Andreas Fischer2012-05-301-0/+3
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10162
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-315-1/+38
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [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. Conflicts: phpBB/includes/db/dbal.php
| * | | | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2012-05-313-6/+31
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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
| * | | | | | | | 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
* | | | | | | | Merge branch 'develop-olympus' into developDavid King2012-05-291-2/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/session.php
| * | | | | | | Merge branch 'naderman/ticket/10913' into develop-olympusDavid King2012-05-291-2/+9
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/10913] Redirect to index if session id is required but was not sentNils Adermann2012-05-291-2/+9
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10913
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-290-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympusNils Adermann2012-05-293-14/+28
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Dhruv Goel via Dhruv Goel * github-dhruv/ticket/10308: [ticket/10308] fixes indentation [ticket/10308] fixes language variable name [ticket/10308] makes variable boolean [ticket/10308] fixes sql query, limit it to 1 [ticket/10308] fixes user deletion if no posts [ticket/10308] renames language key to USER_NO_POSTS_DELETE [ticket/10308] fix language and user's total posts [ticket/10308] fixes language entity. [ticket/10308] Displays message to user if there are no posts. [ticket/10308] disable retain/ delete posts option when deleting a user
* | | | | | | | Merge remote-tracking branch 'github-dhruv/ticket/10308' into developNils Adermann2012-05-293-14/+28
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Dhruv Goel via Dhruv Goel * github-dhruv/ticket/10308: [ticket/10308] fixes indentation [ticket/10308] fixes language variable name [ticket/10308] makes variable boolean [ticket/10308] fixes sql query, limit it to 1 [ticket/10308] fixes user deletion if no posts [ticket/10308] renames language key to USER_NO_POSTS_DELETE [ticket/10308] fix language and user's total posts [ticket/10308] fixes language entity. [ticket/10308] Displays message to user if there are no posts. [ticket/10308] disable retain/ delete posts option when deleting a user
| * | | | | | | [ticket/10308] fixes indentationDhruv Goel2012-05-111-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indentation is fixed and user_posts variable is compared as a boolean variable. PHPBB3-10308
| * | | | | | | [ticket/10308] fixes language variable nameDhruv Goel2012-05-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Language variable has be renamed for better understanding PHPBB3-10308
| * | | | | | | [ticket/10308] makes variable booleanDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makes user_row['user_has_posts'] boolean instead of 1 or 0. PHPBB3-10308
| * | | | | | | [ticket/10308] fixes sql query, limit it to 1Dhruv Goel2012-05-102-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of fetching all posts by user we limit the query to 1 to check if a user has posts or not PHPBB3-10308
| * | | | | | | [ticket/10308] fixes user deletion if no postsDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduces a hidden input field with retain posts as the mode in case user has no posts. PHPBB3-10308
| * | | | | | | [ticket/10308] renames language key to USER_NO_POSTS_DELETEDhruv Goel2012-05-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language key renamed to make its usability more clearer. PHPBB3-10308
| * | | | | | | [ticket/10308] fix language and user's total postsDhruv Goel2012-05-103-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language modified to be clear and select box disappears in case no posts by user. user's total posts are fetched using a new query. PHPBB3-10308
| * | | | | | | [ticket/10308] fixes language entity.Dhruv Goel2012-05-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Language key has been changed and has been made more specific to avoid conflicts PHPBB3-10308
| * | | | | | | [ticket/10308] Displays message to user if there are no posts.Dhruv Goel2012-05-102-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While deletng the user, if the user has no posts in addition to the options being disabled an added message is displayed. PHPBB3-10308
| * | | | | | | [ticket/10308] disable retain/ delete posts option when deleting a userDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting a user, it asks whether the posts by user should be retained or deleted. The selection should be disable if the user has no posts. PHPBB3-10308
* | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/10912' into developAndreas Fischer2012-05-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10912: [ticket/10912] Default last post subject to empty lacking last post info
| * | | | | | | | [ticket/10912] Default last post subject to empty lacking last post infoDavid King2012-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10912
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-271-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis. Conflicts: .travis.yml
| * | | | | | | Merge branch 'ticket/10909' into develop-olympusAndreas Fischer2012-05-271-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10909: [ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis.
| | * | | | | | | [ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis.Andreas Fischer2012-05-271-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also test develop-olympus with low PHP 5.3 version (i.e. PHP 5.3.3) on travis. PHPBB3-10909
* | | | | | | | Merge PR #817 branch 'mvinny/ticket/10905' into developOleg Pudeyev2012-05-241-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/10905: [ticket/10905] Last topic title for subsilver2
| * | | | | | | | [ticket/10905] Last topic title for subsilver2Vinny2012-05-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10905
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-221-0/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.
| * | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10907' into develop-olympusNils Adermann2012-05-221-0/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10907: [ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.
| | * | | | | | | | [ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.Andreas Fischer2012-05-221-0/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10907
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-224-1/+169
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By David King via David King (1) and Nils Adermann (1) * develop-olympus: [task/functional] Use proper format for @var doc blocks. [task/functional] Fix $lang_path variable [task/functional] Change property visibility, remove globals, reword comment [task/functional] Make sure missing language values are handled properly [task/functional] Increase code coverage for functional tests Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * | | | | | | | Merge remote-tracking branch 'github-imkingdavid/task/functional' into ↵Nils Adermann2012-05-224-1/+169
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus By David King via David King * github-imkingdavid/task/functional: [task/functional] Use proper format for @var doc blocks. [task/functional] Fix $lang_path variable [task/functional] Change property visibility, remove globals, reword comment [task/functional] Make sure missing language values are handled properly [task/functional] Increase code coverage for functional tests
| | * | | | | | | | [task/functional] Use proper format for @var doc blocks. David King2012-05-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| | * | | | | | | | [task/functional] Fix $lang_path variableDavid King2012-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| | * | | | | | | | [task/functional] Change property visibility, remove globals, reword commentDavid King2012-05-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| | * | | | | | | | [task/functional] Make sure missing language values are handled properlyDavid King2012-04-242-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| | * | | | | | | | [task/functional] Increase code coverage for functional testsDavid King2012-04-234-1/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758