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
Morris Jobke
57ef089aac
drop allowZIPdownload and maxZIPSize as options
2014-06-02 16:29:03 +02:00
Jan-Christoph Borchardt
3b4004f9e5
more subtle hover effect on sortable column, text instead of background
2014-06-02 16:23:22 +02:00
Vincent Petry
d677e3860d
Added unit tests for share.js and share icon
2014-06-02 15:59:06 +02:00
Jan-Christoph Borchardt
a447caf8d3
fix misalignment of modified dates, shift to right
2014-06-02 15:55:49 +02:00
Frank Karlitschek
51602f67e0
Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav
...
fully translatable user_webdav
2014-06-02 15:53:18 +02:00
Jan-Christoph Borchardt
708758f34e
remove unused table sizing CSS
2014-06-02 15:52:57 +02:00
Morris Jobke
5d457dafc1
display "<1 kB" for really small files
...
* added parameters for humanFileSize to trigger that behaviour
* add unit tests for that
2014-06-02 15:33:09 +02:00
Bjoern Schiessle
b16b17f920
ceanup encryption code, improved return codes
2014-06-02 13:15:11 +02:00
Vincent Petry
7961d4a87e
Update share action text to display owner/recipients
...
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
2014-06-02 12:12:57 +02:00
Arthur Schiwon
f0e69b2b99
Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579
...
LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs
get the correct version number for compare -.-
bump version and don't overwrite values on next update if not necessary
simpler and better readable assignment
2014-06-02 12:08:01 +02:00
Jenkins for ownCloud
d39216c5e7
[tx-robot] updated from transifex
2014-06-02 01:54:37 -04:00
Jenkins for ownCloud
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
Jenkins for ownCloud
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
Thomas Müller
5dd3e34f57
Merge pull request #8444 from owncloud/cleanup-list-code
...
Cleanup code of files_sharing/ajax/ a little bit
2014-05-30 22:40:28 +02:00
Lukas Reschke
b7f163a701
Merge pull request #8695 from owncloud/jserrorfixes
...
Fixed undefined object error that appears after a delay
2014-05-30 17:20:09 +02:00
Vincent Petry
c8a19adc3a
Merge pull request #8779 from owncloud/sel-webdav-onclick
...
select webdav address on click
2014-05-30 17:18:54 +02:00
Lukas Reschke
756b158230
Merge pull request #8663 from owncloud/files-dndissue
...
Fixed drag and drop from external files, added tests
2014-05-30 16:28:20 +02:00
Volkan Gezer
d7e63d8fab
select webdav address on click
2014-05-30 15:39:25 +02:00
icewind1991
2ba5701b1a
Merge pull request #8778 from owncloud/storage-instanceof
...
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
Vincent Petry
7fac2b62e9
Fixed warning when file_target is not set
...
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
2014-05-30 12:35:04 +02:00
Vincent Petry
5e4e773446
Removed "Share with" column
2014-05-30 10:06:30 +02:00
Vincent Petry
e084183d1e
Added owner display name in action
2014-05-30 10:06:29 +02:00
Vincent Petry
1d9129eac3
Sharing overview fixes and unit tests
...
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
Vincent Petry
6fbf4d8548
Fix table header colors
...
Table headers should be 999 even when using links (introduced by the
sorting feature)
When selecting with checkboxes, they must appear black.
2014-05-30 10:06:29 +02:00
Vincent Petry
0879a63320
Mimetype for sharing overview
2014-05-30 10:06:29 +02:00
Vincent Petry
ef59c69dc8
Distinguish legacy file actions from regular file actions
...
Legacy file actions are registered by legacy apps through
window.FileActions.register(). These actions can only be used by the
main file list ("all files") because legacy apps can only deal with a
single list / container.
New file actions of compatible apps must be registered through
OCA.Files.fileActions. These will be used for other lists like the
sharing overview.
Fixed versions and sharing actions to use OCA.Files.fileActions, which
makes them available in the sharing overview list.
2014-05-30 10:06:29 +02:00
Vincent Petry
fa32243d84
Small fixes to sharing overview
...
- Removed file size from file summary in sharing overview
- Fixed document title
- Fixed empty content text for shared overview
2014-05-30 10:06:29 +02:00
Vincent Petry
06e53b359a
Added "dir" in file actions handler context and fixed versions
...
Added "dir" in file actions handler context so that handlers can know
what the path of the file was without having to look it up from the file
list.
Fixed versions app to use the context.dir instead of the old $('#dir')
element. This makes the versions popup work in the sharing overview.
2014-05-30 10:06:29 +02:00
Vincent Petry
d21b8108c8
Fixed navigation order
2014-05-30 10:06:29 +02:00
Vincent Petry
89ff2857fc
Add unit tests for fileActionsReady
2014-05-30 10:06:29 +02:00
Vincent Petry
8bdce6698c
Added unit test for file action context argument
2014-05-30 10:06:29 +02:00
Vincent Petry
0f105ec747
Removed selection checkboxes
2014-05-30 10:06:29 +02:00
Vincent Petry
85648def56
Fixed sharing permissions
2014-05-30 10:06:29 +02:00
Vincent Petry
60bcdc550e
Fixed file actions for sharing views
...
FileActions can now be clone to be use for separate file list views
without having the side-effect of affecting the main file list view.
Added "Open" action in sharing overview file lists to redirect to the
regular file list when clicking on a folder.
2014-05-30 10:06:29 +02:00
Vincent Petry
279ede33af
Improved FileActions with context
...
A context hash is now passed to file action handlers which makes it
possible to have file list specific file actions.
2014-05-30 10:06:29 +02:00
Vincent Petry
9baf47c2b4
Group shares by type
2014-05-30 10:06:29 +02:00
Vincent Petry
6ebc436505
Added sharing overview page (WIP)
...
- added sharing overview entries in the sidebar
- use OCS Share API to get the list of files
2014-05-30 10:06:29 +02:00
Bjoern Schiessle
dbbb6c5945
extend OCS Share API to allow the user to ask for files shared with him
2014-05-30 10:06:28 +02:00
Jenkins for ownCloud
929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04:00
Lukas Reschke
b14564480e
Merge pull request #8773 from owncloud/l10n-tipsy-delete
...
show delete hint text on hovering trash
2014-05-29 21:30:50 +02:00
Robin McCorkell
32a50563d3
Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager
...
get mount point from mount manager
2014-05-29 17:52:28 +01:00
Robin Appelman
99d46af0b4
Use instanceOfStorage instead of instanceof
2014-05-29 13:52:58 +02:00
Jenkins for ownCloud
368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
Volkan Gezer
b713f15b99
document always links to the current version of OC
2014-05-29 01:30:24 +02:00
Volkan Gezer
43c6ece31a
fully translatable user_webdav
2014-05-29 00:23:23 +02:00
Volkan Gezer
f7cc07ba41
show delete hint text on hovering trash
2014-05-28 20:27:28 +02:00
Bjoern Schiessle
9ed5083efd
get mount point from mount manager
2014-05-28 17:28:31 +02:00
Jenkins for ownCloud
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
Thomas Müller
4e2cdb2f8a
Merge pull request #8713 from owncloud/typo-files-encr
...
fix grammar
2014-05-27 23:03:32 +02:00
Volkan Gezer
8eee8e76d1
forgotten infobox messages translations
2014-05-27 16:39:22 +02:00
Vincent Petry
a9661962fe
Merge pull request #8736 from owncloud/appinfo-newrequirefields
...
App info new fields "requiremin" and "requiremax"
2014-05-27 14:28:47 +02:00
Vincent Petry
d38f867055
Merge pull request #8721 from owncloud/sharing_don_lose_filesize
...
don't lose file size during rename
2014-05-27 12:25:55 +02:00