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

13644 commits

Author SHA1 Message Date
Vincent Petry
9264674b36 Merge pull request #24514 from owncloud/federation-psr4 
Move federation app to PSR-4
 2016-05-23 09:52:38 +02:00
Vincent Petry
5ba1add03c Merge pull request #24603 from owncloud/federated_reshare 
flat federated re-share
 2016-05-23 09:52:13 +02:00
Joas Schilling
54f8822670
Fix unit tests 2016-05-23 09:03:48 +02:00
Joas Schilling
c9fda84841
Make the root collection neutral so it does not only work for files 2016-05-23 09:03:48 +02:00
Joas Schilling
3a8e537946
Remove unused UserFolder 2016-05-23 09:03:47 +02:00
Jenkins for ownCloud
357d342467 [tx-robot] updated from transifex 2016-05-23 01:55:10 -04:00
Jenkins for ownCloud
88328000b1 [tx-robot] updated from transifex 2016-05-22 01:56:56 -04:00
Vincent Petry
6934840083 Merge pull request #24307 from owncloud/systemtags-perminterface 
Add interface methods for permission check for system tags
 2016-05-21 19:06:54 +02:00
Jenkins for ownCloud
bca7586574 [tx-robot] updated from transifex 2016-05-21 01:55:53 -04:00
Pellaeon Lin
72ac5dd8a1 Make entire file tr droppable, 
so that .canDrop will highlight the entire row when drag hover
 2016-05-21 12:54:29 +08:00
Pellaeon Lin
d3ff3c589b Add visual cue when moving draggable item over droppable item, 
ie. breadcrumb and filenameTd
 2016-05-21 12:54:29 +08:00
Björn Schießle
20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self 2016-05-20 21:15:16 +02:00
Björn Schießle
bc8f659d06
add missung return value 2016-05-20 21:15:16 +02:00
Björn Schießle
06b6e2bff5
improved error messages 2016-05-20 21:15:16 +02:00
Björn Schießle
e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app 2016-05-20 21:15:16 +02:00
Björn Schießle
92fa0c7dfd
fall back to old re-sharing behaviour in case the remote server doesn't support flat-reshares 2016-05-20 21:15:16 +02:00
Björn Schießle
2dc26aada7
update share permissions 2016-05-20 21:15:15 +02:00
Björn Schießle
7b25839bd5
use share initiator as fall back to access the file 
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
 2016-05-20 21:15:15 +02:00
Björn Schießle
81e3787f9c
close cursor after select to avoid db lock 2016-05-20 21:15:11 +02:00
Björn Schießle
d23df4cba7
create re-share by owner and propagate unshare and unshare-from self request 
correctly accross share owner and share initiator
 2016-05-20 21:15:11 +02:00
Björn Schießle
8f87e1104d
use query builder for getShare and add tests 2016-05-20 21:15:11 +02:00
Björn Schießle
5a1641bed2
move request handler for federated shares to the federated sharing app 2016-05-20 21:15:08 +02:00
Piotr Filiciak
9999e05660
Http Range requests support in downloads 
Http range requests support is required for video preview
 2016-05-20 18:16:44 +02:00
Vincent Petry
66e93561da
Rename "not-assignble" to "restricted" 2016-05-20 17:56:02 +02:00
Vincent Petry
5963128342
Adjust DAV SystemTagPlugin unit tests for groups 2016-05-20 17:56:02 +02:00
Vincent Petry
91d4249ed8
Fix system tags DAV plugin tests 2016-05-20 17:56:02 +02:00
Vincent Petry
10fae3994a
Fix system tag update code 2016-05-20 17:56:02 +02:00
Vincent Petry
d7727cdc74
Add admin-only system tag groups property 
For setting/getting system tag groups
 2016-05-20 17:56:02 +02:00
Vincent Petry
88740f035d
Act on effective system tag canAssign permission 
Whenever the server returns true for the can-assign Webdav property of
a system tag, it means the current user is allowed to assign,
regardless of the value of user-assignable.

This commit brings the proper logic to the web UI to make it possible
for users to assign when they have the permission.
 2016-05-20 17:56:02 +02:00
Vincent Petry
03d32bc39b
Fix system tags DAV unit tests 2016-05-20 17:56:02 +02:00
Vincent Petry
bede872dbc
Bring back admin permissions to change system tag permissions 2016-05-20 17:56:02 +02:00
Vincent Petry
09b3883d9c
Updated canUser* functions in SystemTagManager to accept objects 2016-05-20 17:56:02 +02:00
Vincent Petry
8343cfb64b
Add interface methods for permission check 
Instead of checking for admin perm, use interface method
canUserAssignTag and canUserSeeTag to check for permissions.
Allows for more flexible implementation.
 2016-05-20 17:56:02 +02:00
Arthur Schiwon
2b30136ae9
ensure comments-href returns a value also when propfind is done against remote.php/files 2016-05-20 16:22:13 +02:00
Vincent Petry
59a85a4c76 Merge pull request #22576 from owncloud/folder_scroll_fix 
Add scrolling when dragging files. Fixes #12329
 2016-05-20 16:19:01 +02:00
Vincent Petry
e8d082208d
Fixes for encoding wrapper 
Improved label
Fixed rename/copy/moveFromStorage/copyFromStorage and added tests
Improved findPathToUse algo
 2016-05-20 09:33:59 +02:00
Vincent Petry
db4c7fe743
Add encoding wrapper as opt-in mount option 
The encoding wrapper is now only applied when the mount option is set,
disabled by default.
 2016-05-20 09:33:59 +02:00
Vincent Petry
63bbbf29f4
Add wrapper for NFD encoding workaround 2016-05-20 09:33:59 +02:00
Vincent Petry
2ef751b1ec Merge pull request #24702 from owncloud/background-scan-occ 
add --unscanned option to files:scan to triger a background scan
 2016-05-20 09:29:37 +02:00
Jenkins for ownCloud
67162e636e [tx-robot] updated from transifex 2016-05-20 01:54:52 -04:00
Vincent Petry
4728308a9e Merge pull request #24585 from owncloud/files_external_lazy 
Load external storage backends/auth mechanisms lazily
 2016-05-19 18:08:17 +02:00
Robin Appelman
f313105dbd add "unscanned" option to files:scan to triger a background scan 2016-05-19 14:19:09 +02:00
Joas Schilling
320b1c3abf
Fix more failures 2016-05-19 10:11:42 +02:00
Joas Schilling
a6b4ba9ba1
Fix errors in the tests 2016-05-19 09:48:00 +02:00
Joas Schilling
da332c134e
Move federation tests to PSR-4 2016-05-19 09:48:00 +02:00
Joas Schilling
0c727f1755
Move federation code to PSR-4 2016-05-19 09:48:00 +02:00
Jenkins for ownCloud
7ca5b35379 [tx-robot] updated from transifex 2016-05-19 01:54:58 -04:00
Joas Schilling
8dc25321d3
Move FederatedFileSharing to PSR-4 2016-05-18 15:28:50 +02:00
Jenkins for ownCloud
765782445a [tx-robot] updated from transifex 2016-05-18 01:54:53 -04:00
blizzz
8ce8a05dab Fixed dynamic group ldap access (#23450) 
* Fixed dynamic group ldap access

getUserGroups:
Using $userDN instead of $uid to query LDAP
Converting groupDN to group name using API instead of substring
Removing cache processing at the end of the method

* Fixing group handling

added back the cache processing and fixed

* fixed possible indention problem

spaces -> tab conversion

* formatting, white-space changes only
 2016-05-17 23:09:36 +02:00
Fabian
2a7d3dd831 dont update search onResize 
this.updateSearch() sets the current file list instance and clears the box. This is unnecessary and makes the search box unsuable on some mobile devices where a keyboard fade-in causes a onResize trigger, which would then clear and blur the box.
 2016-05-17 22:57:07 +02:00
Roeland Douma
5c9103287f Group fixup (#24621) 
* Move used OC_Group_xx to \OC\Group

* Add (deprecated) legacy wrapper in legacy, OC_Group_xx

* Replace deprecated use of OC_Group_xx with \OC\Group\xx
 2016-05-17 16:06:44 +02:00
Vincent Petry
5585fa0a68 Merge pull request #24630 from owncloud/one-shall-adjust-the-path 
Use proper path
 2016-05-17 10:11:21 +02:00
Jenkins for ownCloud
c24a685ab5 [tx-robot] updated from transifex 2016-05-17 01:54:56 -04:00
Jenkins for ownCloud
bafa02d312 [tx-robot] updated from transifex 2016-05-16 01:54:58 -04:00
Piotr Filiciak
53437ecced Fix: Bugs in shared link with video #24331 2016-05-15 15:41:02 +02:00
Jenkins for ownCloud
7c28f62e20 [tx-robot] updated from transifex 2016-05-15 01:55:34 -04:00
Jenkins for ownCloud
83cd655675 [tx-robot] updated from transifex 2016-05-14 01:56:45 -04:00
Erik Pellikka
5dbb549bbe
added back the jquery animations 2016-05-13 21:01:13 +02:00
Erik Pellikka
4e5f37a05d
code style fix 2016-05-13 21:01:13 +02:00
Erik Pellikka
b94252e479
code style fix 2016-05-13 21:01:13 +02:00
Erik Pellikka
74dfc63b9a
code style fix 2016-05-13 21:01:13 +02:00
Erik Pellikka
d3467edb70
added elseif 2016-05-13 21:01:13 +02:00
Erik Pellikka
45ff21e8d5
fixed to work with share links as well 2016-05-13 21:01:13 +02:00
Erik Pellikka
e7366213f5
typo fix 2016-05-13 21:01:13 +02:00
Erik Pellikka
18b7b61f06
Tweaking 2016-05-13 21:01:13 +02:00
Morris Jobke
5711e88093
Avoids jumping if window is smaller than 300 pixels in height 
* divides the area where the scroll should be triggered by 2
* uses the minimum value of the above and 300
 2016-05-13 21:01:13 +02:00
Erik Pellikka
e03a09d189
Add scrolling when dragging files 2016-05-13 21:01:13 +02:00
Vincent Petry
88da2966b4 Merge pull request #22341 from owncloud/pellaeon-pr-breadcrumb-filelist-overlap-drop 
Handle case when breadcrumb and filelist item overlap and both receive a drop
 2016-05-13 17:12:36 +02:00
Vincent Petry
ddea34f959 Merge pull request #22214 from owncloud/ext-better-dropbox-gdrive 
Direct links to Google Drive/Dropbox configuration pages from external storage config
 2016-05-13 17:09:27 +02:00
Vincent Petry
9cba75ea8a Merge pull request #24605 from owncloud/luckydonald-Superduper-Progressbar-branch-thingie 
Luckydonald superduper progressbar branch thingie
 2016-05-13 10:00:35 +02:00
Jenkins for ownCloud
cba4875e4d [tx-robot] updated from transifex 2016-05-13 02:08:45 -04:00
Vincent Petry
5f6fb45704
Merge branch 'Superduper-Progressbar-branch-thingie' of https://github.com/luckydonald/core into luckydonald-Superduper-Progressbar-branch-thingie 2016-05-12 18:15:54 +02:00
Joas Schilling
b34bacd071 Move Files app to PSR-4 (#24569) 
* Move lib/ of Files app to PSR-4

* Move tests to PSR-4
 2016-05-12 12:07:06 +02:00
Joas Schilling
eea98f1d74 Background jobs from info.xml (#24582) 
* Move background job registration of Federation to info.xml

* Move background registration of Files app to info.xml

* Move background job registration of files_sharing to info.xml

* Move background job registration of files_trashbin to info.xml

* Move background job registration of files_versions to info.xml

* Move background job registration from user_ldap to info.xml
 2016-05-12 10:43:43 +02:00
Joas Schilling
1def89b2c5 Move the testing app to PSR-4 (#24580) 2016-05-12 09:49:37 +02:00
Joas Schilling
b57f3126eb Move files_versions to PSR-4 (#24571) 2016-05-12 09:49:15 +02:00
Joas Schilling
d5dee80580 Move files_trashbin to PSR-4 (#24570) 2016-05-12 09:48:53 +02:00
Joas Schilling
dd9ee10bc0 Move dav app to PSR-4 (#24527) 
* Move Application to correct namespace and PSR-4 it

* Move dav app to PSR-4
 2016-05-12 09:42:40 +02:00
Joas Schilling
4a3311f430 Move Encryption app to PSR-4 (#24524) 
* Move Encryption to PSR-4

* Move encryption tests to PSR-4

* Fix the tests
 2016-05-12 09:42:19 +02:00
Jenkins for ownCloud
c5ae14453a [tx-robot] updated from transifex 2016-05-12 02:08:58 -04:00
Robin McCorkell
8f58b89c3f Add tests for backend/auth mechanism providers 2016-05-11 21:24:53 +01:00
Robin McCorkell
711bc7469a Use backend/auth mechanism providers in files_external 2016-05-11 21:16:31 +01:00
Robin McCorkell
af0930fe59 Introduce backend/auth mechanism providers 
Direct registration of backends/auth mechanisms is now deprecated
 2016-05-11 21:16:26 +01:00
Vincent Petry
ceaac03bb5 Make permalinks work for trashed files (#24537) 
Opening a permalink that points to a trashed file will now display the
file within the "Deleted Files" section in the files web UI.
 2016-05-11 19:41:36 +02:00
Joas Schilling
2a05035339 Move Provisioning api to PSR-4 (#24510) 
* Move app to PSR-4

* Fix setUp method

* Fix the tests
 2016-05-11 19:38:49 +02:00
Thomas Müller
3333c4c0b9 Merge pull request #24568 from owncloud/fix_24566 
Fix etag propegation test race condition
 2016-05-11 16:29:00 +02:00
Roeland Jago Douma
8bfa532075
Fix test race condition 
E-tag propagation replies on the mtime of the file. Order of events:

1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.

Now this goes right often when 1 and 2 happen in the same second.
However imagine

1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)

Now the mtime will be set to the same time. Thus not chaning the etag.
 2016-05-11 14:07:37 +02:00
Christoph Wurst
0486d750aa
use the UID for creating the session token, not the login name 2016-05-11 13:36:46 +02:00
Christoph Wurst
5e55dfb2d6
create session token for DAV clients (sync clients) 2016-05-11 13:36:46 +02:00
Thomas Müller
9eea062004 Merge pull request #24433 from owncloud/user_psr4 
lib/private/user to PSR-4
 2016-05-11 11:16:56 +02:00
Thomas Müller
199b447527
Yo-ho-oh - Murder all band 'o pirates 2016-05-11 09:16:17 +02:00
Jenkins for ownCloud
7da5331782 [tx-robot] updated from transifex 2016-05-11 01:55:55 -04:00
Morris Jobke
e2748e4cbf
fix usage of legacy class in LDAP 2016-05-10 19:53:36 +02:00
Vincent Petry
510724716d Merge pull request #24401 from owncloud/trash-list-cache 
use the cache for trash listing
 2016-05-10 17:12:49 +02:00
Lukas Reschke
e8e72aa910 Merge pull request #24434 from owncloud/permalinks 
Permalinks
 2016-05-10 09:44:50 +02:00
Jenkins for ownCloud
1fb7be42e5 [tx-robot] updated from transifex 2016-05-10 03:30:51 -04:00
Morris Jobke
fdda980c2f Merge pull request #24466 from owncloud/issue_13936_wording_ldap 
wording in LDAP wizard
 2016-05-09 08:27:00 +02:00
Jenkins for ownCloud
10e0fc0629 [tx-robot] updated from transifex 2016-05-09 02:08:23 -04:00
Jenkins for ownCloud
5d35844aff [tx-robot] updated from transifex 2016-05-08 01:54:53 -04:00
Jenkins for ownCloud
956c3f2719 [tx-robot] updated from transifex 2016-05-07 01:54:56 -04:00
Vincent Petry
254576e1f7
Do not encode slashes in "dir" URL param in files JS 2016-05-06 17:00:22 +02:00
Vincent Petry
112b703df0
Add anchor icon in sidebar to copy permalink 2016-05-06 16:46:59 +02:00
Vincent Petry
fdeafef6a0
Auto-add fileid in URL for currently displayed folder 2016-05-06 16:46:59 +02:00
Vincent Petry
093e9dd422
Add route to resolve fileid to files app URL 
The following routes will redirect to the files app and display the
matching folder. If the fileid is a file, it will scroll to it.
- http://localhost/owncloud/index.php/f/$fileid
- http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid
 2016-05-06 16:46:59 +02:00
Vincent Petry
47157bcd76 Merge pull request #24400 from owncloud/cache_shareManager 
Cache shareManager
 2016-05-06 14:25:30 +02:00
Jenkins for ownCloud
6a95af0a4b [tx-robot] updated from transifex 2016-05-06 01:54:56 -04:00
Jenkins for ownCloud
48be0b781a [tx-robot] updated from transifex 2016-05-05 01:55:08 -04:00
davicente
452eeeb344 wording in LDAP wizard 2016-05-04 17:25:44 +01:00
Jenkins for ownCloud
cd7f4ed96f [tx-robot] updated from transifex 2016-05-04 02:11:59 -04:00
Roeland Douma
2e4b41550e Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifications 
Move comments, systemtags and updatenotifications to PSR-4
 2016-05-04 08:03:11 +02:00
blizzz
2fd4f1a775 Merge pull request #24396 from owncloud/ctrlEnter-submit-comment 
Adds functionality to submit comment on ctrl+Enter
 2016-05-03 22:24:17 +02:00
Thomas Müller
4b2544925f Merge pull request #23844 from owncloud/disable-user 
Add occ commands to enable and disable a user + a disabled user can n…
 2016-05-03 15:22:41 +02:00
Lukas Reschke
0d8393178b
Use proper path 
Fixes https://github.com/owncloud/core/issues/24407
 2016-05-03 14:37:50 +02:00
Robin Appelman
435cd31fa6 use the cache for trash listing 2016-05-03 14:36:46 +02:00
Lukas Reschke
df2eb96cc4 Merge pull request #24389 from owncloud/login-by-email 
Allow login by email address
 2016-05-03 13:44:38 +02:00
Robin McCorkell
ac27163f68 Move Dropbox/GDrive link to icon 2016-05-03 11:30:02 +01:00
Robin McCorkell
a09ef66eea Change colour of input fields instead of printing 'Access granted' 2016-05-03 11:30:02 +01:00
Robin McCorkell
43abe2b648 Add links to load GDrive/Dropbox configuration pages 2016-05-03 11:30:02 +01:00
Robin McCorkell
de98a6e54c Allow multiple custom JS files 2016-05-03 11:30:02 +01:00
Vincent Chan
5f2a19e965 fixes indentation 2016-05-03 12:29:43 +02:00
Vincent Chan
bc0d136511 adds functionality to submit comments with cmd+Enter 2016-05-03 12:26:05 +02:00
Thomas Müller
f8c04a4219 Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xml 
Declare cron jobs in info.xml
 2016-05-03 12:03:28 +02:00
Joas Schilling
9ad4a89816
Move comments, systemtags and updatenotifications to PSR-4 2016-05-03 10:20:59 +02:00
Morris Jobke
547830d97e Merge pull request #22989 from owncloud/lock_sharing_ops 
Add locking to modifying operation of the OCS Share API
 2016-05-03 10:15:54 +02:00
Thomas Müller
cc1d948c2e
Add background job declaration of dav app to info.xml 2016-05-03 08:58:12 +02:00
Jenkins for ownCloud
1974ae8da7 [tx-robot] updated from transifex 2016-05-03 01:57:34 -04:00
Roeland Douma
3835d94d41 Merge pull request #24394 from owncloud/cleanup_share_classmap 
Cleanup Files_Sharing CLASSPATH
 2016-05-03 07:40:52 +02:00
Roeland Jago Douma
3c2fee8775
Cache shareManager 
There is no need to call \OC::$server->getShareManager for each Node.
We have it available so better pass it around.
 2016-05-02 22:27:24 +02:00
Vincent Chan
7ac1cb68f6 Submit comment on ctrl+Enter 
closes #24302
 2016-05-02 19:52:13 +02:00
Roeland Jago Douma
354329acf2
Cleanup Files_Sharing CLASSPATH 
* OC\Files\Cache\SharedScanner
* OC\Files\Cache\Shared_Cache
* OC\Files\Cache\Shared_Permissions
* OC\Files\Cache\Shared_Updater
* OC\Files\Cache\Shared_Watcher
* OCA\Files\Share\Maintainer
* OCA\Files\Share\Proxy
 2016-05-02 16:15:40 +02:00
Thomas Müller
b10dcfc3b7
Fixing local event delivery for calendar events based on the email address 2016-05-02 14:20:59 +02:00
Joas Schilling
7bfc617b03
Move activity manager to the namespace 2016-05-02 11:57:24 +02:00
Joas Schilling
b8650be732 Merge pull request #24238 from owncloud/caldav-test-event-in-far-future 
Test an event in the far future
 2016-05-02 10:42:47 +02:00
Roeland Douma
5a62c74495 Merge pull request #24376 from owncloud/remove_dead_code 
Remove dead code
 2016-05-02 09:57:28 +02:00
Morris Jobke
6b12f96b14 Merge pull request #24341 from owncloud/scan-nfd-showwarning 
Add files:scan warning when NFD or incompatible encoding found
 2016-05-02 09:41:12 +02:00
Thomas Müller
8486926a14
Add provisioning api to enable and disable users 2016-05-02 09:31:22 +02:00
Roeland Jago Douma
45d618a133
Remove dead code 
Ancient files_sharing updater code I came across.
 2016-05-02 08:20:42 +02:00
Jenkins for ownCloud
a323111bd1 [tx-robot] updated from transifex 2016-05-02 02:08:49 -04:00
Jenkins for ownCloud
ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Roeland Jago Douma
8a652d1238
Unlock before all returns 2016-04-30 11:34:06 +02:00
Roeland Jago Douma
420b5273b1
There is no need to do old etag propagation 
Etags are calculated differently now and don't require manual updating.
 2016-04-30 10:40:45 +02:00
Roeland Jago Douma
62bc53143e
Add locking to modifying operation of the OCS Share API 
Fixes #17243

This is done in the OCS Share API instead of the share manager since we
want lazy shares in general. However when doing modifying calls via the
OCS Share API it is fine to force real nodes.

* Updated unit tests to work with logging
 2016-04-30 10:32:35 +02:00
Jenkins for ownCloud
023c8b0eac [tx-robot] updated from transifex 2016-04-30 01:55:54 -04:00
Vincent Petry
4326d73ff6
Fix SMB storage to not normalize UTF8 
This makes sure that even if a NFD file name exists, it is found by the
storage and will be visible to higher layers. Even though the file will
be discarded anyway there, it gives the scanner a chance to display a
warning at least.
 2016-04-29 16:19:53 +02:00
Vincent Petry
61203eee04
Add files:scan warning when NFD or incompatible encoding found 2016-04-29 16:18:59 +02:00
Thomas Müller
dda942a917
firstoccurence and lastoccurence have a length now - triggering BIGINT on postgres - refs #24221 2016-04-29 14:57:19 +02:00
Thomas Müller
22ff97256e
Test an event in the far future - refs #24221 2016-04-29 14:57:19 +02:00
Jenkins for ownCloud
1f63e8df61 [tx-robot] updated from transifex 2016-04-29 01:54:56 -04:00
Vincent Petry
6ec835c1da Merge pull request #24287 from owncloud/smb-110 
update icewind/streams to 1.1.0
 2016-04-28 14:08:51 +02:00
Jenkins for ownCloud
ba0099f73a [tx-robot] updated from transifex 2016-04-28 01:55:14 -04:00
Thomas Müller
44709276c0 Merge pull request #22777 from owncloud/encrypt_all_master_key 
improved encrypt-all script
 2016-04-27 09:48:46 +02:00
Jenkins for ownCloud
2b67f87ea8 [tx-robot] updated from transifex 2016-04-27 01:55:59 -04:00
Robin Appelman
1cc17436f7 update icewind/streams to 1.1.0 2016-04-26 15:43:30 +02:00
Thomas Müller
887045b790 Merge pull request #24027 from owncloud/translate_ocs_share 
Translate OCS Share API error messages
 2016-04-26 14:42:18 +02:00
Bjoern Schiessle
d86f8ba5f8
if we don't have a encrypted file key we can return a empty string right away 2016-04-26 11:06:55 +02:00
Bjoern Schiessle
088ffd05d7
don't create a private-/public-key pair for each user if the master key is enabled 2016-04-26 11:06:55 +02:00
Jenkins for ownCloud
14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Thomas Müller
d8f327831e Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator 
LDAP Wizard: reset connection status indicator when switching LDAP co…
 2016-04-25 23:02:23 +02:00
Thomas Müller
f6e1b43a38 Merge pull request #22648 from owncloud/propagate-single 
do propagation in a single query
 2016-04-25 23:01:45 +02:00
Vincent Petry
5e57d3a0b9 Merge pull request #24244 from owncloud/mount-unique 
don't get the config for the same mount multiple times
 2016-04-25 17:42:20 +02:00
Arthur Schiwon
3e26e1ec16
LDAP Wizard: reset connection status indicator when switching LDAP config 2016-04-25 16:24:44 +02:00
Robin Appelman
dbfdc6282a
do propagation in a single query 2016-04-25 16:18:59 +02:00
Thomas Müller
6321596134 Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions 
Fix LDAP race conditions
 2016-04-25 14:55:20 +02:00
Thomas Müller
972ce1fe6e Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement 
Add missing use statement
 2016-04-25 14:46:29 +02:00
Robin Appelman
ca5b189522 add test 2016-04-25 14:28:01 +02:00
Robin Appelman
7e8fd2c639 don't get the config for the same mount multiple times 2016-04-25 14:21:15 +02:00
Joas Schilling
9491d0f65b
Add missing use statement 2016-04-25 13:22:54 +02:00
Lukas Reschke
604b7a49f6 Merge pull request #24230 from owncloud/you-form-of-activities 
Translate the current user with "You ..."
 2016-04-25 12:57:34 +02:00
Vincent Petry
7a22e3f083 Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login 
on clone Connection, do not take over the existing LDAP resource
 2016-04-25 12:38:09 +02:00
Roeland Jago Douma
5e9b618604
Translate OCS Share API error messages 
For https://github.com/owncloud/core/issues/22209
 2016-04-25 11:08:48 +02:00
Joas Schilling
d4c9566cd5
Translate the current user with "You ..." 2016-04-25 10:30:58 +02:00
Björn Schießle
74de72e75e Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app 
move federated sharing settings to the federatedfilesharing app
 2016-04-25 10:19:46 +02:00
Jenkins for ownCloud
dab4633300 [tx-robot] updated from transifex 2016-04-25 01:54:53 -04:00
Jenkins for ownCloud
4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
afce892e9c [tx-robot] updated from transifex 2016-04-23 01:56:02 -04:00
Arthur Schiwon
203b0e9cba
on clone Connection, do not take over the existing LDAP resource 
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
 2016-04-22 21:43:41 +02:00
Thomas Müller
a3813c55da Merge pull request #24124 from owncloud/encryped-size-progation 
dont do optimized size propagation for encrypted files
 2016-04-22 15:23:42 +02:00
Björn Schießle
e10105474f
move federated sharing settings to the federatedfilesharing app 2016-04-22 14:55:40 +02:00
Björn Schießle
606b756a94 Merge pull request #23918 from owncloud/cruds-for-federated-shares 
bring back CRUDS permissions for federated shares
 2016-04-22 14:50:42 +02:00
Thomas Müller
3b3cff4f79 Merge pull request #24151 from owncloud/create-personal-calendar 
Personal calendar should be generated even if the birthday calendar a…
 2016-04-22 11:09:45 +02:00
Jenkins for ownCloud
ded84bf571 [tx-robot] updated from transifex 2016-04-22 01:54:58 -04:00
Thomas Müller
a1da081c62 Merge pull request #24157 from owncloud/files-app-is-not-available-on-public-page 
OCA.Files.App is not available on public page
 2016-04-21 23:21:18 +02:00
Thomas Müller
6e4a28ae86 Merge pull request #24155 from owncloud/fix-birthday_calendar-acl 
Birthday calendar should never have write acl
 2016-04-21 16:49:21 +02:00
Björn Schießle
80959ad95a Merge pull request #24111 from owncloud/chunk-users-in-background-jobs 
Chunk the users correctly in the trashbin and versions background job
 2016-04-21 14:26:41 +02:00
Christoph Wurst
df2a9d1733
OCA.Files.App is not available on public page 2016-04-21 14:23:18 +02:00
Thomas Müller
1d1247069f
Birthday calendar should never have write acl - fixes #24154 2016-04-21 13:36:52 +02:00
Robin Appelman
b7867e9368 Add unit tests for shared size propagation with encryption 2016-04-21 13:13:18 +02:00
Thomas Müller
38c7296867
Personal calendar should be generated even if the birthday calendar already exists - fixes #24082 2016-04-21 12:34:20 +02:00
Vincent Petry
b50d3255fb Merge pull request #22791 from owncloud/enc_master_key_improvements 
Enc master key improvements
 2016-04-21 11:48:26 +02:00
Jenkins for ownCloud
02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Morris Jobke
62a59854f0
Fix LDAP race conditions 
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
  return only non-null values
 2016-04-20 21:50:28 +02:00
Thomas Müller
1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions 
migrate deprecated jQuery 1.x functions
 2016-04-20 20:38:38 +02:00
Thomas Müller
cd01c440a0 Merge pull request #23919 from owncloud/cyclyc-share-dep-example 
SharedStorage to new sharing code + cleanup
 2016-04-20 20:37:27 +02:00
Björn Schießle
e906796f99
ask for share-permissions on propfind 2016-04-20 17:47:32 +02:00
Thomas Müller
34b753baa0 Merge pull request #23952 from owncloud/hide-hidden-files 
Add option to hide hidden files
 2016-04-20 11:58:38 +02:00
Thomas Müller
aa33ab0c03 Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test 
Move the group dummy backend to test
 2016-04-20 11:55:00 +02:00
Thomas Müller
a6676f31ec Merge pull request #24097 from owncloud/fix_23632 
init users mount point before recovery
 2016-04-20 11:54:45 +02:00
Joas Schilling
9ebae0bdeb
Chunk the users correctly in the trashbin and versions background job 2016-04-20 10:36:15 +02:00
Björn Schießle
17eb11cce8 Merge pull request #23915 from owncloud/activity-505-always-stream-for-comments 
Always add activities for comments to the stream
 2016-04-20 10:21:09 +02:00
Björn Schießle
a3381b1d0c
we need to initialize the mount points of the given user before we recover 
access to his files
 2016-04-19 17:04:21 +02:00
Christoph Wurst
e4a8456d01
replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') 2016-04-19 16:20:17 +02:00
Christoph Wurst
6c5696d3a8
filter hidden files on the web interface 
add checkbox to toggle show/hide hidden files

persist show hidden setting

fix settings menu layout

test ApiController::showHiddenFiles

don't show hidden files by default

Store config in Backbone model and inject it into FileList

Filter files only temporarily when rending the file list

Fix file rename validation
 2016-04-19 16:08:56 +02:00
Thomas Müller
5b2ef92eb2 Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user 
Introduce isReadyForUser and verify in file transfer ownership
 2016-04-19 15:56:47 +02:00
Roeland Jago Douma
dd7e0d13e5
Move the group dummy backend to test 
The dummy backend is only used for testing and should thus reside in
tests.
 2016-04-19 15:13:31 +02:00
Christoph Wurst
05d203a989
replace $.parseJSON() by JSON.parse() 2016-04-19 15:06:42 +02:00
Lukas Reschke
a86fd873d6 Merge pull request #24076 from owncloud/fix-initial-calendar-and-addressbook-names 
Fix displayname for initial calendars and address books
 2016-04-19 14:30:35 +02:00
Roeland Douma
0c5f915377 Merge pull request #24054 from owncloud/data_fingerprint 
Add data-fingerprint property
 2016-04-19 14:24:27 +02:00
Roeland Jago Douma
b53d6598f1
Move moveFromCache to CacheJail 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
f27d7cbf99
Move copy- and moveFromStorage to jail 2016-04-19 14:04:00 +02:00
Robin Appelman
2f1c62ce0b
Only construct the storage when we start using it 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
c98fef8a51
Fix resolve path 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
92abb5f23d
Fix tests 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
afa37d363f
Fix related logic 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
6123badbfa
Move SharedStorage et al over to the shareManager and jail 2016-04-19 14:04:00 +02:00
Christoph Wurst
37530f27f0
migrate jQuery.fn.unload() 2016-04-19 12:05:09 +02:00
Jenkins for ownCloud
f812f51c5d [tx-robot] updated from transifex 2016-04-19 01:55:59 -04:00
Thomas Müller
1773dcbef2 Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook 
Move post_removeFromGroup to shareManager
 2016-04-19 06:59:58 +02:00
Thomas Müller
748134bd90
Fix displayname for initial calendars and address books - fixes #24057 2016-04-18 23:08:37 +02:00
Thomas Müller
d0ad8e6e69
Revert "Fix displayname for initial calendars and address books - fixes #24057" 
This reverts commit a5d3e5ed68.
 2016-04-18 23:07:49 +02:00
Thomas Müller
a5d3e5ed68
Fix displayname for initial calendars and address books - fixes #24057 2016-04-18 23:06:38 +02:00
Thomas Müller
1626850fc9
Remove deprecated HTTPHelper 2016-04-18 17:28:10 +02:00
Thomas Müller
5c3183cedd
Move version check code out of class Updater 2016-04-18 17:12:59 +02:00
Roeland Jago Douma
dcb2b37e24
Add data-fingerprint property to webdav 2016-04-18 16:08:11 +02:00
Björn Schießle
52669d0ea3
return correct share permissions on propfind 2016-04-18 12:02:06 +02:00
Björn Schießle
d1d80b4f9e
set correct permissions in shareinfo 2016-04-18 12:02:06 +02:00
Thomas Müller
85d809c0d3 Merge pull request #23268 from owncloud/range-requests-should-not-block-the-session 
Close session for publicwebdav
 2016-04-18 09:23:39 +02:00
Thomas Müller
56a37d315b Merge pull request #24017 from owncloud/share-permissions-namespace 
Move share-permissions property namespace
 2016-04-15 20:12:01 +02:00
Thomas Müller
50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 2016-04-15 15:07:40 +02:00
Thomas Müller
63a385d2b8 Merge pull request #23933 from owncloud/remember-file-sorting 
remember file sort order
 2016-04-15 14:06:21 +02:00
Robin Appelman
baff79cc63 Fix loading the dropbox autoloader 2016-04-15 12:46:47 +02:00
Roeland Jago Douma
0cebb16e7c
Move share-permissions property namespace 
Fixes https://github.com/owncloud/core/issues/23741
 2016-04-15 10:22:18 +02:00
Thomas Müller
b23037ec5c Merge pull request #23998 from owncloud/translate-birthday 
Translate contacts birthday
 2016-04-14 23:41:03 +02:00
C. Montero Luque
5911ce530b Merge pull request #23527 from owncloud/fix-21136 
disable Paged Search when chunksize is set to 0, fixes #21136
 2016-04-14 11:14:19 -04:00
Thomas Müller
55735e1450
Translate contacts birthday - fixes #23982 2016-04-14 16:58:45 +02:00
Morris Jobke
dba08f5fca Merge pull request #23985 from owncloud/ext-fix-namespaces 
Fix namespaces for files_external
 2016-04-14 16:32:01 +02:00
Thomas Müller
068e73cc47 Merge pull request #23975 from owncloud/change-default-calendar-and-contacts-names 
Use better names for the default calendars and addressbooks
 2016-04-14 11:57:43 +02:00
Roeland Douma
411fac892a On mount make sure multiple shares with same target map to unique ones (#23937) 
Scenario:
user0 shares a folder 'foo' with user2
user1 shares a folder 'foo' with user2
user2 logs in

Before: show only the 'foo' from user1

After: show both.

* Added intergration tests
 2016-04-14 11:50:27 +02:00
Robin McCorkell
9a78cac2eb Fix OCA\Files\External\Api namespace 2016-04-14 00:49:47 +01:00
Robin McCorkell
4717605d22 Fix storage backend class namespaces and move to subdir 
All classes that were previously \OC\Files\Storage\FooBar are now
\OCA\Files_External\Lib\Storage\FooBar
 2016-04-14 00:44:28 +01:00
Thomas Müller
439de52534
Remove dav migration for 9.1 2016-04-13 15:53:57 +02:00
Thomas Müller
353449bff7
Use better names for the default calendars and addressbooks - fixes #23720 2016-04-13 15:44:59 +02:00
Roeland Jago Douma
6144ced7a0
Move post_removeFromGroup to shareManager 
The last sharing hook to be moved over.

* Added unit tests
* Removed old tests that relied on old behaviour
* Removed old hooks.php
 2016-04-13 15:00:12 +02:00
Thomas Müller
3c0a1d4241 Merge pull request #20118 from owncloud/chunked-upload-dav 
Initial implementation of the new chunked upload
 2016-04-13 14:37:10 +02:00
Christoph Wurst
576f7244e6 fix default value, update js/php tests 2016-04-13 14:25:23 +02:00
Christoph Wurst
a4683bcfa9 persist file sorting changes 2016-04-13 11:28:42 +02:00
Christoph Wurst
3f492dd826 load file sorting mode from the db 2016-04-13 11:28:42 +02:00
Christoph Wurst
4d02233faa restore selection after re-rendering file rows 2016-04-13 11:20:26 +02:00
Joas Schilling
739542816a Merge pull request #23945 from owncloud/fix_oc_share_permissions 
always return the complete permissions the file was shared with
 2016-04-13 10:20:25 +02:00
Jenkins for ownCloud
a2da7614a0 [tx-robot] updated from transifex 2016-04-13 01:54:59 -04:00
Björn Schießle
499d131a09
always return the complete permissions the file was shared with 2016-04-12 17:56:56 +02:00
Thomas Müller
e21642ca31 Fix unit test of file plugin 2016-04-12 15:51:09 +02:00
Thomas Müller
bb2e68f72b Fix chunk file move 2016-04-12 14:26:42 +02:00
Stefan Weil
16df1c5188 apps: Fix typos (found by codespell) (#23862) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-12 12:52:51 +02:00
Thomas Müller
72f5c539e8 Initial implementation of the new chunked upload - as specified in https://dragotin.wordpress.com/2015/06/22/owncloud-chunking-ng/ 2016-04-12 12:32:04 +02:00
Roeland Douma
495a964ca2 Migrate post_groupDelete hook to share manager (#23841) 
The hook now calls the share manager that will call the responsible
shareProvider to do the proper cleanup.

* Unit tests added

Again nothing should change it is just to cleanup old code
 2016-04-12 09:46:25 +02:00
Joas Schilling
48c41b888c
Always add activities for comments to the stream 2016-04-11 14:57:51 +02:00
Morris Jobke
929a28421a Merge pull request #23798 from owncloud/federated-unshare-background-job 
re-try to send unshare notification if remote server is not available
 2016-04-11 11:13:00 +02:00
Thomas Müller
8652ef28aa Merge pull request #23868 from owncloud/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2016-04-11 10:38:02 +02:00
Thomas Müller
35b8c0dd68 Merge pull request #22615 from owncloud/add-blacklisted-files-to-capabilities 
Add blacklisted_files to capabilities
 2016-04-11 10:10:10 +02:00
Jenkins for ownCloud
c6f65a3c79 [tx-robot] updated from transifex 2016-04-11 01:54:50 -04:00
Thomas Müller
f9683aaf3d Merge pull request #23863 from owncloud/fix_unit_tests 
Fix unit tests warnings
 2016-04-10 21:59:39 +02:00
Thomas Müller
24c2252ff4 Adding VCFExportPlugin 2016-04-10 12:43:15 +02:00
Jenkins for ownCloud
a29e732607 [tx-robot] updated from transifex 2016-04-10 01:54:49 -04:00
Jenkins for ownCloud
e68c4b1d73 [tx-robot] updated from transifex 2016-04-09 12:28:39 -04:00
Scrutinizer Auto-Fixer
3ebeb07a30 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-08 15:11:37 +00:00
Roeland Jago Douma
2c77bfa0d0
Fix dav comments 2016-04-08 15:23:23 +02:00
Roeland Jago Douma
7f4f0b20ad
Fix encryption tests 2016-04-08 15:23:17 +02:00
Roeland Jago Douma
4c9e257b27
Fix filesplugin 2016-04-08 15:23:13 +02:00
Roeland Jago Douma
db0c3bd535
Fix Share20OCSTest 2016-04-08 15:22:49 +02:00
Thomas Müller
6f3eeeeb36 Merge pull request #23510 from owncloud/birthdays-on-shared-addressbooks 
Propagate birthdays of shared addressbooks to the sharee's birthday c…
 2016-04-08 15:19:38 +02:00
Roeland Jago Douma
eda71240e2
Add unit tests for public auth webdav 2016-04-08 14:17:24 +02:00
Roeland Jago Douma
375f6fcab1
Move public webdav auth over to share manager 
The public webdav auth should use the shiny new share manager.
 2016-04-08 14:17:13 +02:00
Bjoern Schiessle
fbd5c28c39 re-try to send unshare notification if remote server is not available 2016-04-08 11:32:04 +02:00
Thomas Müller
6eefea1bb6 Merge pull request #23806 from owncloud/multiline-javascript-strings-for-translations 
Also use Javascript as language in l10n.pl - fixes #13924
 2016-04-07 14:13:37 +02:00
Jan-Christoph Borchardt
be9b685926 Merge pull request #23444 from owncloud/add-loading-spinner 
Add loading spinner to "Add to owncloud"
 2016-04-07 13:52:34 +02:00
Joas Schilling
0de15a86f0 Merge pull request #23773 from owncloud/share_move_delete_user_hook 
Migrate post_userDelete hook to share manager
 2016-04-07 13:01:10 +02:00
Thomas Müller
a5a48ae65c Move some translation stings around to enable xgettext to detect them 2016-04-07 12:59:59 +02:00
Joas Schilling
bba28590b7
Remove xxx from ownCloud we dont want to see that 🙈 2016-04-07 12:18:44 +02:00
Erik Pellikka
73d5889c5d add loading spinner to add to owncloud input field 
Update public.js

Update public.js
 2016-04-07 04:33:46 -04:00
Jenkins for ownCloud
1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
Thomas Müller
dda739c0cc Merge pull request #23501 from owncloud/alarms_for_birthdayevents 
add VALARM for birthday events
 2016-04-06 14:31:07 +02:00
Lukas Reschke
e2ea289943 Merge pull request #23777 from owncloud/ldap-null-user 
Handle case where the user is not known
 2016-04-06 12:58:08 +02:00
Morris Jobke
22898fa107 Use proper shortcut methods in templates 2016-04-06 10:25:04 +02:00
Thomas Müller
01b26d78a0 Merge pull request #23793 from owncloud/hard-code-dav-endpoints 
All webdav endpoints within remote.php are now hardcoded - helps to p…
 2016-04-06 08:34:37 +02:00
Jenkins for ownCloud
fb8c8ef38b [tx-robot] updated from transifex 2016-04-06 01:56:24 -04:00
Thomas Müller
7bdde98617 All webdav endpoints within remote.php are now hardcoded - helps to prevent migration issues like #23610 - furthermore there is no need to dynamically lookup all the endpoints we already know 2016-04-05 09:59:43 +02:00
Robin McCorkell
d47824f4cf Remove any stray socket files before creating new ones 2016-04-05 09:17:21 +02:00
Roeland Jago Douma
db5ea95e29 Add capability to show if group sharing is enabled 
fixes #23477

Now clients can correct wording to properly reflect who a user can share
with.
 2016-04-04 19:35:01 +02:00
Thomas Müller
f6b846584b Handle case where the user is not known - fixes #23759 2016-04-04 16:56:59 +02:00
Joas Schilling
a4dfc7194d Add blacklisted_files to capabilities 2016-04-04 15:00:31 +02:00
Roeland Jago Douma
e0cee43cf0 Migrate post_userDelete hook to share manager 
This makes the post_userDelete hook call the sharemanager. This will
cleanup to and from this user.

* All shares owned by this user
* All shares with this user (user)
* All custom group shares
* All link share initiated by this user (to avoid invisible link shares)

Unit tests are added for the defaultshare provider as well as the
federated share provider
 2016-04-04 14:15:38 +02:00
Thomas Müller
f6cea3c9c4 Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page 
In case of exception we return an html page in case the client is a b…
 2016-04-04 13:51:23 +02:00
Björn Schießle
53c1902706 Merge pull request #23743 from owncloud/issue-23686-files-transferownership-share-unmount 
Unmount the share before deleting it, so we don't try to use it later on
 2016-04-04 11:11:24 +02:00
Joas Schilling
ac330daef2 Inject the Mount Manager 2016-04-04 09:08:55 +02:00
Jenkins for ownCloud
deca08a683 [tx-robot] updated from transifex 2016-04-02 01:55:25 -04:00
Joas Schilling
3dac3a01c5 Unmount the share before deleting it, so we don't try to use it later on 2016-04-01 21:05:55 +02:00
Jenkins for ownCloud
cce6194368 [tx-robot] updated from transifex 2016-04-01 01:56:19 -04:00
Thomas Müller
63b01a3616 Merge pull request #22834 from owncloud/webdav_property_for_share_permissions 
Add sharePermissions webdav property
 2016-03-31 23:18:53 +02:00
Thomas Müller
690eef26dd Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftp 
Add urlencode to username part of ftp and sftp links
 2016-03-31 23:18:10 +02:00