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

4747 commits

Author SHA1 Message Date
Thomas Müller
7db9690096 Merge pull request #19451 from owncloud/ie8-madness 
Fix login page logo + login arrow
 2015-09-30 15:14:28 +02:00
Vincent Petry
42eb2149ad Optipng IE8 logo 2015-09-30 14:51:51 +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
Morris Jobke
1051a3c6f5 Change small thumbnails to 32 px 
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
 2015-09-30 10:49:48 +02:00
Jörn Friedrich Dreyer
db79ba547a Merge pull request #19449 from owncloud/get-rid-of-ugly-previews-in-file-comparator 
Let's get rid of the ugly previews on the left side of the file comparator
 2015-09-30 10:06:12 +02:00
Morris Jobke
1ec2499a0a move IE8 fixes to fixes.css 2015-09-30 09:59:23 +02:00
Jenkins for ownCloud
41129aff80 [tx-robot] updated from transifex 2015-09-30 01:55:43 -04:00
Vincent Petry
97bfc20ac8 [IE8] Fix popover menu borders for IE8 
- fixes "New" menu
- fixes file actions menu
 2015-09-29 18:28:34 +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
Vincent Petry
00623b1c73 [IE8] Rescale PNG icons to 32x32 2015-09-29 18:28:28 +02:00
Vincent Petry
bf2a876094 Fix login arrow in login page 2015-09-29 17:13:10 +02:00
Vincent Petry
e826108b6c Fix IE8 login logo 
Added 175px logo to make it have the same size.
It's only used for IE8.
 2015-09-29 16:57:14 +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
Morris Jobke
5acb38b5b3 [upgrade] switch to debug logging on upgrade 
* resets afterwards
* adds output about the previous log level
 2015-09-29 14:35:32 +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
Thomas Müller
3cd82b8918 Merge pull request #19411 from owncloud/files-sidebar-shareloadspinner 
Show loading spinner for first fetch of shares
 2015-09-29 13:18:04 +02:00
Jenkins for ownCloud
aa3596a410 [tx-robot] updated from transifex 2015-09-29 01:55:02 -04: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
Jenkins for ownCloud
60f123193b [tx-robot] updated from transifex 2015-09-28 05:07:18 -04: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
Thomas Müller
465063e386 Merge pull request #19395 from owncloud/15037-universal-shebang 
Use a universal shebang
 2015-09-28 09:45:34 +02:00
Thomas Müller
77a874ba38 Merge pull request #19378 from owncloud/fix-sharing-autocomplete 
fix name autocomplete not showing on mobile, fix #18551
 2015-09-28 08:48:44 +02:00
Olivier Paroz
ff4227bbfc Use a universal shebang 
Fixes #15037
 2015-09-27 13:03:31 +02:00
Thomas Müller
fe54d76e3d Merge pull request #19380 from owncloud/gallery-icon-visibility 
increase visibility of slideshow controls, fix owncloud/gallery#51
 2015-09-25 23:37:49 +02:00
Thomas Müller
44592ab584 Merge pull request #19383 from owncloud/simplify-upload-icon 
simplify upload icon
 2015-09-25 23:37:19 +02:00
Hendrik Leppelsack
0ae931ed57 fix sidebar spinner 2015-09-25 20:48:47 +02:00
Thomas Müller
787c668b39 Merge pull request #19360 from owncloud/move-filter-method-into-config-object 
Move the filtering of sensitive data to the config class
 2015-09-25 14:05:04 +02:00
Thomas Müller
2c37d5f7d8 Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email 
Publish an activity when sending a share link via email
 2015-09-25 13:48:33 +02:00
Hendrik Leppelsack
2ee36dc4de restyle checkboxes in sidebar 2015-09-25 11:54:26 +02:00
Joas Schilling
faba02564a Move the filtering of sensitive data to the config class 2015-09-25 11:08:33 +02:00
Jan-Christoph Borchardt
0c32eab904 fix name autocomplete not showing on mobile, fix #18551 2015-09-25 18:09:43 +12:00
Hendrik Leppelsack
604f5783fd fix multiselect 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
c23cac3322 fix login 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
ec005fc5d0 add .checkbox class for new checkbox style 2015-09-25 00:51:39 +02:00
Jan-Christoph Borchardt
0566af3a12 increase visibility of slideshow controls, fix @owncloud/gallery#51 2015-09-25 09:58:02 +12:00
Jan-Christoph Borchardt
a5e9301ec0 simplify upload icon 2015-09-25 09:13:23 +12:00
Jan-Christoph Borchardt
43eeb290c1 Revert "Update apps.css (Scroll more smoothly for Webkit browser)" 2015-09-24 18:42:23 +02:00
Thomas Müller
ebdd6d96ce Merge pull request #19306 from owncloud/app-code-check-version 
[App Code Check] add check for version and mandatory fields
 2015-09-24 17:38:48 +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
Morris Jobke
5a3e57c2f5 encode arrays as string 2015-09-24 12:48:44 +02:00
Vincent Petry
76e30d0df7 Expiration date was always a string 2015-09-24 12:21:19 +02:00
Morris Jobke
9b652ed5d5 [App Code Check] add check for version and mandatory fields 
* ref #17598
* including unit tests for mandatory fields/versions
 2015-09-24 11:58:12 +02:00
Thomas Müller
3903ba7ffa Merge pull request #19328 from owncloud/update-shipped-apps-list 
Update the list of shipped apps
 2015-09-24 11:18:11 +02:00
Joas Schilling
2d557b065f Remove user_webdavauth which is now part of user_external 2015-09-24 09:59:14 +02:00
Thomas Müller
13cca93929 Merge pull request #19292 from owncloud/close-icon 
add slight shadow to close icon to make it visible on top of dark images
 2015-09-24 09:44:13 +02:00
