aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | [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
* | | | | | | Merge pull request #815 from imkingdavid/ticket/10906Nils Adermann2012-05-221-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | [ticket/10906] Add setting for last post topic title in schema_data.sql
| * | | | | | [ticket/10906] Add setting for last post topic title in schema_data.sqlDavid King2012-05-221-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10906
* | | | | | Merge PR #721 branch 'rahulr92/ticket/10650' into developOleg Pudeyev2012-05-216-2/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rahulr92/ticket/10650: [ticket/10650] Subject is cleared if no permissions exist [ticket/10650] Changed apostrophe to utf8 single quote [ticket/10650] Moving censoring to before truncation [ticket/10650] Added apostrophe in explanation in language file [ticket/10650] Inserted correct utf ELLIPSIS character [ticket/10650] Added space after if and comment [ticket/10650] Added ellipsis to language file [ticket/10650] Added href title to subject link [ticket/10650] Made use of truncate_string() function [ticket/10650] Removed changes from acp_forums.php [ticket/10650]Removed incorrect newline [ticket/10650] Changed acp option from per forum to global [ticket/10650] Added checking for empty subjects [ticket/10650] Corrected intendation [ticket/10650]Added permission checking and utf8 functions [ticket/10650] Cropped subject and inserted newline [ticket/10650] Corrected space before true [ticket/10650] Changed language files and forumlist [ticket/10650] Added static sql files [ticket/10650] Displaying last topic on forum list Conflicts: phpBB/install/database_update.php phpBB/language/en/common.php
| * | | | | | [ticket/10650] Subject is cleared if no permissions existRahul R2012-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subject line will be cleared before passing to the template in case the user doesn't have sufficient permissions. PHPBB3-10650
| * | | | | | [ticket/10650] Changed apostrophe to utf8 single quoteRahul R2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The apostrophe in language entry DISPLAY_LAST_SUBJECT_EXPLAIN was changed to utf8 single quote character. PHPBB3-10650
| * | | | | | [ticket/10650] Moving censoring to before truncationRahul R2012-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The censor_text function is now being applied to the last_post_subject before being truncated. PHPBB3-10650
| * | | | | | [ticket/10650] Added apostrophe in explanation in language fileRahul R2012-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A missing apostrophe was added to the language file entry of DISPLAY_LAST_SUBJECT_EXPLAIN PHPBB3-10650
| * | | | | | [ticket/10650] Inserted correct utf ELLIPSIS characterRahul R2012-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inserted the correct utf-8 ellipsis to the language file. PHPBB3-10650
| * | | | | | [ticket/10650] Added space after if and commentRahul R2012-04-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added space in proper places in database_update.php. Also corrected language entry of ELLIPSIS to utf8 PHPBB3-10650
| * | | | | | [ticket/10650] Added ellipsis to language fileRahul R2012-04-083-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ELLIPSIS to language file common.php and also corrected language explanation of ACP option. PHPBB3-10650
| * | | | | | [ticket/10650] Added href title to subject linkRahul R2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added title attribute to anchor tag which displays last_post_subject so that the full subject can be seen by hovering over the truncated subject displayed in forumlist. PHPBB3-10650
| * | | | | | [ticket/10650] Made use of truncate_string() functionRahul R2012-04-082-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed manual cropping and used truncate_string function. Also made a new variable so that is preserved. PHPBB3-10650
| * | | | | | [ticket/10650] Removed changes from acp_forums.phpRahul R2012-04-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneccesary changes from acp_forums.php PHPBB3-10650
| * | | | | | [ticket/10650]Removed incorrect newlineRahul R2012-04-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted additional line in the end of database_update.php PHPBB3-10650
| * | | | | | [ticket/10650] Changed acp option from per forum to globalRahul R2012-04-0815-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the display last subject acp toggle option from per forum to global. Modified associated database entries. New option is available in ACP General->Board Features. Also corrected <br /> in forumlist_body.html. PHPBB3-10650
| * | | | | | [ticket/10650] Added checking for empty subjectsRahul R2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now empty subjects will not be displayed in a new line on the forum list. PHPBB3-10650
| * | | | | | [ticket/10650] Corrected intendationRahul R2012-04-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected the intendation of if condition. PHPBB3-10650
| * | | | | | [ticket/10650]Added permission checking and utf8 functionsRahul R2012-04-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passworded forums and ones in which user doesn't have read access will be excluded. Also uft8 based string functions and html encode/decode functions have been used to sanitise subject. PHPBB3-10650
| * | | | | | [ticket/10650] Cropped subject and inserted newlineRahul R2012-04-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subject being displayed in the forum list have been shortened to 30 characters. Also it is now being shown in a separate line. PHPBB3-10650
| * | | | | | [ticket/10650] Corrected space before trueRahul2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inserted a space before 'true' as per coding guidelines. PHPBB3-10650
| * | | | | | [ticket/10650] Changed language files and forumlistRahul2012-04-082-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entry in languages have been changed from title to subject. Also the IF condition in forumlist_body.html has been properly intented. PHPBB3-10650
| * | | | | | [ticket/10650] Added static sql filesRahul2012-04-087-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran create_schema_files.php and added the generated static sql files to the commit. PHPBB3-10650
| * | | | | | [ticket/10650] Displaying last topic on forum listRahul2012-04-087-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most recent topic title of the forum can now be displayed on the board index. An option is provided in the ACP under the 'General Forum Setting' which allows the admin to enable or disable this feature. PHPBB3-10650
* | | | | | | Merge PR #810 branch 'develop-olympus' into developOleg Pudeyev2012-05-211-1/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10890] Fix test_sql_fetchrow_returns_false_when_empty() on MS and ORA.
| * | | | | | Merge PR #810 branch 'bantu/ticket/10890' into develop-olympusOleg Pudeyev2012-05-211-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10890: [ticket/10890] Fix test_sql_fetchrow_returns_false_when_empty() on MS and ORA.
| | * | | | | | [ticket/10890] Fix test_sql_fetchrow_returns_false_when_empty() on MS and ORA.Andreas Fischer2012-05-221-1/+3
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix phpbb_dbal_select_test::test_sql_fetchrow_returns_false_when_empty() on MSSQL and Oracle by specifying an existing table in the query. PHPBB3-10890
* | | | | | | Merge PR #813 branch 'develop-olympus' into developOleg Pudeyev2012-05-211-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
| * | | | | | Merge PR #813 branch 'bantu/ticket/10401' into develop-olympusOleg Pudeyev2012-05-211-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10401: [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
| | * | | | | | [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().Andreas Fischer2012-05-221-1/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ldap_login() is supposed to return an array. PHPBB3-10401