Commit Graph

8287 Commits

Author SHA1 Message Date
Thomas Müller 961e4e5c7c adjust unit test assert values 2014-06-09 12:44:40 +02:00
Thomas Müller aa38bd2b31 adding PHPDoc 2014-06-09 12:34:35 +02:00
Jenkins for ownCloud e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Morris Jobke e3429b63a2 improve ellipsis of filename for different screen sizes 2014-06-08 17:48:53 +02:00
raghunayyar f3a605230a @jancborchardt's commit for cross browser compatibility of extension. 2014-06-08 15:06:01 +05:30
Jenkins for ownCloud 1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
raghunayyar 09206f8a49 Adds class name to span element inside filename. 2014-06-07 23:54:21 +05:30
raghunayyar d71bb7dbe4 Adds multiple media queries for filename. 2014-06-07 14:23:49 +05:30
Jenkins for ownCloud e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Vincent Petry 506f7adb12 Merge pull request #8925 from owncloud/extstorage-sidebar
Added external storage list in files app
2014-06-06 18:59:37 +02:00
Thomas Müller 647dcce514 Merge pull request #8253 from owncloud/pk-on-all-tables-master
Primary keys on all tables master
2014-06-06 16:40:11 +02:00
Vincent Petry e39e6a5584 Fixed delete button CSS in ext storage list 2014-06-06 15:33:33 +02:00
Vincent Petry 710d017eec Added more columns to ext storage list
Now using system mount and personal mount calls to get the relevant
mount points including backend information.
2014-06-06 15:06:26 +02:00
Vincent Petry a47ef52ae2 Fixed ext storage list sorting 2014-06-06 15:06:26 +02:00
Vincent Petry 01c2c3107a Added external storage list in files app 2014-06-06 15:06:26 +02:00
Jan-Christoph Borchardt 933c05566e Merge pull request #8922 from owncloud/design-controls-transparency
Bugfixes for mobile
2014-06-06 14:52:55 +02:00
Jan-Christoph Borchardt 1a519b851d Merge pull request #8923 from owncloud/app-settings-input
app settings: display input fields at full width
2014-06-06 14:52:23 +02:00
raghunayyar 1d1f958bea Ellipcises too long filenames 2014-06-06 17:30:18 +05:30
Thomas Müller fe8bae31dc adding PK to table encryption
adding auto increment/PK to table files_trash

adding PK to table ldap_user_mapping and ldap_group_members

adding PK to table ldap_group_mapping

truncate permissions table to allow smooth creation of primary key

adding unit test for creating an auto increment column on a table which already contains data

remove unneeded table files_trashsizes

fix unit test

no need to truncate *PREFIX*permissions