Thomas Müller
8c0cf07d2f Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blocker 
Implement the autocomplete blocker from #18341 into the OCS endpoint
 2015-09-24 09:43:37 +02:00
Joas Schilling
82c33aa422 Update the list of shipped apps 2015-09-24 09:28:11 +02:00
Jan-Christoph Borchardt
dada7d0c34 add slight shadow to close icon to make it visible on top of dark images, fix #19291 2015-09-23 21:31:40 +02:00
Jan-Christoph Borchardt
9162cc153e fix wording of other search results to 'in other folders' 2015-09-23 21:31:00 +02:00
Hendrik Leppelsack
7a8cc97831 display checkboxes in ie8 2015-09-23 17:14:02 +02:00
Morris Jobke
6636605ea6 Add option to disable autocomplete in share dialog 2015-09-23 15:06:28 +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
Hendrik Leppelsack
7b19b99e82 add style for disabled checkboxes 2015-09-22 19:13:43 +02:00
Hendrik Leppelsack
bea164274a left align checkboxes in group dropdown 2015-09-22 17:41:32 +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
Joas Schilling
2e1cfe03e9 Publish an activity when sending a share link via email 2015-09-22 13:09:21 +02:00
Bjoern Schiessle
03e05d5dbc improve description and help output for the encrypt-all and decrypt-all command 2015-09-21 16:48:14 +02:00
Thomas Müller
ac8da41ccd Merge pull request #18709 from owncloud/cleanup-login-semantics 
Pushes input inside the bottom group - login.
 2015-09-21 16:08:48 +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
Thomas Müller
8a07cb4a74 Merge pull request #19183 from owncloud/oparoz-sharejs-typo 
Typo
 2015-09-21 10:30:59 +02:00
Thomas Müller
d2e701d74f Merge pull request #19148 from owncloud/issue-19113-stop-setting-single-user-in-constructor 
Do not set single user in constructor of encryption occ commands
 2015-09-21 09:58:38 +02:00
Olivier Paroz
04b14df35c Fix preview of old file on public upload conflicts 2015-09-20 12:38:21 +02:00
Jenkins for ownCloud
bbd1e99605 [tx-robot] updated from transifex 2015-09-20 01:54:48 -04:00
Olivier Paroz
9776d60b57 Typo 2015-09-19 10:34:19 +02:00
Jenkins for ownCloud
c433d48d8e [tx-robot] updated from transifex 2015-09-19 01:55:22 -04: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
Joas Schilling
5472a5f455 Also catch exceptions on encryptAll and reset trashbin and singleUser mode 2015-09-18 15:05:18 +02:00
Joas Schilling
2f102c1f0d Do not set single user in constructor 2015-09-18 08:55:59 +02:00
Thomas Müller
a6ab106b9a Merge pull request #19126 from owncloud/fix-19117 
Fix missing checkboxes in share dialog
 2015-09-18 08:17:19 +02:00
Jenkins for ownCloud
2b21c80335 [tx-robot] updated from transifex 2015-09-18 01:54:55 -04:00
Thomas Müller
c18156a4fe Merge pull request #19121 from owncloud/sidebar-design-details 
fix Files sidebar layout of Versions and Sharing
 2015-09-17 18:03:56 +02:00
Hendrik Leppelsack
7c80c8e484 fix missing checkboxes in share dialog 2015-09-17 16:25:10 +02:00
Jan-Christoph Borchardt
3eeea852b3 fix sidebar Sharing layout a bit 2015-09-17 13:18:03 +02:00
Joas Schilling
82eb3f8027 Fix the singleuser config casing in new encryption code 2015-09-17 08:48:25 +02:00
Jenkins for ownCloud
91365a8969 [tx-robot] updated from transifex 2015-09-17 01:57:20 -04:00
Jenkins for ownCloud
0155bcf278 [tx-robot] updated from transifex 2015-09-17 01:55:25 -04:00
Thomas Müller
7ff12d74d9 Merge pull request #17998 from owncloud/highres_avatar 
Highres avatar in top bar
 2015-09-16 22:03:11 +02:00
Thomas Müller
b049a05384 Merge pull request #18692 from fuhaoshih/patch-2 
Update apps.css (Scroll more smoothly for Webkit browser)
 2015-09-16 14:17:16 +02:00
Thomas Müller
4d77fac191 Merge pull request #19048 from owncloud/details-icon 
add details icon for file actions dropdown
 2015-09-16 13:56:30 +02:00
Jan-Christoph Borchardt
7144832906 adjust navigation text opacity, fix #19016 2015-09-16 10:26:29 +02:00
Thomas Müller
afc7eeacaf Merge pull request #18185 from owncloud/share-dialog-files-sidebar 
Share dialog files sidebar
 2015-09-16 09:40:53 +02:00
Jan-Christoph Borchardt
d2d4cbc23e fix checkbox images 2015-09-16 09:06:05 +02:00
Hendrik Leppelsack
88bc478055 use label:before instead of label 2015-09-16 09:06:05 +02:00
Raghu Nayyar
7ccd02ec95 Fixes white and black checkboxes in core, files will be next. 2015-09-16 09:06:05 +02:00
Jan-Christoph Borchardt
a7b27433ef add white versions of custom checkboxes 2015-09-16 09:06:05 +02:00
Raghu Nayyar
7be8984fd9 Adds background image for checkboxes 2015-09-16 09:06:05 +02:00
Jan-Christoph Borchardt
99238a5a42 custom checkbox style 2015-09-16 09:06:04 +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