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

3698 commits

Author SHA1 Message Date
Daniel Calviño Sánchez
2c073dc53d Set "share_with" field to the ID of the circle 
When a share is shared with a circle the "share_with" field returned by
the API endpoint was always set to the name of the circle. However, the
name is not enough to identify a circle. The Circles app now provides
the ID of the circle in the "shared with" field of a Share, so this
commit modifies the API endpoint to set the "share_with" field to the ID
of the circle when provided by the Circles app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-16 04:58:00 +01:00
blizzz
208e38e84e
Merge pull request #8255 from nextcloud/bugfix/noid/group-display-name 
Full implement group display names
 2018-03-15 12:07:30 +01:00
Nextcloud bot
055d15e305
[tx-robot] updated from transifex 2018-03-15 01:11:41 +00:00
Roeland Jago Douma
2d5febd0b9
Merge pull request #8811 from nextcloud/remove_dep_util_link 
Remove deprecated URL functions for OCP\Util
 2018-03-14 09:49:51 +01:00
Roeland Jago Douma
b93d26a209
Replace ContactsManager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 22:18:38 +01:00
Roeland Jago Douma
83873e3da1
Remove deprecated URL functions for OCP\Util 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 22:04:08 +01:00
Morris Jobke
53a899a1f5
Fix the HTTP 1.0 status code and properly detect 1.0 vs 1.1&2.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 09:22:26 +01:00
Morris Jobke
e758cfcdc8
Remove unused methods of OC_Response 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:42:30 +01:00
Nextcloud bot
a20e9d7891
[tx-robot] updated from transifex 2018-03-09 01:12:12 +00:00
Joas Schilling
db9b2398dd
Fix group displaynames in activity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 17:13:49 +01:00
John Molakvoæ (skjnldsv)
e1ec4514cc
Use label for better focus on external share 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-07 15:28:03 +01:00
John Molakvoæ (skjnldsv)
446a3a9d5a
Fixed ext share style and use varable for popover height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-07 15:12:06 +01:00
John Molakvoæ (skjnldsv)
8d986160b8
Improved inline confirm icon with opacity and fixed ext share loading state 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-07 13:17:37 +01:00
Morris Jobke
d1aa96fef9
Merge pull request #8373 from nextcloud/right-header-stdrd 
New standard for top right header
 2018-03-07 12:33:11 +01:00
John Molakvoæ (skjnldsv)
d9bd6f3253
Fixed public template 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-07 11:05:23 +01:00
Tobia De Koninck
55b9a5d886
Remove OC_App::disable method 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:45:20 +01:00
Nextcloud bot
3867a74f0d
[tx-robot] updated from transifex 2018-03-06 01:12:16 +00:00
Roeland Jago Douma
05ef2d70e7
Merge pull request #8590 from nextcloud/redirect-to-download-after-share 
Sharing: redirect to download after authentification if requested
 2018-03-05 11:11:43 +01:00
Nextcloud bot
777313db42
[tx-robot] updated from transifex 2018-03-02 01:12:16 +00:00
John Molakvoæ (skjnldsv)
3824e6f631
fixup! fixup! Sharing: redirect to download after authentification if requested 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-01 13:17:08 +01:00
John Molakvoæ (skjnldsv)
4c2aff0807
fixup! Sharing: redirect to download after authentification if requested 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-01 13:12:24 +01:00
John Molakvoæ (skjnldsv)
7bcc821642
fixup! Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 19:03:00 +01:00
John Molakvoæ (skjnldsv)
8c69d783e0
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 17:35:42 +01:00
John Molakvoæ (skjnldsv)
a0641e43dc
fixup! Sharing: redirect to download after authentification if requested 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 17:08:25 +01:00
John Molakvoæ (skjnldsv)
fb890807c0
Sharing: redirect to download after authentification if requested 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 17:05:55 +01:00
Roeland Jago Douma
4b05f03c34
Merge pull request #8569 from nextcloud/cleanup_unused_static_sharing 
Remove unused static sharing helper code
 2018-02-28 13:09:06 +01:00
Nextcloud bot
533e8351ad
[tx-robot] updated from transifex 2018-02-28 01:12:31 +00:00
Roeland Jago Douma
7e8c84ec20
Remove unused static sharing helper code 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 22:40:59 +01:00
Morris Jobke
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms 
Let the admin configure the default share permissions
 2018-02-27 13:44:34 +01:00
Bjoern Schiessle
3285becdc1
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
ebb15283a6
share api: use default permission of no permission is given 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
1615312bf1
add share permissions to settings page 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Julius Härtl
4a1cbefc90
Fix files_sharing tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:53 +01:00
Julius Härtl
038aad73c7
Add missing phpdoc for public API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:53 +01:00
Julius Härtl
4f83462f67
Add phpdoc, typehints and sanitize HTML 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Julius Härtl
8a13851da8
Use PublicTemplateResponse for files_sharing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Nextcloud bot
a210247559
[tx-robot] updated from transifex 2018-02-24 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
b3ca73dc27
[tx-robot] updated from transifex 2018-02-19 01:11:54 +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
Julius Härtl
c300a64520
Merge pull request #8277 from nextcloud/avatars-shared-all 
Show share owner avatars on all file lists
 2018-02-15 12:11:09 +01:00
Nextcloud bot
01623d4aca
[tx-robot] updated from transifex 2018-02-14 21:37:31 +00:00
Morris Jobke
236086c457
Merge pull request #8335 from nextcloud/remove-unused-import 
Remove unused import statements
 2018-02-14 22:23:07 +01:00
Morris Jobke
d3d045dd5c
Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Joas Schilling
d1fb939e86
Merge pull request #8338 from nextcloud/simplify-return-statement 
Simplify return statement
 2018-02-14 10:08:28 +01:00
Nextcloud bot
ff1b343c4a
[tx-robot] updated from transifex 2018-02-14 01:11:53 +00:00
Morris Jobke
e2974f1133
Simplify return statement 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:55:24 +01:00