Thomas Müller
0385a62363
Merge pull request #19597 from owncloud/update-license-headers
...
update licence headers via script
2015-10-06 11:18:35 +02:00
Morris Jobke
b519965408
[admin] check for correct PHP memcached module
2015-10-06 08:51:47 +02:00
Thomas Müller
ea72d90617
Merge pull request #19553 from owncloud/properly_format_date_shareview
...
Use DD-MM-YYYY consistently in share sidebar
2015-10-05 22:02:12 +02:00
Morris Jobke
b945d71384
update licence headers via script
2015-10-05 21:15:52 +02:00
Roeland Jago Douma
8c459a895d
Do not remove linkshare if there is none
...
If the password is enforced we can't create a link share right away but
just show the password field. Untoggling the link sharing should not try
to remove the share.
* Added unit test
2015-10-05 21:12:27 +02:00
Thomas Müller
681ab05e4d
Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorter
...
Fix filelist size issues, breadcrumb, multiselect
2015-10-05 09:48:31 +02:00
Roeland Jago Douma
96deeca34d
Use DD-MM-YYYY consistently in share sidebar
...
We used to display the response from the server. Which is in non ISO8601
format. Now this is weird since the datepickers shows us 'DD-MM-YYYY'
once a date is chosen.
Now use momentJS to properly format the date.
* Unit tests updated
2015-10-04 11:38:29 +02:00
Vincent Petry
f135128664
Fix filelist size issues, breadcrumb, multiselect
...
- calculate multiselect header width to exclude scrollbar
- call FileList._onResize() when sidebar is toggled ("appresized"), this
also updates the breadcrumb width
- moved global getScrollBarWidth() to OC.Util namespace
2015-10-02 18:03:48 +02:00
Thomas Müller
ff89824135
Merge pull request #19272 from owncloud/mimetypes-enhanced
...
Introduce a few new mimetypes for code, fix recursive mimetype aliases
2015-10-02 17:50:34 +02:00
Vincent Petry
1562da3691
Focus on share field after first display
2015-10-02 16:39:27 +02:00
Roeland Jago Douma
57ceee13a9
Updated some mimetypes
...
* c++ and cpp now both map to code
2015-10-02 15:28:23 +02:00
Robin McCorkell
aeb20675dd
Allow recursive mimetype aliases
...
application/xml -> text/html -> text/code
2015-10-02 15:28:23 +02:00
Robin McCorkell
cd7aff47e1
Introduce a few new mimetypes for code
2015-10-02 15:28:23 +02:00
Thomas Müller
594a3e4e22
Merge pull request #19523 from owncloud/fix-seconds-ago
...
Fix moment.js "a few seconds ago" with "seconds ago"
2015-10-02 14:11:46 +02:00
Morris Jobke
4b3a5a257f
Fix moment.js "a few seconds ago" with "seconds ago"
...
* fixes #18627
2015-10-02 10:51:51 +02:00
Vincent Petry
5dff9d88cb
Make sure the conflict dialog is loaded before adding conflicts
2015-10-02 09:55:43 +02:00
Thomas Müller
eeac6e2ab1
Merge pull request #19454 from owncloud/ie8-madness-returns
...
[IE8] Fix file type sizes and popover menus in file list
2015-09-30 15:15:38 +02:00
Thomas Müller
67609699bc
Merge pull request #19443 from owncloud/sharedialog-passworderror
...
Fix share link password error
2015-09-30 11:08:04 +02:00
Vincent Petry
dbb6692468
[IE8] Fix filetype icon sizes
...
Added hack that uses a "filter" CSS with explicit URL to fix the "New"
menu by scaling down icons and also fix the folder/filetype icon in the sidebar
by scaling it up.
2015-09-29 18:28:31 +02:00
Olivier Paroz
a1c419dc71
Use Hermite resampling for comparator canvas previews
2015-09-29 16:35:24 +02:00
Vincent Petry
8def1383c8
Fix share link password error
...
- only allow submitting the password once, single request
- display error in tooltip
2015-09-29 15:30:01 +02:00
Thomas Müller
037cce7f05
Merge pull request #19418 from owncloud/fix-parsehashquery
...
Consider both hash params and query when parsing URL
2015-09-29 13:21:34 +02:00
Vincent Petry
71dabc6c13
Consider both hash params and query when parsing URL
2015-09-28 18:37:40 +02:00
Vincent Petry
a823a79f12
Show loading spinner for first fetch of shares
...
Whenever the sidebar first loads shares, show a spinner instead of an
empty content
2015-09-28 15:57:57 +02:00
Thomas Müller
4d8be8822c
Merge pull request #19363 from owncloud/checkboxes-sidebar
...
Restyle checkboxes in sidebar
2015-09-28 10:54:55 +02:00
Hendrik Leppelsack
0ae931ed57
fix sidebar spinner
2015-09-25 20:48:47 +02:00
Hendrik Leppelsack
2ee36dc4de
restyle checkboxes in sidebar
2015-09-25 11:54:26 +02:00
Hendrik Leppelsack
604f5783fd
fix multiselect
2015-09-25 00:51:39 +02:00
Thomas Müller
846b826867
Merge pull request #18517 from owncloud/17753_to_master
...
Fix preview of old file on public upload conflicts
2015-09-24 15:20:00 +02:00
Thomas Müller
d7a923671f
Merge pull request #19305 from owncloud/share-hasusershares
...
Fix ShareItemModel.hasUserShares to only check shares of current item
2015-09-24 14:57:23 +02:00
Vincent Petry
76e30d0df7
Expiration date was always a string
2015-09-24 12:21:19 +02:00
Vincent Petry
0db9b28f3f
Fix ShareItemModel.hasUserShares to only check shares of current item
...
The shares array is based on what the server returns and can contain
share info for parent folders.
hasUserShares is now fixed to ignore parent folders and only checks for
shares on the current item.
2015-09-23 14:41:13 +02:00
Vincent Petry
6ea27e2b03
Fix parsing int attributes from share.php response
...
Sometimes the attributes returned by share.php are integers but packaged
as strings.
This fix makes sure that such attributes are parsed as integers
2015-09-23 12:16:47 +02:00
Thomas Müller
0c283dc020
Merge pull request #19220 from individual-it/fix_19164
...
re initialize OC.Share.currentShares OC.Share.itemShares
2015-09-23 11:41:20 +02:00
Thomas Müller
53a167eae9
Merge pull request #19279 from owncloud/share-fixbogusentry
...
Fix bogus entry that appears when switching with arrow keys
2015-09-23 11:30:50 +02:00
Hendrik Leppelsack
3f0a870908
implement builder pattern in tipsy shim
2015-09-23 09:27:44 +02:00
Vincent Petry
03ca76f54f
Fix bogus entry that appears when switching with arrow keys
2015-09-22 17:16:20 +02:00
Lukas Reschke
4201f59402
Update mimetypes
2015-09-22 16:43:29 +02:00
Individual IT Services
976942bb61
re initialize OC.Share.currentShares OC.Share.itemShares
...
otherwise old values are kept.
fix for #19164
2015-09-21 17:01:50 +05:45
Hendrik Leppelsack
964cfc8e08
fix missing checkboxes in file comparator
2015-09-21 12:57:34 +02:00
Olivier Paroz
04b14df35c
Fix preview of old file on public upload conflicts
2015-09-20 12:38:21 +02:00
Olivier Paroz
9776d60b57
Typo
2015-09-19 10:34:19 +02:00
Thomas Müller
08ae1e8183
Merge pull request #19008 from owncloud/jquery_avatar_tests
...
JS tests for jquery.avatar
2015-09-18 17:31:18 +02:00
Hendrik Leppelsack
7c80c8e484
fix missing checkboxes in share dialog
2015-09-17 16:25:10 +02:00
Vincent Petry
6141ea12b1
Port share.css styles to the sidebar panel
2015-09-16 07:23:29 +02:00
Vincent Petry
36e452a472
Fix cruds button in share dialog
...
Only toggle the current row
2015-09-16 07:23:29 +02:00
Vincent Petry
02d68d0613
Removed obsolete tests
2015-09-16 07:23:29 +02:00
Vincent Petry
f439c07ba9
Fix allow reshare for owner when sharing with self through group
2015-09-16 07:23:29 +02:00
Vincent Petry
996639f4fb
More unit tests for share dialog
2015-09-16 07:23:29 +02:00
Vincent Petry
886f1ed660
Update JS unit tests for share dialog (WIP)
2015-09-16 07:23:29 +02:00
Vincent Petry
41f16e821a
Remove unused/obsoleted OC.Share code
...
The sharing dialog has been moved to ShareDialogView
2015-09-16 07:23:29 +02:00
Vincent Petry
1933bcfa92
Implement email autocomplete for link share
2015-09-16 07:23:29 +02:00
Vincent Petry
62ff78787a
Implement email share link
2015-09-16 07:23:29 +02:00
Vincent Petry
aeee19b3f2
Implement "notify by email" checkbox in share dialog
2015-09-16 07:23:29 +02:00
Vincent Petry
e0a2004f4c
Clear field after adding user
2015-09-16 07:23:28 +02:00
Vincent Petry
06b11dd602
Fix shares list events
...
Some events need preventing default like unshare, but setting
permissions doesn't.
2015-09-16 07:23:28 +02:00
Vincent Petry
e90065881d
Bring back the share icon and update its status
...
Display share icon in file list row.
Update share icon status when the sharing state changed.
2015-09-16 07:23:28 +02:00
Vincent Petry
8194d092e7
Add expiration date handling in share tab
2015-09-16 07:23:28 +02:00
Arthur Schiwon
c2ff2ca982
cleanup
2015-09-16 07:23:28 +02:00
Arthur Schiwon
a0fa7186f5
make permission/cruds checkboxes work
2015-09-16 07:23:28 +02:00
Arthur Schiwon
c7453b4db1
toggle visibility of detailed cruds permissions
2015-09-16 07:23:28 +02:00
Arthur Schiwon
d4bbc062be
cleanup
2015-09-16 07:23:28 +02:00
Arthur Schiwon
a5b0ea031d
make unshare work
2015-09-16 07:23:28 +02:00
Arthur Schiwon
7ae84e0e5c
make 'Allow editing' (aka public upload) checkbox work
2015-09-16 07:23:28 +02:00
Arthur Schiwon
6d832359b6
fix allow upload checkbox appeareance
2015-09-16 07:23:28 +02:00
Arthur Schiwon
9fe6d7c568
implements setting and removing password for link shares, including forced ones
2015-09-16 07:23:28 +02:00
Arthur Schiwon
5dfaa0c82d
mark url on click
2015-09-16 07:23:27 +02:00
Arthur Schiwon
f29b51682b
share and unshare via link (not yet password). also some internal changes to reduce unnecessary rendering
2015-09-16 07:23:27 +02:00
Arthur Schiwon
4c702aa8fd
format groups and remotes in autocomplete list
2015-09-16 07:23:27 +02:00
Arthur Schiwon
258a2e2696
now you even can share
2015-09-16 07:23:27 +02:00
Arthur Schiwon
858a2a4e6c
display expiration info
2015-09-16 07:23:27 +02:00
Arthur Schiwon
ce1b0c650e
show link share
2015-09-16 07:23:27 +02:00
Arthur Schiwon
5dc2c35ce5
fixed set of possible permissions for remote shares
2015-09-16 07:23:27 +02:00
Arthur Schiwon
60abfcdab1
old OC.Share.addShareWith now reimplemented
2015-09-16 07:23:27 +02:00
Arthur Schiwon
44ecdde10d
sharee list view: better handle collections
2015-09-16 07:23:27 +02:00
Arthur Schiwon
5db1db38ef
continue to reimplement sharee list view. still WIP
2015-09-16 07:23:27 +02:00
Arthur Schiwon
c17d022ca4
started to implement sharee list view. not completed yet, do not cry please.
2015-09-16 07:23:27 +02:00
Arthur Schiwon
f62a3be590
cleanup
2015-09-16 07:23:26 +02:00
Arthur Schiwon
755d4016b1
set default value and remove now superflous method
2015-09-16 07:23:26 +02:00
Arthur Schiwon
f2fb20ed1c
no auto-fetch in model
2015-09-16 07:23:26 +02:00
Arthur Schiwon
fdb95613e9
simplification, and throwing where throwing is needed
2015-09-16 07:23:26 +02:00
Arthur Schiwon
6af6024e17
integraton noshare part into ShareDialogLinkShareView
2015-09-16 07:23:26 +02:00
Arthur Schiwon
8f3884145e
less stupid initalization of subviews
2015-09-16 07:23:26 +02:00
Arthur Schiwon
ffd4e0dc5a
split off expirationView
2015-09-16 07:23:26 +02:00
Arthur Schiwon
f9c232c4ce
split off linkShareView
2015-09-16 07:23:26 +02:00
Arthur Schiwon
277b786886
ShareDialogResharerInfoView improvements
2015-09-16 07:23:26 +02:00
Arthur Schiwon
dcb084a617
split ShareDialogResharerInfoView from base view
2015-09-16 07:23:26 +02:00
Arthur Schiwon
1bd6942be7
show tooltips and load avatar
2015-09-16 07:23:25 +02:00
Arthur Schiwon
e3fd96fa8e
improve doc
2015-09-16 07:23:25 +02:00
Arthur Schiwon
a57ff13a23
move remaining global settings to configModel
2015-09-16 07:23:25 +02:00
Arthur Schiwon
83d91ddf20
further work on reimplementing the dialog layout
2015-09-16 07:23:25 +02:00
Arthur Schiwon
b015eff2e9
improve reshare rendering part and move permission calculation to model
2015-09-16 07:23:25 +02:00
Arthur Schiwon
97b5fe0b1e
switch to async item loading, take care stuff is updated subsequently
2015-09-16 07:23:25 +02:00
Arthur Schiwon
e6edc3e05d
make loadItems work async if a callback is provided
...
not beautiful, but good enough. share.js will not be around too much longer.
2015-09-16 07:23:25 +02:00
Arthur Schiwon
7971bc1ac0
model now extends Backbone's model and isadjusted
2015-09-16 07:23:25 +02:00
Arthur Schiwon
1651b8212c
started to port the Model to Backbone`s
2015-09-16 07:23:25 +02:00
Arthur Schiwon
ea6e380efe
remove possibly unreliable code and fix JSdoc
2015-09-16 07:23:25 +02:00
Arthur Schiwon
e7b5921206
share dialog view takes advantage of OC.Backbone.View
2015-09-16 07:23:25 +02:00
Arthur Schiwon
edd163a611
refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability
2015-09-16 07:23:25 +02:00
Lukas Reschke
f2d63d3518
Disable automatic evaluation of responses
...
If a response to a $.ajax() request returns a content type of "application/javascript"
JQuery would previously execute the response body. This is a pretty unexpected
behaviour and can result in a bypass of our Content-Security-Policy as well as
multiple unexpected XSS vectors.
2015-09-15 11:42:13 +02:00