On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
Vincent Petry 5cebb6fb9b Merge pull request #4553 from owncloud/update_search_classes
Update search classes
2014-06-06 13:24:16 +02:00
Jan-Christoph Borchardt 08b5f787cc app settings: display input fields at full width 2014-06-06 13:01:24 +02:00
Jörn Friedrich Dreyer 7af67eb630 increase version number of files and migration trigger 2014-06-06 12:28:36 +02:00
Jan-Christoph Borchardt 23c83c076c unify controls bar, remove duplicate from user management 2014-06-06 12:22:09 +02:00
Jörn Friedrich Dreyer a59b5249d3 add more and fix office mimetypes, migrate wrong mimetypes 2014-06-06 12:00:25 +02:00
icewind1991 c47d4ebbac Merge pull request #8666 from owncloud/mount-remove
Support for (re)moving mountpoints
2014-06-06 11:57:43 +02:00
Thomas Müller 289accc31b Merge pull request #8159 from owncloud/mobile-sidebar-swipe
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
Jörn Friedrich Dreyer 2801f0f222 use non static access to search 2014-06-06 11:02:05 +02:00
Vincent Petry b2bae9313d Fixed viewer mode for sidebar swipe 2014-06-06 10:04:28 +02:00
Bjoern Schiessle 0b2ae314c7 check if permissions exists 2014-06-06 09:56:02 +02:00
Robin Appelman 60ea4388ed Limit permissions to share permissions 2014-06-06 09:56:02 +02:00
Bjoern Schiessle 86d7371d0c fix unshareFromSelf() 2014-06-06 09:56:02 +02:00
Bjoern Schiessle 09970e1816 update unit tests and make sure that we return the right permissions for files within a shared folder and for the shared folder itself 2014-06-06 09:56:02 +02:00
Bjoern Schiessle 574de2d91b the mount point always have delete permissions to allow unmount 2014-06-06 09:56:01 +02:00
Bjoern Schiessle ca6631a710 add some tests 2014-06-06 09:56:01 +02:00
Bjoern Schiessle ad5d8d7980 nake sure ti create new db entry when user renames a group share 2014-06-06 09:56:01 +02:00
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 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 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 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
Jenkins for ownCloud ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Jan-Christoph Borchardt 9063a25bb4 slightly widen sidebar to 250px, works better with apps and on mobile 2014-06-05 21:19:28 +02:00
Jörn Friedrich Dreyer 9b63f945e3 decode filename for scrollto 2014-06-05 19:23:44 +02:00
Jan-Christoph Borchardt 990405d6ee fix position of sidebar toggle, fix Files controls position problems 2014-06-05 17:21:49 +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
Arthur Schiwon 928945ec7e fix typo in var name 2014-06-05 16:16:08 +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 e34b51124b Merge pull request #8894 from owncloud/public-share-js-overwrite
Dont overwrite OCA.Sharing
2014-06-05 13:04:30 +02:00
Thomas Müller f955209a5a Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master
table files_trashsizes was still used in some locations -> removed
2014-06-05 13:00:50 +02:00
Robin Appelman 690e0b5070 Dont overwrite OCA.Sharing 2014-06-05 12:52:08 +02:00
Thomas Müller d0eb8f8668 Merge pull request #8880 from owncloud/webdav-read-permissions
Use the permissions exposed by ownCloud for webdav external storages
2014-06-05 11:38:02 +02:00
Bernhard Posselt 844c6c3328 use slide toggle for files app 2014-06-05 11:26:24 +02:00
Vincent Petry e0c4e960d9 Merge pull request #8861 from owncloud/share-overview-linklist
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
Thomas Müller 1c20c72efe Merge pull request #8620 from owncloud/design-navigation-two
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Thomas Müller 6fcd135d0e table files_trashsizes was still used in some locations -> removed 2014-06-05 10:44:32 +02:00
icewind1991 09cc7c2d44 Merge pull request #8862 from owncloud/share-overview-fixmimetype
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00
Thomas Müller ff3ded6cb2 Merge pull request #8852 from owncloud/kill-permissions-master
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller da3974bcb2 - drop permissions table and related code
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Jenkins for ownCloud cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
Thomas Müller c044ff99ce Merge pull request #8724 from owncloud/update-sabre-2.0
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Morris Jobke 7a20d22daa Merge pull request #8824 from owncloud/mail_template_editing_in_webui
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
Robin Appelman 9eb177e8bc Use the permissions exposed by ownCloud for webdav external storages 2014-06-04 18:19:52 +02:00
Thomas Müller a2db53b928 Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
Morris Jobke ca43fba513 Merge pull request #8791 from owncloud/share-overview-sharewithstatus
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Jan-Christoph Borchardt 411e6525b1 remove obsolete position rule from files app 2014-06-04 16:50:55 +02:00
Thomas Müller fc1d6f4c3c fixes during test 2014-06-04 15:01:36 +02:00
Jan-Christoph Borchardt e2e05c4798 adjust controls bar position for removed nav bar 2014-06-04 14:29:46 +02:00
Thomas Müller 76e04027bc Upgrade SabreDAV to 1.8.10
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Vincent Petry 816db7aef1 Fixed wording to "Shared by link" 2014-06-04 11:32:30 +02:00
Vincent Petry c88509902e Fix mime type returning for "shared with others" files
Use "path" instead of "file_target", as the latter is not always set /
reliable.
2014-06-04 11:26:03 +02:00
Vincent Petry b3fdda1751 Added "Shared with link" sidebar section in files app
Added section to only show link shares.

Please note that the filtering is currently done on the client side
which might not be the most efficient way of doing it.
2014-06-04 11:10:11 +02:00
Vincent Petry af6a65cbf3 Do not update action icon recipients for file list
Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.

