wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19100 commits 157 branches 562 tags 714 MiB
Commit graph

8370 commits

Author SHA1 Message Date
Vincent Petry
58c204abb4 Added JS unit tests for ext storage 
Added JS unit tests for the external storage file list extension.
 2014-06-17 18:29:07 +02:00
icewind1991
8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing 
Add server<->server sharing
 2014-06-17 17:40:05 +02:00
Robin Appelman
07fdeba50b Fix moving movablemount over webdav 2014-06-17 14:10:11 +02:00
Robin Appelman
2219087df6 organize js a bit better 2014-06-17 13:47:36 +02:00
Robin Appelman
f2ebac5c76 Better error handeling in testremote 2014-06-17 13:15:34 +02:00
Robin Appelman
361607c72d testremote is for public access 2014-06-17 13:08:24 +02:00
Morris Jobke
e7365c9507 fix broken buttons for IE8-11 2014-06-17 11:45:55 +02:00
Morris Jobke
17685adb87 fixing layout issue - mostly alignment 2014-06-17 11:24:39 +02:00
Jenkins for ownCloud
ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Robin Appelman
3ed4e5b26b Prevent warning 2014-06-16 16:12:32 +02:00
Robin Appelman
9c2918a626 Fix setupFromToken when a password is set 2014-06-16 16:09:56 +02:00
Robin Appelman
0616eb4007 Fix multiple users having the same external share mountpoint 2014-06-16 15:57:01 +02:00
Bagera
bc65b25303 Aligning in the table header as well 
Aligning the columns and in the rows
 2014-06-16 14:15:55 +02:00
Bagera
28f420b337 Aligning with line height 
Remove "top:" in favour of setting "line-height" and fixing the
resulting problem with the input field being positioned wrongly.
 2014-06-16 14:11:58 +02:00
Bagera
e11abccded Fix delete action height 
Fix #8530 and align the all actions in the row
 2014-06-16 14:11:55 +02:00
Morris Jobke
b75fe439e7 fix CSS for upload button - fixes #8939 2014-06-16 13:51:49 +02:00
Robin Appelman
5b1b6572f7 Make testremote more robust 2014-06-16 13:21:00 +02:00
Robin Appelman
6e06e1da0e Add route which went missing during rebase 2014-06-16 13:20:39 +02:00
Morris Jobke
4fbab3c12d Merge pull request #9040 from owncloud/fix-xss 
Sanitize name of sharee
 2014-06-16 13:13:28 +02:00
Morris Jobke
3069091e61 Merge pull request #9030 from owncloud/default-allow-user-mount-backends 
AllowUserMount defaults now to all backends fixes #7958
 2014-06-16 13:10:01 +02:00
Robin Appelman
a469efb1f1 Add some safety checks 2014-06-16 12:42:28 +02:00
Morris Jobke
0a2c676cda fix camelCase and avoiud re-wrapping $() 2014-06-16 11:35:48 +02:00
Morris Jobke
78b6f59523 fix typo - Backups -> Backends 2014-06-16 11:33:51 +02:00
Vincent Petry
d21845557e Merge pull request #9027 from owncloud/fix-password-saved-share-layout 
fix layout of password protected shares
 2014-06-16 11:11:03 +02:00
Jenkins for ownCloud
ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
Jenkins for ownCloud
4d6fc6f309 [tx-robot] updated from transifex 2014-06-15 01:55:06 -04:00
Lukas Reschke
1066f4ec9a Sanitize name of sharee 
Fixes a XSS introduced with 271684dcfe
 2014-06-14 20:45:10 +02:00
