Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-29 | 8 | -2/+32 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-28 | 40 | -28/+129 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-27 | 131 | -656/+98 | |
|/ / / / | ||||||
* | | / | new version drop down | Björn Schießle | 2013-07-25 | 9 | -211/+221 | |
| |_|/ |/| | | ||||||
* | | | Merge pull request #3898 from owncloud/sabre-objecttree | icewind1991 | 2013-07-24 | 1 | -3/+4 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' into sabre-objecttree | Robin Appelman | 2013-07-24 | 919 | -1328/+80532 | |
| |\ \ \ | ||||||
| * | | | | use new ObjectTree in sabredav | Robin Appelman | 2013-06-30 | 1 | -3/+4 | |
* | | | | | use output buffering when including the irods libraries | Robin Appelman | 2013-07-24 | 1 | -0/+2 | |
| |/ / / |/| | | | ||||||
* | | | | use OC_Defaults directly from the template | Björn Schießle | 2013-07-24 | 1 | -2/+2 | |
* | | | | Merge branch 'master' into move_defaults_to_template_constructor | Björn Schießle | 2013-07-24 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | fix php syntax | Thomas Müller | 2013-07-24 | 1 | -2/+2 | |
* | | | | | initialize OC_Defaults in template constructorX | Björn Schießle | 2013-07-24 | 1 | -5/+3 | |
|/ / / / | ||||||
* | | | | Merge branch 'master' into more-themable-strings | Thomas Müller | 2013-07-24 | 806 | -921/+79554 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #3392 from owncloud/googledrive | Bart Visscher | 2013-07-23 | 38 | -597/+8524 | |
| |\ \ \ \ | ||||||
| | * | | | | 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 | 297 | -1877/+4056 | |
| | |\ \ \ \ | ||||||
| | * | | | | | 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 | 42 | -1672/+2100 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into googledrive | Michael Gapczynski | 2013-05-27 | 244 | -3192/+8245 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | 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 | |
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-23 | 2 | -1/+19 | |
| * | | | | | | | | Merge pull request #4126 from owncloud/parallel-autotest.sh-master | Thomas Müller | 2013-07-22 | 1 | -17/+15 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into parallel-autotest.sh-master | Thomas Müller | 2013-07-22 | 677 | -242/+62637 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | don't rely on admin user but create a test user for Test_Encryption_Keymanager | Thomas Müller | 2013-07-19 | 1 | -17/+15 | |
| * | | | | | | | | | | Merge pull request #3142 from owncloud/ext-fs-irods-master | Thomas Müller | 2013-07-22 | 84 | -1/+8130 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-22 | 676 | -240/+62652 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | | 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 | 10 | -2/+49 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-12 | 2 | -75/+109 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | update copy right | Thomas Müller | 2013-07-12 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/ir... | Thomas Müller | 2013-07-12 | 79 | -0/+7930 | |
| | * | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-12 | 195 | -889/+2056 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-06-28 | 51 | -183/+368 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-06-19 | 357 | -3819/+9903 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | update to latest master | Thomas Mueller | 2013-06-06 | 1 | -6/+0 | |
| | * | | | | | | | | | | | | | | - implement touch() to at least create a file which doesn't exist | Thomas Mueller | 2013-06-06 | 1 | -12/+87 | |
| | * | | | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-05-15 | 197 | -743/+1497 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | adding auth mode to ui and the url | Thomas Mueller | 2013-04-26 | 2 | -0/+7 | |
| | * | | | | | | | | | | | | | | | adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALS | Thomas Mueller | 2013-04-26 | 1 | -0/+2 | |
| | * | | | | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-04-26 | 91 | -32/+261 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | test case for iRODS storage added | Thomas Mueller | 2013-04-23 | 1 | -0/+30 | |
| | * | | | | | | | | | | | | | | | | checkbox in settings ui | Thomas Mueller | 2013-04-18 | 1 | -1/+2 | |
| | * | | | | | | | | | | | | | | | | in order to use the ownCloud login credentials we use a login hook to grab ui... | Thomas Mueller | 2013-04-18 | 2 | -45/+17 |