aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #932 from EXreaction/ticket/10875Nils Adermann2012-08-1418-42/+103
|\
| * [ticket/10875] Fix cache testNathan Guse2012-08-061-1/+1
| * [ticket/10875] Break queries onto separate lines and use double quotesNathan Guse2012-08-061-3/+6
| * [ticket/10875] Close $db connection at end of testNathan Guse2012-08-061-0/+2
| * [ticket/10875] Use fixtures for sql cache testNathan Guse2012-08-062-12/+34
| * [ticket/10875] Return $query_id from sql_saveNathan Guse2012-08-0613-11/+45
| * [ticket/10875] Fix SQL CachingNathan Guse2012-07-3015-31/+31
* | Merge remote-tracking branch 'dhruvgoel92/ticket/11032' into developAndreas Fischer2012-08-141-9/+9
|\ \
| * | [ticket/11032] sphinx retries before triggering errorDhruv2012-08-111-9/+9
|/ /
* | Merge PR #944 branch 'dhruvgoel92/ticket/11032' into developOleg Pudeyev2012-08-102-0/+10
|\ \
| * | [ticket/11032] trigger error in case search failsDhruv2012-08-102-0/+10
|/ /
* | Merge remote-tracking branch 'mvinny/ticket/11046' into developAndreas Fischer2012-08-081-1/+2
|\ \
| * | [ticket/11046] Add border-radius for UCP message colours blockVinny2012-08-071-1/+2
* | | Merge remote-tracking branch 'mvinny/ticket/11047' into developAndreas Fischer2012-08-081-1/+1
|\ \ \
| * | | [ticket/11047] Close TOTAL_MESSAGES at ucp_pm_viewfolder.htmlVinny2012-08-071-1/+1
| |/ /
* | | Merge PR #916 branch 'dhruvgoel92/ticket/11011' into developOleg Pudeyev2012-08-086-318/+314
|\ \ \
| * | | [ticket/11011] rename property phpEx to php_extDhruv2012-08-082-9/+9
| * | | [ticket/11011] pass $auth to search backend constructorDhruv2012-08-086-7/+7
| * | | [ticket/11011] remove global keyword from sphinxDhruv2012-07-281-7/+6
| * | | [ticket/11011] pass global variables in constructDhruv2012-07-281-6/+7
| * | | [ticket/11011] passing global variablesDhruv2012-07-283-7/+3
| * | | [ticket/11011] remove global keyword in native searchDhruv2012-07-281-142/+132
| * | | [ticket/11011] remove global keyword in pgsql searchDhruv2012-07-281-77/+57
| * | | [ticket/11011] global variables as constructor parametersDhruv2012-07-281-77/+58
| * | | [ticket/11011] add access specifiers and docblocksDhruv2012-07-281-6/+55
* | | | Merge PR #933 branch 'dhruvgoel92/ticket/11032' into developOleg Pudeyev2012-08-082-1/+7
|\ \ \ \
| * | | | [ticket/11032] use method GetLastError to get errorDhruv2012-08-011-1/+1
| * | | | [ticket/11032] add sphinx errors to error logDhruv2012-08-012-0/+6
* | | | | Merge remote-tracking branch 'Noxwizard/ticket/11043' into developAndreas Fischer2012-08-072-6/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/11043] Change hook name back to display, since that's where we hook in.Andreas Fischer2012-08-031-1/+1
| * | | | [ticket/11043] Allow call_hook() to be called from more than one location.Andreas Fischer2012-08-031-5/+6
| * | | | [ticket/11043] Update template hook namePatrick Webster2012-08-031-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'Fyorl/ticket/11044' into developAndreas Fischer2012-08-061-0/+37
|\ \ \ \
| * | | | [ticket/11044] Added comment explaining filename splittingFyorl2012-08-061-1/+4
| * | | | [ticket/11044] Preserve the file extension in unique filenamesFyorl2012-08-051-1/+9
| * | | | [ticket/11044] Minor adjustments as per PR commentsFyorl2012-08-051-6/+7
| * | | | [ticket/11044] Compress class now deals with file conflictsFyorl2012-08-041-0/+25
* | | | | Merge remote-tracking branch 'bantu/ticket/11041' into developIgor Wiedler2012-08-062-5/+5
|\ \ \ \ \
| * | | | | [ticket/11041] Correctly import PHP file extension from global space.Andreas Fischer2012-08-022-5/+5
| |/ / / /
* | | | | Merge remote-tracking branch 'EXreaction/ticket/10885' into developAndreas Fischer2012-08-061-9/+8
|\ \ \ \ \
| * | | | | [ticket/10885] Fix UCP Main Error if no forums existNathan Guse2012-08-061-9/+8
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11029' into developAndreas Fischer2012-08-061-8/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ticket/11029] Remove $reparse variableNathan Guse2012-08-061-7/+2
| * | | | | [ticket/11029] Return $parsed_array (may have loaded from the cache)Nathan Guse2012-08-061-1/+1
| * | | | | [ticket/11029] Cache obtain_cfg_items should return empty array on failureNathan Guse2012-07-301-1/+1
| |/ / / /
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/11004' into developAndreas Fischer2012-08-023-10/+23
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/11004] Always update suggestion button in timezone_preselect_selectJoas Schilling2012-07-241-6/+8
| * | | | [ticket/11003] Ability to show full list of timezones with JavaScript enabledJoas Schilling2012-07-231-2/+13
| * | | | [ticket/11004] Make suggestion button a real button and fix it's valueJoas Schilling2012-07-232-2/+2
* | | | | Merge remote-tracking branch 'EXreaction/ticket/10875' into developAndreas Fischer2012-07-3010-20/+19
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |