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

35729 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
f2b2b8d894
import exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 20:12:01 +01:00
Bjoern Schiessle
6e52091c8e
remove unused variable 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 20:11:30 +01:00
Bjoern Schiessle
32dbf32bc5
add new method getSharesInFolder(), see #339 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 20:05:09 +01:00
Bjoern Schiessle
16ec0f2177
add tests for the share-by-mail provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
86b362809b
always show correct place holder, mention share by mail only if the share provider is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
ce08682c2f
enabled by default and add to shipped.json 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
6d7520b1e2
unit tests updated and new added 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
1e930df91f
find and show share-by mail links 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
31c8c38bd6
send mail for share-by-mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
7436e45c91
if we have a exact match, either for the federated cloud id or for the 
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
392c8a115f
unified way to display remote shares and mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
8c8a019b7e
show correct display name if we have the user in one of our address books 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
60a3893ca8
improve search for federated cloud ids and email adresses 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
77f74b9780
handle case if no share-by-mail share provider is loaded 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
318160647a
add method to check if a share provider for a given type is loaded 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:39 +01:00
Bjoern Schiessle
96c40d14a1
update permissions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Bjoern Schiessle
a17c6a485d
add share by mail share provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Bjoern Schiessle
0a6f02801f
introduce share by mail, ui part 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Lukas Reschke
ef467c3195 Merge pull request #339 from nextcloud/share-types-by-folder 
Add getShareTypesInFolder to optimize folder listening
 2016-11-01 18:44:00 +01:00
Roeland Jago Douma
7e2159e9bb
Add defaultShareProvider & federatedshareprovider tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 13:52:37 +01:00
Roeland Jago Douma
d2110ebb0b
Add Manager unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 12:35:50 +01:00
Roeland Jago Douma
fc4d0a86ef
Fix merging backend results 
* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 12:16:05 +01:00
Nextcloud bot
20f45e6fe4
[tx-robot] updated from transifex 2016-11-01 01:06:57 +00:00
Roeland Jago Douma
ce7eb02685
Add remoteprovider getsharesinfolder function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-31 20:26:11 +01:00
Roeland Jago Douma
5a00870a2b
Stricter signature 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-31 20:19:14 +01:00
Lukas Reschke
0eeef26a8e
Add tests for installer method 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 19:39:35 +01:00
Lukas Reschke
1a676bacb4
Remove non-required getter 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 18:45:13 +01:00
Lukas Reschke
086d43f26d
Move to non-static version 
The static version is used nowhere in the code and just decreases coverage

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 18:42:19 +01:00
Lukas Reschke
d805df7bb3
Use findAppInDirectories 
The other function doesn't work if the appstore is disabled

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:30:02 +01:00
Lukas Reschke
a68595742b
Proxy images through usercontent.apps.nextcloud.com 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:47 +01:00
Lukas Reschke
8acb54aa0b
Add update support 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:47 +01:00
Lukas Reschke
df7fd2b57c
Query the timefactory instead of creating it 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:46 +01:00
Lukas Reschke
3e6dd86ee4
Add support for CRL 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:46 +01:00
Lukas Reschke
0e2aee2be6
Replace with exception instead of boolean return value 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:46 +01:00
Lukas Reschke
01c566883e
%d instead %s 
These are only numbers. THX @nickvergessen

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:46 +01:00
Lukas Reschke
89fc4358ba
Use substr and explode instead of a regex 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:45 +01:00
Lukas Reschke
067fb18670
Read array elements instead of substr 
Otherwise this would break with 11.0.0

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:45 +01:00
Lukas Reschke
ca7f6dec55
Make non-static 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:45 +01:00
Lukas Reschke
8d83e239f3
Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:45 +01:00
Lukas Reschke
32cf661215
Use new appstore API 
This change introduces the new appstore API in Nextcloud.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:44 +01:00
Robin Appelman
3692769b0a
Add getShareTypesInFolder to optimize folder listening 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-10-31 15:55:40 +01:00
Joas Schilling
247b7f37ce
Color the trusted domain to alert the admin a bit more 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-31 12:22:21 +01:00
Hemanth Kumar Veeranki
2b7d63f565 Added Exception catch in case of DB User exists 
Signed-off-by: Hemanth Kumar Veeranki <hemanthveeranki@gmail.com>
 2016-10-31 16:32:22 +05:30
Roeland Jago Douma
357a823457 Merge pull request #1961 from nextcloud/configphp_begone 
Remove config.php for oc.js
 2016-10-31 11:51:20 +01:00
Roeland Jago Douma
e416ee7b74 Merge pull request #1937 from nextcloud/ros-for-notification-message 
Allow rich object strings in messages as well
 2016-10-31 11:51:02 +01:00
Lukas Reschke
6f65189a1c Merge pull request #1952 from nextcloud/deprecated_backgroudjob 
Cleanup deprecated backgroudjob functions
 2016-10-31 11:30:46 +01:00
Roeland Jago Douma
7f30cf9119
Remove config.php for oc.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-31 11:00:39 +01:00
Joas Schilling
54c0501ffa
Type hints already make sure it is an array 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-31 10:37:40 +01:00
Joas Schilling
2c0b5dee19
Allow rich object strings in messages as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-31 10:37:37 +01:00