For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.
2014-06-04 10:48:01 +02:00
Vincent Petry 07f1b263c9 Use recipient display names when updating shares in the UI
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.

The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Thomas Müller 4ab77f90d2 Merge pull request #8662 from owncloud/f-lock
f-lock
2014-06-04 10:26:02 +02:00
Thomas Müller 9e31118675 Merge pull request #8842 from owncloud/ldap_cli_methods
command line tools to see, modify and test existing LDAP configurations
2014-06-04 09:37:04 +02:00
Thomas Müller 86623358f0 Merge pull request #8849 from owncloud/trash_expire_fix
get files in trash from file cache
2014-06-04 09:36:40 +02:00
Thomas Müller 9f3fcf036c fixing typo 2014-06-04 09:36:27 +02:00
Jan-Christoph Borchardt 6b2b903ea6 Merge pull request #8468 from owncloud/remove-infieldlabels
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Thomas Müller 917f389747 workaround to get the unit test going 2014-06-04 08:21:28 +02:00
Jenkins for ownCloud f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
Bjoern Schiessle 2c8288d8f9 get the storage from the view 2014-06-04 07:55:46 +02:00
Bjoern Schiessle 3a698bce6e don't ask for fileInfo if we already have one 2014-06-04 07:55:45 +02:00
Bjoern Schiessle e6712bc12e make sure to close the stream at the end of each test 2014-06-04 07:55:45 +02:00
ringmaster dc1e3620d2 Continued flock work. 2014-06-04 07:55:44 +02:00
ringmaster 5365ae416e flock changes. Work in progress. 2014-06-04 07:55:44 +02:00
Thomas Müller 6764d5b122 Merge pull request #8698 from owncloud/sharing_improve_permissions
get permissions directly from share storage to avoid additional db calls
2014-06-03 19:13:51 +02:00
Thomas Müller 70ae7fa091 Fix casing and PHPDoc 2014-06-03 19:10:18 +02:00
blizzz 21d1e5eccc Merge pull request #7930 from owncloud/fix_7785_master
LDAP: put out fetching of user meta data into a fully tested class of it...
2014-06-03 19:09:33 +02:00
Thomas Müller 8ee15025f0 Fix merge conflict 2014-06-03 19:05:21 +02:00
Jörn Friedrich Dreyer b5a145b297 convert mail template editor to app framework for a restful api 2014-06-03 16:53:03 +02:00
Morris Jobke f87a91fa00 Merge pull request #8837 from owncloud/issue/8720
Fix cursor and background of app navigation
2014-06-03 16:46:04 +02:00
Bjoern Schiessle 05cf34ea1f get files in trash from file cache 2014-06-03 16:45:11 +02:00
Thomas Müller cfc1d5623e Merge pull request #8840 from owncloud/share_settings
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
Jan-Christoph Borchardt 4ef94ddd2e infield label removal: remove last occurences of infield labels 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt 69e5d5b8c0 remove specific sidebar size from Files app 2014-06-03 13:24:44 +02:00
Arthur Schiwon e962999896 get rid of @read in PHP doc after rebase 2014-06-03 13:01:14 +02:00
Arthur Schiwon ba82d80f32 adjust group tests 2014-06-03 12:59:11 +02:00
Arthur Schiwon 3fed96af0e clean up 2014-06-03 12:59:11 +02:00
Arthur Schiwon f9a9085faf class descriptions 2014-06-03 12:59:10 +02:00
Arthur Schiwon 5336e9a156 newlines 2014-06-03 12:59:10 +02:00
Arthur Schiwon d52fbd7e55 adjust test to changed convention in storing quota 2014-06-03 12:59:10 +02:00
Arthur Schiwon 342e1fd3bf port of PR #8038 2014-06-03 12:59:10 +02:00
Arthur Schiwon 11f7823e1b precaution: lowercase string for comparison 2014-06-03 12:59:10 +02:00
Arthur Schiwon e07ebdd7d0 adjust user backend test 2014-06-03 12:59:10 +02:00
Arthur Schiwon e32fa3de4a fix parameter order 2014-06-03 12:59:10 +02:00
Arthur Schiwon b0d1b2557c adjust Access test 2014-06-03 12:59:09 +02:00
Arthur Schiwon 6d64d7ec3f LDAP: put out fetching of user meta data into a fully tested class of its own and update them (mail, quota, etc.) directly after mapping. Fixes #7785 properly on master 2014-06-03 12:59:09 +02:00
Arthur Schiwon 75d320cc91 fix description texts 2014-06-03 12:36:42 +02:00
Arthur Schiwon 4bfb162558 command line tools to see, modify and test existing LDAP configurations 2014-06-03 12:35:18 +02:00
Thomas Müller d3e830e938 Merge pull request #8729 from owncloud/add-phpseclib-master
use phpseclib from 3rdparty
2014-06-03 12:19:04 +02:00
Thomas Müller 17cbfc714a use phpseclib from 3rdparty
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
2014-06-03 12:18:30 +02:00
Joas Schilling 1d0ac9a2c5 Fix tests 2014-06-03 11:45:53 +02:00
Bjoern Schiessle 8e583f55dc set "allow users to send mail notification for shared files default" setting to "no" now that we have the activity app 2014-06-03 11:29:28 +02:00
Vincent Petry 1297b2b883 Multiple fixes to sharing overview
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
2014-06-03 11:04:57 +02:00
Joas Schilling 74e2a4b154 Use active instead of hover for active sidebar option
Fix #8720
2014-06-03 09:57:18 +02:00
Joas Schilling 74c647bb6a Do not overwrite cursor in sidebar 2014-06-03 09:55:50 +02:00
Morris Jobke 7ad7f59162 fix empty file handling option 2014-06-03 09:38:19 +02:00
Jan-Christoph Borchardt 6270902650 Merge pull request #8821 from owncloud/kill-zip-download-restriction
drop allowZIPdownload and maxZIPSize as options
2014-06-03 01:47:40 +02:00
Frank Karlitschek f12a5248a3 Merge pull request #8820 from owncloud/design-details
Design details
2014-06-02 21:26:43 +02:00
Bjoern Schiessle 916f859377 check if it is a share storage 2014-06-02 20:39:20 +02:00
Thomas Müller 2a10e78c58 no need to empty array in a special way 2014-06-02 20:17:40 +02:00
Bjoern Schiessle e0a5f3b570 get permissions directly from share storage to avoid additional db calls 2014-06-02 20:17:40 +02:00
Jörn Friedrich Dreyer 37afab87b5 minimal mail template editor for administrators, refs #7177 2014-06-02 19:22:58 +02:00
Thomas Müller 2bb902d028 use OC_DB::dropTable() 2014-06-02 18:57:53 +02:00
Bjoern Schiessle a7f6a051ad return size '0' if the trashbin folder doesn't exists yet 2014-06-02 18:56:04 +02:00
Bjoern Schiessle 7ad0fee0b5 let file cache handle the versions size 2014-06-02 18:55:13 +02:00
Vincent Petry 640fbc016d Now using shareOwner for the share owner
Makes it consistent with the regular file list fileData
2014-06-02 18:52:31 +02:00
Morris Jobke da090099f4 fix unit tests 2014-06-02 18:39:52 +02:00
Morris Jobke 9a67986473 add OCP\Config:deleteSystemValue 2014-06-02 18:31:43 +02:00
Morris Jobke 390d8e53b4 Merge pull request #8676 from owncloud/encryption_improvements
cleanup encryption code, improved return codes
2014-06-02 18:28:18 +02:00
Vincent Petry 0944565f60 More unit tests and fixes for share 2014-06-02 18:08:56 +02:00
Morris Jobke dd8b7b7af8 Merge pull request #8613 from owncloud/filesize-alignment
Improve aligment of file size
2014-06-02 17:37:53 +02:00
Jan-Christoph Borchardt cd61fb06eb move Deleted Files to bottom of sidebar 2014-06-02 17:33:42 +02:00
Morris Jobke bdfad3440c fix success status symbol to a circle 2014-06-02 17:25:08 +02:00
Morris Jobke 079b709f28 bump version 2014-06-02 16:47:15 +02:00