mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,021 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

5237 Commits

Author SHA1 Message Date
Michael Gapczynski 4bb9c4a42e Fix constant in last commit 2013-05-17 14:03:25 -04:00
Michael Gapczynski 5368c8dafa Prepare for #2013 fix 2013-05-17 11:42:14 -04:00
Michael Gapczynski ee398ccbc2 Setting Redirect URI is not required here 2013-05-16 20:35:07 -04:00
Michael Gapczynski d8c660c6d5 Switch to using Google Drive SDK, closes #2047 2013-05-16 20:09:32 -04:00
Jenkins for ownCloud e8c154f341 [tx-robot] updated from transifex 2013-05-13 02:10:20 +02:00
Jenkins for ownCloud 74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Björn Schießle bda8187f3b rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file 2013-05-08 23:00:13 +02:00
Björn Schießle b9134dcd6a touch file relative to users file folder, otherwise the hooks will be ignored 2013-05-08 22:59:49 +02:00
Bart Visscher 175633d380 Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app 
Use === and !== in user_ldap app
 2013-05-07 12:45:43 -07:00
icewind1991 5b61c5d478 Merge pull request #3044 from owncloud/backgroundwatcher 
Add a background job to watch for external filesystem changes
 2013-05-07 10:00:00 -07:00
Morris Jobke deb0885e46 Merge pull request #3246 from owncloud/newfile-mimetype 
Files: set the proper mimetype when creating a new text file
 2013-05-07 01:53:43 -07:00
Robin Appelman 3de40f7cfb Files: set the proper mimetype when creating a new text file 2013-05-06 17:55:22 +02:00
Lukas Reschke db1e6b5f3b Use $dir instead of $fullpath 2013-05-06 14:28:01 +03:00
Lukas Reschke b13b19c58b Use the internal ownCloud view 2013-05-06 13:43:23 +03:00
Arthur Schiwon d659d8e193 LDAP: do not reset UUID attribute setting when guid is detected 2013-05-06 10:17:52 +02:00
Jenkins for ownCloud a876240b32 [tx-robot] updated from transifex 2013-05-04 02:00:54 +02:00
Arthur Schiwon 1e2b872160 LDAP: cachekey in set method needs to match with that one from get 2013-05-03 15:13:37 +02:00
Bart Visscher e0f6d159d6 Merge pull request #3229 from owncloud/fix_3210 
LDAP: remove restriction from group names to be in line with core behavi...
 2013-05-03 06:04:24 -07:00
Bart Visscher a541b80592 Merge pull request #3222 from owncloud/fix-3218 
Fix retrieving of mount points for shared storage, fix #3218
 2013-05-03 06:02:33 -07:00
Arthur Schiwon 22a8e7ad55 LDAP: remove restriction from group names to be in line with core behaviour again 2013-05-03 14:11:06 +02:00
Jenkins for ownCloud 4f6565d8e7 [tx-robot] updated from transifex 2013-05-03 02:05:10 +02:00
Morris Jobke a204a46d50 Merge pull request #3212 from owncloud/stop-links 
Don't display shared links if disabled
 2013-05-02 15:29:00 -07:00
Michael Gapczynski 7039421efc Fix retrieving of mount points for shared storage, fix #3218 2013-05-02 17:47:11 -04:00
Frank Karlitschek 8a5e88b21c Merge pull request #3211 from owncloud/fix-2816 
Fix #2816 renaming shared files
 2013-05-02 00:54:09 -07:00
Michael Gapczynski 274bf3c6bd Don't display shared links if disabled 2013-05-01 20:39:02 -04:00
Michael Gapczynski 04b7a9902d Fix #2816 renaming shared files 2013-05-01 20:29:07 -04:00
Jenkins for ownCloud ee53e7b3d2 [tx-robot] updated from transifex 2013-05-02 02:19:04 +02:00
Michael Gapczynski 657ff34c6c Merge pull request #3147 from owncloud/storage-mkdir-root 
Dont task external storages with creating their own root
 2013-05-01 16:35:44 -07:00
Frank Karlitschek db49b0aff8 Merge pull request #3202 from owncloud/swift_id 
Set storage id for openstack swift backend
 2013-05-01 05:28:37 -07:00
Jenkins for ownCloud 6163a85668 [tx-robot] updated from transifex 2013-05-01 02:02:59 +02:00
Robin Appelman 4c980b1a14 Set storage id for openstack swift backend 2013-05-01 00:24:34 +02:00
FlorinPeter 4ab3614248 Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master 
Trashbin for encryption keys now against master
 2013-04-30 11:39:21 -07:00
Jenkins for ownCloud 5764bf088e [tx-robot] updated from transifex 2013-04-30 01:59:18 +02:00
Morris Jobke cc9933be1c Merge pull request #3160 from owncloud/remove-onclick 
Remove onclick
 2013-04-29 03:58:44 -07:00
Jenkins for ownCloud 2b36ad292d [tx-robot] updated from transifex 2013-04-29 02:00:26 +02:00
Lukas Reschke 3a6e39b990 It's a class 2013-04-28 23:28:41 +02:00
Lukas Reschke 003e6adb3f Remove uneeded onclick handler 2013-04-28 23:26:07 +02:00
Lukas Reschke 6cf6103ed2 Move onclick handler 2013-04-28 23:25:58 +02:00
Florin Peter 7a3ecd0429 delete and restore of versions and share-keys now works 
fix restore of the same file name
 2013-04-28 20:48:30 +02:00
Florin Peter 5e11948598 added handling for share-keys 
this works only with latest files_encryption branch up from 813641e6e8
 2013-04-28 20:48:30 +02:00
Florin Peter 26e5ef193d restore fixed 2013-04-28 20:48:30 +02:00
Florin Peter 228c501515 fixed some problems and broken code 2013-04-28 20:48:30 +02:00
Björn Schießle 680ba4bea1 restore encryption keys from trash bin (development snapshot) 2013-04-28 20:48:29 +02:00
Björn Schießle cb65b7ca9d move encryption keys to trash bin 2013-04-28 20:45:51 +02:00
Jenkins for ownCloud 901e0c598d [tx-robot] updated from transifex 2013-04-28 02:01:38 +02:00
Jenkins for ownCloud 7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02:00
Robin Appelman c05195a46d Dont task external storages with creating their own root 2013-04-26 17:40:31 +02:00
icewind1991 5474fea1f6 Merge pull request #3136 from owncloud/mount-cleanup 
Separation of mount management
 2013-04-26 06:55:21 -07:00
Jenkins for ownCloud 7ea2f785f4 [tx-robot] updated from transifex 2013-04-26 01:58:21 +02:00
Robin Appelman 809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +02:00