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

599 commits

Author SHA1 Message Date
Bjoern Schiessle
61485e3e60
fix check for reshare permissions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
ed415726d3
send RESHARE_CHANGE_PERMISSION message 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
2bb1956c1f
implement RESHARE_UNDO notification 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
d77eedd23b
- Don't remove share before all notifications are created, otherwise we miss information necessary to create the notifications 
- Don't send message to owner/sharer about revoked re-shares twice.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
a176a1f318
implement unshare notification 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
fab4e561f4
send reshare over OCM API 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
41a1528888
implement decline share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
8889e14c7c
implement accept share notification 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
bbce8c3ea1
adjust to latest api version 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
db428ea547
send accept share notification (WIP) 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle
a3948e8a12
use new API to send a federated share if possible 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle
21e64ec7f4
implement receiving of federated shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle
5cfe20675d
start implementing federated sharing 2.0 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Nextcloud bot
a6666071be
[tx-robot] updated from transifex 2018-06-27 00:11:52 +00:00
Nextcloud bot
5428cd2f50
[tx-robot] updated from transifex 2018-06-23 00:12:41 +00:00
Nextcloud bot
cad8824a8e
[tx-robot] updated from transifex 2018-06-20 00:12:26 +00:00
Nextcloud bot
5e5671983c
[tx-robot] updated from transifex 2018-06-17 00:12:48 +00:00
Nextcloud bot
84a1c915e6
[tx-robot] updated from transifex 2018-06-15 00:12:49 +00:00
Nextcloud bot
5ecfd80f07
[tx-robot] updated from transifex 2018-06-13 00:12:59 +00:00
Nextcloud bot
d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Nextcloud bot
b34111bfc9
[tx-robot] updated from transifex 2018-06-08 00:12:51 +00:00
Nextcloud bot
9ac36dc30b
[tx-robot] updated from transifex 2018-05-31 00:12:36 +00:00
Nextcloud bot
7df563ee39
[tx-robot] updated from transifex 2018-05-30 00:12:08 +00:00
Nextcloud bot
9e00b51c87
[tx-robot] updated from transifex 2018-05-27 00:13:07 +00:00
Nextcloud bot
f0fdac8078
[tx-robot] updated from transifex 2018-05-26 00:13:01 +00:00
Nextcloud bot
60734cd79d
[tx-robot] updated from transifex 2018-05-25 00:14:54 +00:00
Nextcloud bot
4bbad8f88a
[tx-robot] updated from transifex 2018-05-23 00:15:44 +00:00
Nextcloud bot
514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00
Nextcloud bot
ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Nextcloud bot
5fcb3dd1dc
[tx-robot] updated from transifex 2018-05-12 00:13:00 +00:00
Nextcloud bot
01c21601e8
[tx-robot] updated from transifex 2018-05-10 00:13:09 +00:00
Morris Jobke
d161d4473e
Merge pull request #9029 from nextcloud/settings-restructure 
Restructure server settings
 2018-05-07 12:29:53 +02:00
Nextcloud bot
cc09226564
[tx-robot] updated from transifex 2018-05-06 00:11:39 +00:00
Julius Härtl
2b840250c3
Move documentation link in relation to the heading 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 08:58:24 +02:00
Arthur Schiwon
38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Morris Jobke
093cd01ac2
Fix DI for federated file sharing controller 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 13:49:28 +02:00
Morris Jobke
dd34cb7540
Less deprecated calls to OCP\Util::writeLog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-22 20:41:49 +02:00
Nextcloud bot
7ca526f8ac
[tx-robot] updated from transifex 2018-04-19 00:11:50 +00:00
Roeland Jago Douma
f4fd0224db
Do not use \OCP\DB anymore 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-26 14:40:23 +02:00
Nextcloud bot
64948bf30c
[tx-robot] updated from transifex 2018-03-23 01:11:28 +00:00
Nextcloud bot
615258ba26
[tx-robot] updated from transifex 2018-03-20 01:11:33 +00:00
Nextcloud bot
3cac7911d5
[tx-robot] updated from transifex 2018-03-17 01:11:30 +00:00
Nextcloud bot
055d15e305
[tx-robot] updated from transifex 2018-03-15 01:11:41 +00:00
Roeland Jago Douma
0e48afafed
Merge pull request #8804 from nextcloud/remove_httphelper 
Remove deprecated HTTPHelper
 2018-03-14 09:49:24 +01:00
