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

18587 Commits

Author SHA1 Message Date
Robin Appelman ea07f0a18e Fix unit test 2014-06-06 09:56:01 +02:00
Robin Appelman 28615cca9c Fix unit tests 2014-06-06 09:56:01 +02:00
Bjoern Schiessle a5752a8463 fix db query 2014-06-06 09:56:01 +02:00
Robin Appelman e362373a30 Movable storage root can always be moved and deleted 2014-06-06 09:56:01 +02:00
Robin Appelman a432459685 use triple equals 2014-06-06 09:56:01 +02:00
Robin Appelman 42a362f249 Fix phpdoc and comments 2014-06-06 09:56:01 +02:00
Bjoern Schiessle 501f98f084 update share API tests, file shares never have delete permissions 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 9a48e87253 make sure that we have a path relative to data/user/files to work with 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 0ce07bb6c4 update mount point if file_target changed 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 844b1e3fc6 add additional unit tests 2014-06-06 09:56:00 +02:00
Bjoern Schiessle cf5eb0fef5 remove unused variable 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 24f3f6823e get unique_name value directly from the share array 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 5132ae5e69 fix mount point move up if the parent no longer exists 2014-06-06 09:56:00 +02:00
Bjoern Schiessle b0a74edbb2 allow moving files to the root 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 884b9a0ecf bring back updateFileTarget() got lost during last rebase 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 329bfd81c3 remove encryption keys if user unshares a file 2014-06-06 09:55:59 +02:00
Bjoern Schiessle 1b0b977678 remove share mount 2014-06-06 09:55:59 +02:00
Robin Appelman dea5219244 Fix folder name for storage root 2014-06-06 09:55:59 +02:00
Bjoern Schiessle bf5e9357fc don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it 2014-06-06 09:55:59 +02:00
Robin Appelman a66c2e6a47 Fix the removeMount for personal mounts 2014-06-06 09:55:59 +02:00
Robin Appelman 4fbc991ea2 Add the removing logic for mounts 2014-06-06 09:55:59 +02:00
Robin Appelman 14ce44acc8 Move shared mount moving from the storage to the mount 2014-06-06 09:55:59 +02:00
Robin Appelman cabe2873c4 Make personal external mount points (re)movable from the files app 2014-06-06 09:55:59 +02:00
Robin Appelman 8abe1c3f1a Don't do rename hooks for cache when moving the mountpoint 2014-06-06 09:55:58 +02:00
Robin Appelman 60a659c87e Add a system for (re)movable mount points 2014-06-06 09:55:58 +02:00
Thomas Müller 79b65269c9 Merge pull request #8877 from owncloud/getpath-storage-check 
Verify that we have a valid storage in View->getPath
 2014-06-06 09:44:57 +02:00
Thomas Müller d359765bdc Update PHPDoc 2014-06-06 09:44:34 +02:00
Jan-Christoph Borchardt 1745fe1664 Merge pull request #8911 from owncloud/common-lang 
Add Turkish to common languages
 2014-06-06 09:38:10 +02:00
Jenkins for ownCloud ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Volkan Gezer 11a857f653 Add Turkish to common languages 2014-06-05 22:32:35 +02:00
Thomas Müller 70e0ae0637 Merge pull request #8483 from owncloud/encryption_use_oc_preferences 
[encryption] use oc preferences
 2014-06-05 18:54:25 +02:00
Vincent Petry 1c59808517 Merge pull request #8865 from owncloud/improve_share_settings 
Improve share settings
 2014-06-05 17:23:42 +02:00
Thomas Müller e9011a8c55 adding unit tests for encryption data migration 2014-06-05 16:54:04 +02:00
Bjoern Schiessle eb29b2984c use oc_preferences instead of oc_encryption to store encyption settings 2014-06-05 16:54:04 +02:00
Bjoern Schiessle 2d83424a29 allow to set pre-condition for setValue 2014-06-05 16:54:03 +02:00
Thomas Müller 4b650a20a4 Merge pull request #8893 from owncloud/feature/get-users-by-preference 
Add method to get users by their preference
 2014-06-05 16:52:00 +02:00
Thomas Müller 9e84a0a1af Merge pull request #8902 from owncloud/fix_ldap_typo_2 
fix typo in var name
 2014-06-05 16:49:22 +02:00
Arthur Schiwon 928945ec7e fix typo in var name 2014-06-05 16:16:08 +02:00
jbtbnl bb60e850dd Merge pull request #8891 from owncloud/design-emptycontent 
fix size and unbold empty content message
 2014-06-05 16:04:04 +02:00
Robin Appelman 00539cf8f9 Verify that we have a valid storage in View->getPath 2014-06-05 15:50:19 +02:00
Bjoern Schiessle 6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Bjoern Schiessle cf9099c788 This settings doesn't belong together 
Revert "make reshare settings foldable"

This reverts commit c01f196f72.

Conflicts:
	settings/templates/admin.php
 2014-06-05 15:44:56 +02:00
Bjoern Schiessle c991e148a6 improve share settings working 2014-06-05 15:44:55 +02:00
Jörn Friedrich Dreyer 0ce1f34f8a Merge pull request #8897 from owncloud/fix-multiselect 
fix files multiselect bar now that the app list is gone
 2014-06-05 15:32:31 +02:00
Thomas Müller 3dbfd1fe46 Merge pull request #8529 from owncloud/remove-legacy-routing 
Remove legacy routing code
 2014-06-05 15:22:46 +02:00
Joas Schilling d493c0c9ac Sort the result before comparing 2014-06-05 15:21:53 +02:00
Jan-Christoph Borchardt dca5a03f8b fix files multiselect bar now that the app list is gone 2014-06-05 13:23:08 +02:00
Thomas Müller e1beb8c6c3 Merge pull request #8889 from owncloud/mtime-reuse 
Don't update the mtime if the storage mtime hasn't changed
 2014-06-05 13:18:18 +02:00
Vincent Petry bbdcbb9911 Merge pull request #8866 from owncloud/flock-quotafix 
Fixed quota wrapper to return the value from flock()
 2014-06-05 13:11:45 +02:00
Thomas Müller e34b51124b Merge pull request #8894 from owncloud/public-share-js-overwrite 
Dont overwrite OCA.Sharing
 2014-06-05 13:04:30 +02:00