Commit Graph

5222 Commits (e620286b253bcd43806fa9deab5e2e67decda582)

Author SHA1 Message Date
Lukas Reschke db1e6b5f3b Use $dir instead of $fullpath 2013-05-06 14:28:01 +07:00
Lukas Reschke b13b19c58b Use the internal ownCloud view 2013-05-06 13:43:23 +07:00
Arthur Schiwon d659d8e193 LDAP: do not reset UUID attribute setting when guid is detected 2013-05-06 10:17:52 +07:00
Jenkins for ownCloud a876240b32 [tx-robot] updated from transifex 2013-05-04 02:00:54 +07:00
Arthur Schiwon 1e2b872160 LDAP: cachekey in set method needs to match with that one from get 2013-05-03 15:13:37 +07: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 +07:00
Jenkins for ownCloud 4f6565d8e7 [tx-robot] updated from transifex 2013-05-03 02:05:10 +07: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 +07: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 +07:00
Michael Gapczynski 04b7a9902d Fix #2816 renaming shared files 2013-05-01 20:29:07 +07:00
Jenkins for ownCloud ee53e7b3d2 [tx-robot] updated from transifex 2013-05-02 02:19:04 +07: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 +07:00
Robin Appelman 4c980b1a14 Set storage id for openstack swift backend 2013-05-01 00:24:34 +07: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 +07: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 +07:00
Lukas Reschke 3a6e39b990 It's a class 2013-04-28 23:28:41 +07:00
Lukas Reschke 003e6adb3f Remove uneeded onclick handler 2013-04-28 23:26:07 +07:00
Lukas Reschke 6cf6103ed2 Move onclick handler 2013-04-28 23:25:58 +07: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 +07: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 +07:00
Florin Peter 26e5ef193d restore fixed 2013-04-28 20:48:30 +07:00
Florin Peter 228c501515 fixed some problems and broken code 2013-04-28 20:48:30 +07:00
Björn Schießle 680ba4bea1 restore encryption keys from trash bin (development snapshot) 2013-04-28 20:48:29 +07:00
Björn Schießle cb65b7ca9d move encryption keys to trash bin 2013-04-28 20:45:51 +07:00
Jenkins for ownCloud 901e0c598d [tx-robot] updated from transifex 2013-04-28 02:01:38 +07:00
Jenkins for ownCloud 7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +07:00
Robin Appelman c05195a46d Dont task external storages with creating their own root 2013-04-26 17:40:31 +07: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 +07:00
Robin Appelman 809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +07:00
Jenkins for ownCloud a0df5903b0 [tx-robot] updated from transifex 2013-04-25 01:55:56 +07:00
Lukas Reschke 1ee224d8cb Merge pull request #3108 from owncloud/fileactions-order
Files: fix the order fileactions are computed for a file
2013-04-24 10:55:38 +07:00
Jenkins for ownCloud 62b9c88bb9 [tx-robot] updated from transifex 2013-04-24 18:31:36 +07:00
Jenkins for ownCloud 88fd3b088d [tx-robot] updated from transifex 2013-04-24 17:46:20 +07:00
Morris Jobke 637dd685db fix wrong shared icon description
fix #2928

translation of string "Shared" has to be marked as located in "files" for the translation extractor
2013-04-24 16:13:17 +07:00
Robin Appelman ab7fcebeb3 Files: fix the order fileactions are computed for a file 2013-04-24 15:26:36 +07:00
Jenkins for ownCloud a7b4469b2e [tx-robot] updated from transifex 2013-04-24 02:01:20 +07:00
Frank Karlitschek 99cb37a6d1 Merge pull request #3092 from guruz/external_storage_check_for_curl
External Storage: Check for curl in PHP
2013-04-23 09:48:04 +07:00
Bart Visscher c357f7b8cd Merge pull request #3082 from owncloud/ldap_confcache_opt
LDAP: reset user/group-config association only after exists-check, may p...
2013-04-23 09:44:38 +07:00
Markus Goetz 6141b24d96 External Storage: Check for curl in PHP
If no curl is found, disable the storage that needs it.
2013-04-23 12:36:30 +07:00
Jenkins for ownCloud 05ab9d2de7 [tx-robot] updated from transifex 2013-04-23 02:00:31 +07:00
Arthur Schiwon b066c0ff44 LDAP: reset user/group-config association only after exists-check, may performance in some cases 2013-04-23 01:00:27 +07:00