Nextcloud bot
7f00de841b
[tx-robot] updated from transifex 2018-03-14 01:11:29 +00:00
Roeland Jago Douma
7785c3752f
Remove deprecated HTTPHelper 
* Remove the HTTP Helper
* Remove from Server Containter
* Removed legacy share tests that use it

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 21:54:56 +01:00
Morris Jobke
4cbcf6f920
Remove old code to be compatible with Nextcloud 9 and before 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 14:21:12 +01:00
Nextcloud bot
a20e9d7891
[tx-robot] updated from transifex 2018-03-09 01:12:12 +00:00
Nextcloud bot
6975cef00b
[tx-robot] updated from transifex 2018-03-04 01:12:42 +00:00
Nextcloud bot
3b000d4f91
[tx-robot] updated from transifex 2018-03-03 01:12:14 +00:00
Nextcloud bot
777313db42
[tx-robot] updated from transifex 2018-03-02 01:12:16 +00:00
Nextcloud bot
4b352a345b
[tx-robot] updated from transifex 2018-02-22 01:12:26 +00:00
Nextcloud bot
6591a3bc36
[tx-robot] updated from transifex 2018-02-21 01:12:10 +00:00
Nextcloud bot
667d21ac7d
[tx-robot] updated from transifex 2018-02-18 01:12:03 +00:00
Nextcloud bot
d953db8683
[tx-robot] updated from transifex 2018-02-17 01:12:04 +00:00
Joas Schilling
f095001e4b
Fix info.xml files of shipped apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:24:03 +01:00
Nextcloud bot
01623d4aca
[tx-robot] updated from transifex 2018-02-14 21:37:31 +00:00
Nextcloud bot
ff1b343c4a
[tx-robot] updated from transifex 2018-02-14 01:11:53 +00:00
Nextcloud bot
3fc6d6234e
[tx-robot] updated from transifex 2018-02-13 10:48:27 +00:00
Nextcloud bot
91c67eb667
[tx-robot] updated from transifex 2018-02-12 21:33:37 +00:00
Nextcloud bot
71382daf67
[tx-robot] updated from transifex 2018-02-08 01:10:28 +00:00
Nextcloud bot
b78da27d0a
[tx-robot] updated from transifex 2018-02-01 18:28:02 +00:00
Morris Jobke
eb51f06a3b
Use ::class statement instead of string 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 12:03:47 +01:00
Nextcloud bot
1d8b90b8d3
[tx-robot] updated from transifex 2018-01-29 01:10:53 +00:00
Joas Schilling
c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value 
Return value immediately instead of assigning to a one-time variable
 2018-01-26 10:15:39 +01:00
Morris Jobke
0a56d2185e
Return value immediately instead of assigning to a one-time variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 00:02:03 +01:00
Morris Jobke
4dbee99b7b
Remove useless return statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:50:40 +01:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Morris Jobke
0b464e5274
Merge pull request #7884 from nextcloud/cleanup-oc_user 
Cleanup OC_User and OCP\User
 2018-01-17 05:33:07 +01:00
Roeland Jago Douma
fde1ada916
Fix federatedshareprovidertest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 19:25:08 +01:00
Morris Jobke
55532f19d9
Cleanup OC_User and OCP\User 
* mainly removes deprecated methods and old static code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-16 18:39:11 +01:00
Morris Jobke
fcea6e1564
Merge pull request #7849 from nextcloud/strict_securerandom 
Strict ISecure random
 2018-01-14 21:05:19 +01:00
