Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-24 | 103 | -1498/+3059 |
* | Merge pull request #4090 from owncloud/cleanup-some-template-functions | Thomas Müller | 2013-07-23 | 9 | -390/+571 |
|\ | |||||
| * | Change to use !== and === | Bart Visscher | 2013-07-21 | 2 | -6/+6 |
| * | fixing typos, PHPDoc and missing namespace \ | Thomas Müller | 2013-07-21 | 4 | -10/+11 |
| * | Move basic template functions to their own class | Bart Visscher | 2013-07-21 | 3 | -165/+205 |
| * | Move template functions to there own file | Bart Visscher | 2013-07-21 | 2 | -112/+121 |
| * | Split locating JS and CSS files to their own class | Bart Visscher | 2013-07-21 | 5 | -104/+235 |
* | | Merge pull request #3392 from owncloud/googledrive | Bart Visscher | 2013-07-23 | 39 | -599/+8529 |
|\ \ | |||||
| * | | Remove root option from Google Drive storage, because it is only used for tes... | Michael Gapczynski | 2013-07-23 | 2 | -10/+8 |
| * | | Fix 'most' Google Drive tests | Michael Gapczynski | 2013-07-13 | 2 | -82/+148 |
| * | | Merge branch 'master' into googledrive | Thomas Müller | 2013-07-12 | 1433 | -32503/+55405 |
| |\ \ | |||||
| * | | | substr storage id to prevent problems with storing the change id in appconfig | Michael Gapczynski | 2013-06-04 | 1 | -1/+1 |
| * | | | Implement hasUpdated() to watch for changes on Google Drive side | Michael Gapczynski | 2013-05-30 | 1 | -0/+59 |
| * | | | Merge branch 'master' into googledrive | Michael Gapczynski | 2013-05-30 | 820 | -36215/+7062 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into googledrive | Michael Gapczynski | 2013-05-27 | 1260 | -19374/+38600 |
| |\ \ \ \ | |||||
| * | | | | | Return null if file size is negative for WebDAV, fix #2013 | Michael Gapczynski | 2013-05-27 | 1 | -2/+5 |
| * | | | | | Fix require_once for 3rdparty in google ajax frontend | Michael Gapczynski | 2013-05-18 | 1 | -2/+3 |
| * | | | | | Include 3rdparty Google Drive SDK 0.6.2 | Michael Gapczynski | 2013-05-17 | 33 | -2/+7936 |
| * | | | | | Fix constant in last commit | Michael Gapczynski | 2013-05-17 | 1 | -1/+1 |
| * | | | | | Prepare for #2013 fix | Michael Gapczynski | 2013-05-17 | 1 | -1/+7 |
| * | | | | | Setting Redirect URI is not required here | Michael Gapczynski | 2013-05-16 | 1 | -1/+0 |
| * | | | | | Switch to using Google Drive SDK, closes #2047 | Michael Gapczynski | 2013-05-16 | 4 | -567/+431 |
* | | | | | | Merge pull request #4150 from owncloud/better-error-handling | Jörn Friedrich Dreyer | 2013-07-23 | 6 | -41/+42 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed review issues | Bart Visscher | 2013-07-22 | 3 | -7/+11 |
| * | | | | | | Only display call trace in debug mode | Bart Visscher | 2013-07-21 | 1 | -10/+17 |
| * | | | | | | In debug mode uncaught exceptions should display a nice page | Bart Visscher | 2013-07-21 | 1 | -3/+7 |
| * | | | | | | DRY use OC_Template::printErrorPage | Bart Visscher | 2013-07-21 | 2 | -22/+10 |
| * | | | | | | Change exit calls to throwing an exception | Bart Visscher | 2013-07-21 | 3 | -6/+4 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #4159 from owncloud/Fixing-share-sj-error | Jörn Friedrich Dreyer | 2013-07-23 | 1 | -1/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Create an array entry before filling it | Victor Dubiniuk | 2013-07-23 | 1 | -0/+1 |
| * | | | | | | Show generic error when there is no error | Victor Dubiniuk | 2013-07-22 | 1 | -1/+6 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-23 | 551 | -4314/+5039 |
* | | | | | | | Merge pull request #4126 from owncloud/parallel-autotest.sh-master | Thomas Müller | 2013-07-22 | 2 | -37/+50 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into parallel-autotest.sh-master | Thomas Müller | 2013-07-22 | 1267 | -5121/+67470 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | don't rely on admin user but create a test user for Test_Encryption_Keymanager | Thomas Müller | 2013-07-19 | 1 | -17/+15 |
| * | | | | | | | | pgsql support added | Thomas Müller | 2013-07-19 | 1 | -1/+4 |
| * | | | | | | | | parallel execution support for mysql added | Thomas Müller | 2013-07-19 | 1 | -12/+19 |
| * | | | | | | | | Merge branch 'master' into parallel-autotest.sh-master | Thomas Müller | 2013-07-18 | 601 | -5902/+2664 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use EXECUTOR_NUMBER in database name and user name. | Thomas Müller | 2013-07-16 | 1 | -18/+23 |
* | | | | | | | | | | Merge pull request #4156 from owncloud/fix_oc_image_reference | Andreas Fischer | 2013-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | need to use \OC_Image to escape OCP namespace | Jörn Friedrich Dreyer | 2013-07-22 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #4154 from owncloud/return-ocl10n | Kondou | 2013-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | return result from getL10N | Robin Appelman | 2013-07-22 | 1 | -1/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4071 from owncloud/fix_return_value_search_principals | VicDeo | 2013-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into fix_return_value_search_principals | Georg Ehrke | 2013-07-22 | 668 | -9752/+6546 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | return empty array instead of 0 | Georg Ehrke | 2013-07-15 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #3142 from owncloud/ext-fs-irods-master | Thomas Müller | 2013-07-22 | 85 | -1/+8137 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-22 | 1304 | -9833/+68886 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | fixing / adding comments | Thomas Müller | 2013-07-16 | 1 | -1/+3 |
| * | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-16 | 568 | -2225/+2364 |
| |\ \ \ \ \ \ \ \ \ \ \ |