Commit Graph

17478 Commits

Author SHA1 Message Date
Thomas Müller 3aee23ee2b Merge pull request #8233 from owncloud/fix-newdialog-ie
fix shift of icons in 'New' menu in IE8/9, fix #7987
2014-04-23 16:17:24 +02:00
Thomas Müller e68aaf1f5b Merge pull request #8284 from owncloud/fix_8280
Adjust renaming of directories with a dot in name
2014-04-23 16:06:50 +02:00
Robin McCorkell c2f7848aeb Adjust renaming of directories, fixes #8280
Directories will not be considered to have an extension, even if a dot is
found.

Stop Scrutinizer being annoyed

But the spaced version looked good!

Stop jsHint being annoyed

These code quality tools are really pestering
2014-04-23 16:04:01 +02:00
Thomas Müller 4ba6f4839d fixing typos and PHPDoc 2014-04-23 15:36:01 +02:00
Robin Appelman e77d89fc4b Revert changes to OC_Connector_Sabre_Server 2014-04-23 14:21:09 +02:00
icewind1991 c8801a41d8 Merge pull request #8324 from owncloud/expired-link-error
Fix error when viewing expired link
2014-04-23 14:13:44 +02:00
Bjoern Schiessle b312d38d38 remove hard-coded shared folder 2014-04-23 12:59:22 +02:00
Bjoern Schiessle 7ef8f6d352 always allow to rename the share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle b102222fed split-up the update script and add unit tests for it 2014-04-23 12:54:26 +02:00
Bjoern Schiessle 93469ca468 make it possible to move files out of a shared mount point 2014-04-23 12:54:26 +02:00
Thomas Müller dd1e47b3b8 typos, use, unused and return fixed 2014-04-23 12:54:26 +02:00
Robin Appelman 2049bedcaf Dont throw an error when a storage isn't found for shared cache 2014-04-23 12:54:26 +02:00
Bjoern Schiessle fb88aba8f4 some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code 2014-04-23 12:54:26 +02:00
Bjoern Schiessle d468cdacf2 add unit tests which got lost during rebase 2014-04-23 12:54:26 +02:00
Bjoern Schiessle 652d417a58 we don't allow to share a folder if it contains a share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle b712393e72 fix etag propagation 2014-04-23 12:54:26 +02:00
Bjoern Schiessle aae22b2d6a update script, create Shared folder and adjust target path for the shares 2014-04-23 12:54:26 +02:00
Bjoern Schiessle bffcbac7a7 allow to rename group share mount points 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 3f6e9e0102 cleanup the shared storage, always keep the whole share resource 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 22e0a4b9a8 external storages: allow to mount a folder called "Shared", it is no longer a reserved name 2014-04-23 12:54:25 +02:00
Bjoern Schiessle c9bd2f7a6c also fetch the etag from file cache 2014-04-23 12:54:25 +02:00
Bjoern Schiessle dfb69e9418 allow user to delete shared files/folders 2014-04-23 12:54:25 +02:00
Bjoern Schiessle d4085d8148 make sure that path is not 'false' 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 33cdd93890 fix deleting of shared files 2014-04-23 12:54:25 +02:00
Bjoern Schiessle bfabd247f4 fix updating of shared files 2014-04-23 12:54:25 +02:00
Bjoern Schiessle a86d97295e fix encryption tests after the removal of the shared folder 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 4c840cb61d fix target generation for group shares 2014-04-23 12:54:25 +02:00
Bjoern Schiessle ed981294f1 fix share api tests 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 27c5a978f9 we no longer need to handle the Shared folder different from any other folder 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 83d6810725 don't overwrite shared folder icon 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 4967435237 show "shared by ..." for share mount point 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 6b19482f3e generate unique target name 2014-04-23 12:54:25 +02:00
Bjoern Schiessle c4e0fb75a4 add api to get shares from a specific user 2014-04-23 12:54:24 +02:00
Bjoern Schiessle 6d87dacad4 fix getMimeType call, we always need to check the source path 2014-04-23 12:54:24 +02:00
Bjoern Schiessle a02fb3722b user should be able to rename/delete shared files if the owner allowed it 2014-04-23 12:54:24 +02:00
Bjoern Schiessle 72bbb9ca20 allow to remove and change mount points 2014-04-23 12:54:24 +02:00
Bjoern Schiessle b02b6d3c23 no exception for the root of the mount point (formerly Shared/), just get the file cache information from the cache 2014-04-23 12:54:24 +02:00
Bjoern Schiessle c377893f0e make sure that we have the right permissions for the mount points 2014-04-23 12:54:24 +02:00
Bjoern Schiessle a27db9e4ca first steps to remove the shared folder:
- mount shares to the root folder instead of "Shared/"
- navigate in shared folder and sub-folders
- show previews
- show correct file permissions
- download/edit files
2014-04-23 12:54:24 +02:00
Bjoern Schiessle cfc52ccc3d add some action items 2014-04-23 12:54:24 +02:00
Robin Appelman 3d0661a1e7 Fix error when viewing expired link 2014-04-23 12:54:18 +02:00
Joas Schilling 704b9e6a0d Merge pull request #8009 from owncloud/feature/add-sharing-target
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-23 12:49:06 +02:00
Thomas Müller 535e6ff71f Merge pull request #7617 from nishiki/cache_user
Cache user
2014-04-23 12:32:30 +02:00
blizzz 97f21712cd Merge pull request #8164 from owncloud/fix-6651
LDAP: fix random resets of filter
2014-04-23 11:09:35 +02:00
Thomas Müller 032f38b230 Merge pull request #8213 from cbojar/master
Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.
2014-04-23 11:05:00 +02:00
Thomas Müller e0cac32442 fixing some JSHint warnings 2014-04-23 10:08:14 +02:00
Thomas Müller dcc48f9b46 Merge pull request #8068 from wakeup/fix-share.php-string-extraction
Make lib/** share.php strings extractable for translation
2014-04-23 09:58:10 +02:00
Thomas Müller 09f72204ee Merge pull request #8315 from owncloud/fix-8294
add uncompressed jquery files - fixes #8294
2014-04-23 09:28:44 +02:00
Thomas Müller f44e5e9791 Merge pull request #8316 from owncloud/add-new-jquery-to-scrutinizer-ignore
Add new jquery files to exclude list
2014-04-23 09:15:28 +02:00
Jenkins for ownCloud 3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00