Roeland Jago Douma
6e1ee1e7a7
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:04:52 +01:00
Roeland Jago Douma
db411f8771
Bump apps 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 11:40:53 +01:00
Morris Jobke
f578b69729
Update composer 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 23:16:10 +01:00
Roeland Jago Douma
0280cff66f
Composer updated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-04 16:31:16 +01:00
Nextcloud bot
298b79410d
[tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
Roeland Jago Douma
49b095b78e
Use proper authorative-autoloader for app autoloaders 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-14 08:31:31 +01:00
Nextcloud bot
8ed728c1a2
[tx-robot] updated from transifex 2017-12-11 01:10:20 +00:00
Nextcloud bot
a684f033bd
[tx-robot] updated from transifex 2017-12-10 01:10:25 +00:00
Nextcloud bot
b6a39b7927
[tx-robot] updated from transifex 2017-11-23 01:09:47 +00:00
Nextcloud bot
6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Nextcloud bot
ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Lukas Reschke
8c915baa34
Merge pull request #6788 from staabm/master 
Prevent XSS in links which open a new browser window
 2017-11-08 18:55:35 +01:00
Nextcloud bot
79c9439c50
[tx-robot] updated from transifex 2017-11-08 01:09:21 +00:00
Nextcloud bot
f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Nextcloud bot
7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Joas Schilling
ce12cd91db
Merge pull request #6875 from nextcloud/app_autoloaders 
Move server apps to dedicated autoloader
 2017-11-01 11:15:27 +01:00
Nextcloud bot
299ef9aa78
[tx-robot] updated from transifex 2017-10-31 01:08:31 +00:00
Morris Jobke
c733cdaa65
Use ::class in test mocks of encryption app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 13:56:56 +02:00
Morris Jobke
06f46bd256 Merge pull request #6939 from nextcloud/class-usage-in-mocks-dav-app 
Use ::class in test mocks of dav app
 2017-10-26 13:26:00 +02:00
Morris Jobke
ab36980d20
Use ::class in test mocks of dav app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 10:16:12 +02:00
Nextcloud bot
c85deacddb
[tx-robot] updated from transifex 2017-10-25 00:08:45 +00:00
Roeland Jago Douma
38d9d394b0
FederatedFileSharing Autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 20:40:12 +02:00
Morris Jobke
43e498844e
Use ::class in test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 17:45:32 +02:00
Nextcloud bot
1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Nextcloud bot
a94976bfc8
[tx-robot] updated from transifex 2017-10-20 00:08:34 +00:00
Markus Staab
db34b59238 Prevent XSS in links which open a new browser window 2017-10-19 12:16:04 +02:00
Nextcloud bot
7c1ba6c00b
[tx-robot] updated from transifex 2017-10-13 00:08:27 +00:00
Nextcloud bot
564d1b1789
[tx-robot] updated from transifex 2017-10-10 00:08:31 +00:00
Nextcloud bot
95ec247d10
[tx-robot] updated from transifex 2017-09-29 00:08:21 +00:00
Nextcloud bot
d4bf301a78
[tx-robot] updated from transifex 2017-09-23 00:07:56 +00:00
Nextcloud bot
d603d78630
[tx-robot] updated from transifex 2017-09-19 00:08:27 +00:00
Nextcloud bot
113fd47f30
[tx-robot] updated from transifex 2017-09-15 00:08:08 +00:00
Nextcloud bot
99dcf5036d
[tx-robot] updated from transifex 2017-08-31 00:08:31 +00:00
Nextcloud bot
1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Nextcloud bot
a7f2dc6dd6
[tx-robot] updated from transifex 2017-08-24 00:08:50 +00:00
Nextcloud bot
ae0789ef43
[tx-robot] updated from transifex 2017-08-22 00:08:20 +00:00
Morris Jobke
6e3b8db98d Merge pull request #6180 from nextcloud/fix-warnings 
Fix PHPUnit warnings
 2017-08-21 09:25:35 +02:00
Nextcloud bot
9e1884b27c
[tx-robot] updated from transifex 2017-08-21 00:08:13 +00:00
Nextcloud bot
6b978ebd29
[tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Lukas Reschke
f8b4b2c499
Fix PHPUnit warnings 
```
1) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetForm with data set #0 (true)
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead

2) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetForm with data set #1 (false)
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead

3) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetSection
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead

4) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetPriority
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-18 15:39:10 +02:00
Nextcloud bot
0ceb06fde5
[tx-robot] updated from transifex 2017-08-17 00:08:14 +00:00
Morris Jobke
895b9c2309 Use proper methods for registerBackend 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 11:29:15 +02:00
Nextcloud bot
d1f3e1de96
[tx-robot] updated from transifex 2017-08-14 00:08:21 +00:00
Nextcloud bot
ded780a45a
[tx-robot] updated from transifex 2017-08-13 00:08:14 +00:00
Nextcloud bot
a2e3c8ede5
[tx-robot] updated from transifex 2017-08-12 00:08:18 +00:00
Nextcloud bot
8549fcf6e4
[tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Nextcloud bot
2800e017de
[tx-robot] updated from transifex 2017-08-02 00:08:10 +00:00
Lukas Reschke
d321e9792e
Add |null to PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Nextcloud bot
456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Roeland Jago Douma
baee0b4bcc Merge pull request #5913 from nextcloud/fix-anchor-name 
Fix anchor name for federated sharing settings
 2017-07-31 08:51:23 +02:00
Nextcloud bot
98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot
b43abf7512
[tx-robot] updated from transifex 2017-07-29 00:08:31 +00:00
Morris Jobke
fae327799b Fix anchor name for federated sharing settings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-28 08:21:25 +02:00
Nextcloud bot
65ade4b6d5
[tx-robot] updated from transifex 2017-07-27 00:08:03 +00:00
Nextcloud bot
11e182fff2
[tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Nextcloud bot
46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Nextcloud bot
ce7c62d9bb
[tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Morris Jobke
50fc5a1e25 Merge pull request #5823 from nextcloud/improve-error-handling 
Improve error handling for accepting federated shares
 2017-07-21 22:54:14 +02:00
Bjoern Schiessle
8b3dfcc429
use OCSv2 to make sure that the error also arrives at the web front-end 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-21 12:09:13 +02:00
Nextcloud bot
964d5338dc
[tx-robot] updated from transifex 2017-07-21 00:08:06 +00:00
Nextcloud bot
26c42d3d30
[tx-robot] updated from transifex 2017-07-20 00:08:04 +00:00
Nextcloud bot
0ee83ac56b
[tx-robot] updated from transifex 2017-07-19 00:08:22 +00:00
Morris Jobke
7642492cfe Merge pull request #5741 from nextcloud/comradekingu-patch-6 
Spelling: sent, an invitation, - successful
 2017-07-18 08:49:06 +02:00
Nextcloud bot
b1b843e572
[tx-robot] updated from transifex 2017-07-18 00:08:02 +00:00
Nextcloud bot
125767265d
[tx-robot] updated from transifex 2017-07-17 00:08:02 +00:00
Allan Nordhøy
de6b7668c1 sent, an invitation, - successful 2017-07-14 17:28:57 +02:00
Nextcloud bot
261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Nextcloud bot
13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Joas Schilling
33cb45d4a3
Fix owner cloud id in unshare activity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-10 12:20:56 +02:00
Joas Schilling
b69ddfba8b
Fix activity emails for accept/decline of remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-10 12:10:36 +02:00
Nextcloud bot
cf8db31bce
[tx-robot] updated from transifex 2017-07-09 00:08:31 +00:00
Nextcloud bot
f59062ce83
[tx-robot] updated from transifex 2017-07-08 00:08:27 +00:00
Nextcloud bot
d23bc9a99a
[tx-robot] updated from transifex 2017-07-07 00:08:24 +00:00
Nextcloud bot
1cbb7a18d8
[tx-robot] updated from transifex 2017-07-05 00:08:26 +00:00
Morris Jobke
f3c25e177f Merge pull request #5407 from nextcloud/5157-simple-logo 
Simplified Nextcloud logo icon #2
 2017-07-04 12:56:05 +02:00
Nextcloud bot
c94dbddd12
[tx-robot] updated from transifex 2017-07-03 00:08:21 +00:00
Marin Treselj
3470d0a44e
Simplified Nextcloud logo icon 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-02 14:14:49 +02:00