Morris Jobke
06ec82fd68 Fix path 2014-06-14 15:26:27 +02:00
Robin Appelman
9670d3e98b Always send a POST body 2014-06-14 10:22:38 +02:00
Robin Appelman
be93b0d01d Fix permissions functions for webdav external storages 2014-06-14 10:22:38 +02:00
Robin Appelman
4bc8a2550d Fix public share webdav permissions 2014-06-14 10:22:38 +02:00
Robin Appelman
49f9b7ea8e fix modified date for external shares 2014-06-14 10:22:38 +02:00
Robin Appelman
455fbafb48 Fix undefined index error 2014-06-14 10:22:38 +02:00
Bjoern Schiessle
3bf7b54cd5 block server-to-server share if files_external is not activates, can be reverted once we moved to the webdav implementation in core 2014-06-14 10:22:38 +02:00
Bjoern Schiessle
84a651e46d add settings to disable server to server sharing 2014-06-14 10:22:38 +02:00
Robin Appelman
e7b58ed2bd Properly expose read only public shares as read only 2014-06-14 10:14:08 +02:00
Robin Appelman
87e311b996 Fix storage being passed to cache/watcher and scanner when using storage wrappers 2014-06-14 10:14:08 +02:00
Robin Appelman
decb51aee6 Fix deleting of external shares 2014-06-14 10:14:08 +02:00
Robin Appelman
3f2cb39aba Properly set read permissions for webdav storages 2014-06-14 10:14:08 +02:00
Robin Appelman
c8c8106168 generate better storage ids 2014-06-14 10:14:08 +02:00
Robin Appelman
ce0aa7d4a8 Use the movable mount system for external shares 2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b Fix check for shared files inside shares 2014-06-14 10:14:08 +02:00
Robin Appelman
790d51ea1e Fix checking for external share in encryption 2014-06-14 10:14:07 +02:00
Bjoern Schiessle
277f25222a if file doesn't exist, check parent folder 2014-06-14 10:14:07 +02:00
Robin Appelman
2005c162bd Fix prompting for password 2014-06-14 10:14:07 +02:00
Robin Appelman
64ced76beb Save mountpoints relative to the user 2014-06-14 10:14:07 +02:00
Robin Appelman
43c56fcd07 Generate a unique name 2014-06-14 10:14:07 +02:00
Robin Appelman
e6f3850890 Update for changes in master 2014-06-14 10:14:07 +02:00
Bjoern Schiessle
c580aeb455 exclude mounted server-to-server shares from encryption 2014-06-14 10:14:07 +02:00
Bjoern Schiessle
961317d911 make sure to enable incognito mode when mounting a public link and update init status of the encryption app 2014-06-14 10:14:07 +02:00
Robin Appelman
87b0021e56 Scan the entire remote share at once by requesting the full file tree from the remote server 2014-06-14 10:14:07 +02:00
Robin Appelman
30f5b2bd7c Improve detection of whether we're in the files app 2014-06-14 10:13:24 +02:00
Robin Appelman
21ced89beb Dont return false for internalPath 2014-06-14 10:13:24 +02:00
Robin Appelman
a900c7aa94 Fix removing remote shares 2014-06-14 10:13:24 +02:00
Robin Appelman
1c149da52f Support path lengths up to 4000 chars 2014-06-14 10:13:24 +02:00
Robin Appelman
c6a83b2f17 Fix exposing single files over webdav 2014-06-14 10:13:24 +02:00
Robin Appelman
cf5a72c103 Add interface for adding a public share to a different ownCloud instance 2014-06-14 10:13:24 +02:00
Robin Appelman
d7de35376d Add interface for accpeting external shares 2014-06-14 10:13:23 +02:00
Robin Appelman
0156ef8166 Add coments to database and dont use sql keywords as table names 2014-06-14 10:10:38 +02:00
Robin Appelman
a44baaf8eb add remote/add external shares to manager 2014-06-14 10:10:37 +02:00
Robin Appelman
65f3b2fad2 Add server<->server sharing backend 2014-06-14 10:10:37 +02:00
Jenkins for ownCloud
4a26219ecf [tx-robot] updated from transifex 2014-06-14 01:55:24 -04:00
Morris Jobke
86e1d8ca54 AllowUserMount defaults now to all backends fixes #7958 2014-06-13 18:14:41 +02:00
Morris Jobke
fc9787ed64 fix layout of password protected shares 
* add password icon
* fix upshifted arrow button - fixes #9024
 2014-06-13 16:38:42 +02:00
Jörn Friedrich Dreyer
42bf466fa1 move mail template editor from core to standalone templateeditor repo 2014-06-13 12:00:23 +02:00
Jörn Friedrich Dreyer
7e8784c075 access admin settings result message correctly 2014-06-13 11:59:14 +02:00
Morris Jobke
b91db84050 Merge pull request #8714 from owncloud/minor-fixes 
fix some minor issues
 2014-06-13 08:30:57 +02:00
Jenkins for ownCloud
083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
Volkan Gezer
cea2c77fd2 fix some minor issues 2014-06-13 00:16:36 +02:00
Volkan Gezer
565f0b281c some strings to localize external mount api responses. fix #8094 2014-06-12 20:31:07 +02:00
Jörn Friedrich Dreyer
72436b68bf fix liskov substitution principle in admin mail template settings, fixes #8997 2014-06-12 12:38:34 +02:00
Jenkins for ownCloud
55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
Vincent Petry
452b45ed1d Merge pull request #8986 from owncloud/disable_tests 
disable failing tests
 2014-06-11 18:34:35 +02:00
Vincent Petry
75a53b3c49 Merge pull request #8901 from owncloud/permissions-update-cache 
Save the permissions in the filecache if it's not saved yet
 2014-06-11 18:28:55 +02:00
Bjoern Schiessle
4cef7f9d4b disable failing tests 2014-06-11 17:21:57 +02:00
Vincent Petry
491c96eaa9 Merge pull request #8966 from owncloud/fix_failing_tests_on_master 
Fix failing tests on master
 2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Bjoern Schiessle
f4a183e753 wwe no longer have a versions table 2014-06-10 14:47:32 +02:00
Bjoern Schiessle
1d9b4aadbf no need to prepare a statement twice 2014-06-10 14:46:47 +02:00
Jenkins for ownCloud
6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
jbtbnl
b2c86b7a07 Merge pull request #8928 from owncloud/too-long-filename-fix-v2 
Ellipcises too long filenames
 2014-06-09 13:09:18 +02:00
Robin Appelman
a978607011 Use &= 2014-06-09 12:47:00 +02:00
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
d3d0035a9a Use actual file path on rename/delete 
When renaming or deleting a file that is in a subdirectory, performing
the action from the sharing overview or another file list view, the
actual directory of the file must be used instead of the current
directory.
 2014-06-06 15:17:55 +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