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

11317 commits

Author SHA1 Message Date
Thomas Müller
733673b39d Merge pull request #19365 from owncloud/files-detailsbar-interaction 
Fix sidebar interaction
 2015-09-29 14:44:28 +02:00
Thomas Müller
580a961020 Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabled 
Allow ajax requests on public webdav interface
 2015-09-29 13:21:50 +02:00
Thomas Müller
f2cd334c8a Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeupload 
Show conflict dialog before upload when possible
 2015-09-29 13:17:47 +02:00
Thomas Müller
54b507306a Merge pull request #19409 from owncloud/files-sidebar-hiding-tabs 
Hide sidebar tab headers conditionally
 2015-09-29 13:17:38 +02:00
Jenkins for ownCloud
aa3596a410 [tx-robot] updated from transifex 2015-09-29 01:55:02 -04:00
Robin Appelman
7fa9f29d7f Merge pull request #19408 from owncloud/fix-trashbin-checkbox 
Fix checkbox in trashbin
 2015-09-28 18:27:52 +02:00
Vincent Petry
cc8efaa037 Show conflict dialog before upload when possible 
When uploading files, first check if the files exist in the current file
list. For the ones that do, show a conflict dialog.
For the rest, upload directly.

If the upload operation detects a conflict on the server side, it will
also continue populating the conflict dialog.

From now on, server side conflict can only occur if someone concurrently
uploaded a file into the same folder but the current user hasn't
refreshed the list yet.
 2015-09-28 17:50:11 +02:00
Vincent Petry
d47d240a35 Still show share link when recipient but no share permission 
This makes it possible for the recipient to still trigger the sidebar
and share tab to see information about the share.

In the case where the file is not shared and no permissions exists, no
action icon will be displayed.
 2015-09-28 16:23:33 +02:00
Vincent Petry
f9acf4627e Fix sidebar interaction 
- Clicking a file row or selecting it will open the sidebar.
- When sidebar is open, its contents update with the last selection.
- Dragging doesn't open the sidebar but does update its contents if it was
open already.
- Switching folders closes the sidebar.
- Close sidebar when highlighted file got deleted/removed from list
 2015-09-28 15:23:37 +02:00
Vincent Petry
a8fb0038e9 Hide sidebar tab headers conditionally 
Added canDisplay() in DetailsTabView that should return false if the tab
header of this tab must be hidden
 2015-09-28 14:57:44 +02:00
Hendrik Leppelsack
24ee83db30 fix checkbox in trashbin 2015-09-28 13:45:24 +02:00
Thomas Müller
72024ad201 Merge pull request #19404 from owncloud/files-sidebar-sorttabs 
Fix tabs order in files sidebar
 2015-09-28 12:55:38 +02:00
Thomas Müller
d007c32907 Merge pull request #19402 from owncloud/public-recognizeauthsession 
Allow public webdav auth to recognize sesssion
 2015-09-28 12:53:33 +02:00
Thomas Müller
716ff81b27 Merge pull request #19401 from owncloud/files-actionsorder 
Fix order of actions in the files actions menu
 2015-09-28 12:53:11 +02:00
Vincent Petry
5e4a52d3c2 Fix tabs order in files sidebar 2015-09-28 12:30:12 +02:00
Vincent Petry
b4998e7d29 Allow public auth to recognize sesssion 
When a public link password has been input, its auth is stored in the
session.
This fix makes it possible to recognize the session when using public
webdav from the files UI.
 2015-09-28 11:52:04 +02:00
Thomas Müller
0479cefec3 Merge pull request #18469 from owncloud/ldap-batch-read-attrs-ng 
read all relevant user attributes on login and user search, in one qu…
 2015-09-28 11:44:21 +02:00
Vincent Petry
f35b6833ff Fix order of actions in the files actions menu 2015-09-28 11:19:49 +02:00
Jenkins for ownCloud
60f123193b [tx-robot] updated from transifex 2015-09-28 05:07:18 -04:00
Thomas Müller
9a010cc8ce Merge pull request #19379 from owncloud/remove-auth-button-border 
remove border around button of password protected link confirmation
 2015-09-28 10:13:05 +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
