aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10942] Fix function name on order_lower_test.phpJoas Schilling2012-06-201-1/+1
* [ticket/10942] Add unit tests for sql_concatenateJoas Schilling2012-06-201-0/+64
* [ticket/10942] Add sql_concatenate to dbalJoas Schilling2012-06-207-0/+60
* [ticket/10942] Add unit tests for sql_conditionalJoas Schilling2012-06-201-0/+64
* [ticket/10942] Add sql_conditional to dbalJoas Schilling2012-06-201-0/+17
* Merge branch 'develop-olympus' into developNils Adermann2012-06-191-1/+1
|\
| * Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into develop-ol...Nils Adermann2012-06-191-1/+1
| |\
| | * [ticket/9551] uncomment line and change length to 255Dhruv Goel2012-06-191-1/+1
* | | Merge PR #837 branch 'naderman/ticket/10932' into developOleg Pudeyev2012-06-182-14/+2
|\ \ \
| * | | [ticket/10932] Use included composer.phar in build processNils Adermann2012-06-111-14/+2
| * | | [ticket/10932] Adding composer.phar to the repository to version itNils Adermann2012-06-111-0/+0
* | | | Merge PR #571 branch 'unknownbliss/ticket/10640' into developOleg Pudeyev2012-06-187-8/+8
|\ \ \ \
| * | | | [ticket/10640] Change subject length in mcp in subsilverMichael Cullum2012-06-171-1/+1
| * | | | [ticket/10640] Change subject length in MCPMichael Cullum2012-06-171-1/+1
| * | | | [ticket/10640] Do not change default value of truncate_string()Joas Schilling2012-06-172-3/+3
| * | | | [ticket/10640] Change maximum subject lengthMichael Cullum2012-06-175-5/+5
* | | | | Merge pull request #779 from callumacrae/ticket/10855Nils Adermann2012-06-181-4/+34
|\ \ \ \ \
| * | | | | [ticket/10855] Fixed a couple issues in coding guidelines.Callum Macrae2012-05-221-2/+2
| * | | | | [ticket/10855] Added JS camelCaps info to guidelines.Callum Macrae2012-05-031-2/+8
| * | | | | [ticket/10855] Added array trailing commas info in js to guidelines.Callum Macrae2012-05-031-1/+1
| * | | | | [ticket/10855] Modified coding guidelines to reflect JS brace changes.Callum Macrae2012-04-291-1/+25
* | | | | | Merge pull request #840 from p/ticket/10829Nils Adermann2012-06-112-4/+3
|\ \ \ \ \ \
| * | | | | | [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.Oleg Pudeyev2012-06-111-1/+0
| * | | | | | [ticket/10829] $style_name -> $style_path in style class.Oleg Pudeyev2012-06-111-3/+3
|/ / / / / /
* | | | | | Merge PR #839 branch 'p/ticket/10743' into developOleg Pudeyev2012-06-115-57/+43
|\ \ \ \ \ \
| * | | | | | [ticket/10743] Renaming user->themeVjacheslav Trushkin2012-06-114-21/+21
| * | | | | | [ticket/10743] Changing obtain_cfg_itemsVjacheslav Trushkin2012-06-112-36/+22
* | | | | | | Merge PR #787 branch 'cyberalien/ticket/10799' into developOleg Pudeyev2012-06-112-3/+8
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10799] Removing global variable from includejsVjacheslav Trushkin2012-05-012-3/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge PR #778 branch 'cyberalien/ticket/10800' into developOleg Pudeyev2012-06-1110-14/+19
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ticket/10800] Changing html to js for includejs testsVjacheslav Trushkin2012-05-016-6/+10
| * | | | | | [ticket/10800] Changing template paths in testsVjacheslav Trushkin2012-04-295-11/+12
| |/ / / / /
* | | | | | Merge remote-tracking branch 'github-p/ticket/10882' into developNils Adermann2012-06-127-0/+93
|\ \ \ \ \ \
| * | | | | | [ticket/10882] Fix test name - oops.Oleg Pudeyev2012-06-111-1/+1
| * | | | | | [ticket/10882] Add a test for including a nonexistent file.Oleg Pudeyev2012-05-103-0/+34
| * | | | | | [ticket/10882] Add test for an ENDIF without IF.Oleg Pudeyev2012-05-103-0/+14
| * | | | | | [ticket/10882] Add test for an invalid template tag.Oleg Pudeyev2012-05-103-0/+45
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-06-120-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'github-p/ticket/10828' into develop-olympusNils Adermann2012-06-121-0/+15
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge pull request #814 from p/ticket/10828Nils Adermann2012-06-111-0/+15
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | [ticket/10828] Connect to postgres database by default.Oleg Pudeyev2012-05-211-0/+15
* | | | | | | | Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' ...Nils Adermann2012-06-116-0/+170
|\ \ \ \ \ \ \ \
| * | | | | | | | [feature-delete-auto-logins] adds module to database updateDhruv Goel2012-06-031-0/+7
| * | | | | | | | [feature/delete-auto-logins] fixes styleDhruv Goel2012-05-172-6/+4
| * | | | | | | | [feature/delete-auto-logins] improves stylingDhruv Goel2012-05-172-43/+41
| * | | | | | | | [feature/delete-auto-logins] fixes language entryDhruv Goel2012-05-171-1/+1
| * | | | | | | | [feature/delete-auto-logins] fix language keys and stylingDhruv Goel2012-05-173-10/+12
| * | | | | | | | [feature/delete-auto-logins] explain persistent keys in the ucp.Dhruv Goel2012-05-171-1/+1
| * | | | | | | | [feature/delete-auto-logins] template added for subsilver2Dhruv Goel2012-05-171-0/+51
| * | | | | | | | [feature/delete-auto-logins] improved styling and fixes languageDhruv Goel2012-05-173-9/+13