summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-24103-1498/+3059
* Merge pull request #4090 from owncloud/cleanup-some-template-functionsThomas Müller2013-07-239-390/+571
|\
| * Change to use !== and ===Bart Visscher2013-07-212-6/+6
| * fixing typos, PHPDoc and missing namespace \Thomas Müller2013-07-214-10/+11
| * Move basic template functions to their own classBart Visscher2013-07-213-165/+205
| * Move template functions to there own fileBart Visscher2013-07-212-112/+121
| * Split locating JS and CSS files to their own classBart Visscher2013-07-215-104/+235
* | Merge pull request #3392 from owncloud/googledriveBart Visscher2013-07-2339-599/+8529
|\ \
| * | Remove root option from Google Drive storage, because it is only used for tes...Michael Gapczynski2013-07-232-10/+8
| * | Fix 'most' Google Drive testsMichael Gapczynski2013-07-132-82/+148
| * | Merge branch 'master' into googledriveThomas Müller2013-07-121433-32503/+55405
| |\ \
| * | | substr storage id to prevent problems with storing the change id in appconfigMichael Gapczynski2013-06-041-1/+1
| * | | Implement hasUpdated() to watch for changes on Google Drive sideMichael Gapczynski2013-05-301-0/+59
| * | | Merge branch 'master' into googledriveMichael Gapczynski2013-05-30820-36215/+7062
| |\ \ \
| * \ \ \ Merge branch 'master' into googledriveMichael Gapczynski2013-05-271260-19374/+38600
| |\ \ \ \
| * | | | | Return null if file size is negative for WebDAV, fix #2013Michael Gapczynski2013-05-271-2/+5
| * | | | | Fix require_once for 3rdparty in google ajax frontendMichael Gapczynski2013-05-181-2/+3
| * | | | | Include 3rdparty Google Drive SDK 0.6.2Michael Gapczynski2013-05-1733-2/+7936
| * | | | | Fix constant in last commitMichael Gapczynski2013-05-171-1/+1
| * | | | | Prepare for #2013 fixMichael Gapczynski2013-05-171-1/+7
| * | | | | Setting Redirect URI is not required hereMichael Gapczynski2013-05-161-1/+0
| * | | | | Switch to using Google Drive SDK, closes #2047Michael Gapczynski2013-05-164-567/+431
* | | | | | Merge pull request #4150 from owncloud/better-error-handlingJörn Friedrich Dreyer2013-07-236-41/+42
|\ \ \ \ \ \
| * | | | | | Fixed review issuesBart Visscher2013-07-223-7/+11
| * | | | | | Only display call trace in debug modeBart Visscher2013-07-211-10/+17
| * | | | | | In debug mode uncaught exceptions should display a nice pageBart Visscher2013-07-211-3/+7
| * | | | | | DRY use OC_Template::printErrorPageBart Visscher2013-07-212-22/+10
| * | | | | | Change exit calls to throwing an exceptionBart Visscher2013-07-213-6/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4159 from owncloud/Fixing-share-sj-errorJörn Friedrich Dreyer2013-07-231-1/+7
|\ \ \ \ \ \
| * | | | | | Create an array entry before filling itVictor Dubiniuk2013-07-231-0/+1
| * | | | | | Show generic error when there is no errorVictor Dubiniuk2013-07-221-1/+6
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-23551-4314/+5039
* | | | | | | Merge pull request #4126 from owncloud/parallel-autotest.sh-masterThomas Müller2013-07-222-37/+50
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into parallel-autotest.sh-masterThomas Müller2013-07-221267-5121/+67470
| |\ \ \ \ \ \ \
| * | | | | | | | don't rely on admin user but create a test user for Test_Encryption_KeymanagerThomas Müller2013-07-191-17/+15
| * | | | | | | | pgsql support addedThomas Müller2013-07-191-1/+4
| * | | | | | | | parallel execution support for mysql addedThomas Müller2013-07-191-12/+19
| * | | | | | | | Merge branch 'master' into parallel-autotest.sh-masterThomas Müller2013-07-18601-5902/+2664
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use EXECUTOR_NUMBER in database name and user name.Thomas Müller2013-07-161-18/+23
* | | | | | | | | | Merge pull request #4156 from owncloud/fix_oc_image_referenceAndreas Fischer2013-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | need to use \OC_Image to escape OCP namespaceJörn Friedrich Dreyer2013-07-221-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4154 from owncloud/return-ocl10nKondou2013-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | return result from getL10NRobin Appelman2013-07-221-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4071 from owncloud/fix_return_value_search_principalsVicDeo2013-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into fix_return_value_search_principalsGeorg Ehrke2013-07-22668-9752/+6546
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | return empty array instead of 0Georg Ehrke2013-07-151-1/+1
* | | | | | | | | | | Merge pull request #3142 from owncloud/ext-fs-irods-masterThomas Müller2013-07-2285-1/+8137
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-221304-9833/+68886
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | fixing / adding commentsThomas Müller2013-07-161-1/+3
| * | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-16568-2225/+2364
| |\ \ \ \ \ \ \ \ \ \ \