Jan-Christoph Borchardt
c7f7747b48 remove border around button of password protected link confirmation 2015-09-28 09:30:09 +02:00
Olivier Paroz
ff4227bbfc Use a universal shebang 
Fixes #15037
 2015-09-27 13:03:31 +02:00
Olivier Paroz
46475b8114 Switch from Math.floor() to Math.ceil() when sending the dimension to Preview 
Fixes #18203
 2015-09-27 12:46:25 +02:00
Hendrik Leppelsack
0ae931ed57 fix sidebar spinner 2015-09-25 20:48:47 +02:00
Roeland Jago Douma
db02173627 Reflect enabled shareAPI in capabilities 
If the shareAPI is disabled we not return the other sharing
capabilities.

This allows clients to properly check if sharing is even available.
 2015-09-25 20:12:41 +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
Joas Schilling
1694f21387 Add the method to the mock 2015-09-25 11:16:26 +02:00
Hendrik Leppelsack
dba9211d5d fix filecomparator 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
28d3c1cc0b fix filelist checkboxes 2015-09-25 00:51:39 +02:00
Thomas Müller
e7bc2a10e3 Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue 
fix issue with version rollback and thumbnails
 2015-09-24 21:06:27 +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
30377e958f Merge pull request #18834 from owncloud/delay-listen-owner-changes 
Delay listening to owner changes untill we use a share for that owner
 2015-09-24 15:06:27 +02:00
Thomas Müller
594a31d260 Merge pull request #19341 from owncloud/enc_all_improved_messages 
no need to list users if all users already had a key-pair
 2015-09-24 14:51:18 +02:00
Arthur Schiwon
8e57757045 LDAP Wizard: enable/disable test login name button depending on whether a login name is provided or not 2015-09-24 13:33:37 +02:00
Bjoern Schiessle
90f1e3dc94 no need to list users if all users already had a key-pair 2015-09-24 12:47:46 +02:00
Thomas Müller
4621d4ed21 Merge pull request #19313 from owncloud/ext-validate-mount 
Validate storage backend and auth mechanism before mounting
 2015-09-24 11:33:57 +02:00
Thomas Müller
158c962fcc Merge pull request #19307 from owncloud/large-sidebar-preview-resize 
adjust the height of the sidebar preview image when resizing the browser
 2015-09-24 09:44:35 +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
Morris Jobke
8387411b99 Merge branch 'master' into large-sidebar-preview-resize 2015-09-24 08:57:54 +02:00
Arthur Schiwon
002b6bf059 do not throw exception when no attribute is specified 2015-09-23 17:27:40 +02:00
Robin McCorkell
97c4691c05 Unit tests for storage validation in service 2015-09-23 16:00:21 +01:00
Robin McCorkell
2404333300 Perform visibility checks on storages 
StoragesService::getStorages() will check the visibility of the backend
and auth mechanism for the storage, and if either are not visible to the
user (aka disabled by admin) then the storage will be filtered out. The
original method StoragesService::getAllStorages() still exists in case
such storages need to be detected, but its use is discouraged.
 2015-09-23 16:00:11 +01:00
Arthur Schiwon
845485cfe6 adjust to nested group fix 2015-09-23 16:38:39 +02:00
Arthur Schiwon
9d03b7c6b7 read all relevant user attributes on login and user search, in one query. saves us some. 2015-09-23 16:38:39 +02:00
Robin Appelman
7d53427ee6 only initialize once 2015-09-23 16:22:53 +02:00
Robin Appelman
88f03192ba Delay listening to owner changes untill we use a share for that owner 2015-09-23 16:22:53 +02:00
Joas Schilling
19e7a08cbf Do not allow user enumeration if the config is disabled 2015-09-23 15:11:02 +02:00
Robin Appelman
d0ea62a51c adjust the height of the sidebar preview image when resizing the browser 2015-09-23 14:56:13 +02:00