aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
* | \ Merge remote-tracking branch 'github-dhruv/ticket/10308' into developNils Adermann2012-05-293-14/+28
|\ \ \ | | |/ | |/|
| * | [ticket/10308] fixes indentationDhruv Goel2012-05-111-19/+19
| * | [ticket/10308] fixes language variable nameDhruv Goel2012-05-102-2/+2
| * | [ticket/10308] makes variable booleanDhruv Goel2012-05-101-1/+1
| * | [ticket/10308] fixes sql query, limit it to 1Dhruv Goel2012-05-102-5/+5
| * | [ticket/10308] fixes user deletion if no postsDhruv Goel2012-05-101-1/+1
| * | [ticket/10308] renames language key to USER_NO_POSTS_DELETEDhruv Goel2012-05-102-2/+2
| * | [ticket/10308] fix language and user's total postsDhruv Goel2012-05-103-4/+14
| * | [ticket/10308] fixes language entity.Dhruv Goel2012-05-102-2/+2
| * | [ticket/10308] Displays message to user if there are no posts.Dhruv Goel2012-05-102-0/+4
| * | [ticket/10308] disable retain/ delete posts option when deleting a userDhruv Goel2012-05-101-1/+1
* | | Merge remote-tracking branch 'imkingdavid/ticket/10912' into developAndreas Fischer2012-05-291-1/+1
|\ \ \
| * | | [ticket/10912] Default last post subject to empty lacking last post infoDavid King2012-05-261-1/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-271-1/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'ticket/10909' into develop-olympusAndreas Fischer2012-05-271-0/+1
| |\ \
| | * | [ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis.Andreas Fischer2012-05-271-0/+1
| |/ /
* | | Merge PR #817 branch 'mvinny/ticket/10905' into developOleg Pudeyev2012-05-241-0/+3
|\ \ \
| * | | [ticket/10905] Last topic title for subsilver2Vinny2012-05-221-0/+3
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-221-0/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'github-bantu/ticket/10907' into develop-olympusNils Adermann2012-05-221-0/+5
| |\ \ \
| | * | | [ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.Andreas Fischer2012-05-221-0/+5
| |/ / /
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-224-1/+169
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-imkingdavid/task/functional' into develo...Nils Adermann2012-05-224-1/+169
| |\ \ \
| | * | | [task/functional] Use proper format for @var doc blocks. David King2012-05-221-2/+4
| | * | | [task/functional] Fix $lang_path variableDavid King2012-05-221-1/+1
| | * | | [task/functional] Change property visibility, remove globals, reword commentDavid King2012-05-221-6/+6
| | * | | [task/functional] Make sure missing language values are handled properlyDavid King2012-04-242-1/+9
| | * | | [task/functional] Increase code coverage for functional testsDavid King2012-04-234-1/+159
* | | | | 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.sqlDavid King2012-05-221-0/+1
|/ / / /
* | | | Merge PR #721 branch 'rahulr92/ticket/10650' into developOleg Pudeyev2012-05-216-2/+19
|\ \ \ \
| * | | | [ticket/10650] Subject is cleared if no permissions existRahul R2012-05-191-2/+2
| * | | | [ticket/10650] Changed apostrophe to utf8 single quoteRahul R2012-04-111-1/+1
| * | | | [ticket/10650] Moving censoring to before truncationRahul R2012-04-101-2/+2
| * | | | [ticket/10650] Added apostrophe in explanation in language fileRahul R2012-04-091-1/+1
| * | | | [ticket/10650] Inserted correct utf ELLIPSIS characterRahul R2012-04-091-1/+1
| * | | | [ticket/10650] Added space after if and commentRahul R2012-04-092-4/+4
| * | | | [ticket/10650] Added ellipsis to language fileRahul R2012-04-083-2/+3
| * | | | [ticket/10650] Added href title to subject linkRahul R2012-04-081-1/+1
| * | | | [ticket/10650] Made use of truncate_string() functionRahul R2012-04-082-6/+3
| * | | | [ticket/10650] Removed changes from acp_forums.phpRahul R2012-04-081-4/+0
| * | | | [ticket/10650]Removed incorrect newlineRahul R2012-04-081-1/+0
| * | | | [ticket/10650] Changed acp option from per forum to globalRahul R2012-04-0815-20/+12
| * | | | [ticket/10650] Added checking for empty subjectsRahul R2012-04-081-1/+1
| * | | | [ticket/10650] Corrected intendationRahul R2012-04-081-4/+4
| * | | | [ticket/10650]Added permission checking and utf8 functionsRahul R2012-04-081-4/+4
| * | | | [ticket/10650] Cropped subject and inserted newlineRahul R2012-04-082-1/+6
| * | | | [ticket/10650] Corrected space before trueRahul2012-04-081-1/+1