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

8810 commits

Author SHA1 Message Date
Bjoern Schiessle
b56ccef564
add direct link to the file for user/group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a29261175d
fix mail templates 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
73b88deeb8
add note to share object when reading it from the db 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
c116d116fa
improve mail template and escape html code 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a93f2a648b
allow to add a personal note to a share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Morris Jobke
4536635e2a
Merge pull request #10229 from nextcloud/feature/noid/allow-notifiers-to-know-if-we-prepare-push-notifications 
Allow notifiers to know if we prepare push notifications
 2018-07-20 11:53:12 +02:00
Morris Jobke
e0d9c43c95
Merge pull request #8188 from arnowelzel/master 
Avoid error messages for restricted opcache API
 2018-07-20 11:48:44 +02:00
Joas Schilling
6b440cc365
Merge pull request #10296 from nextcloud/bug/noid/dont_fail_on_unkown_user 
Don't fail contacts menu on unkown user
 2018-07-20 03:08:32 +02:00
Morris Jobke
4751f1e7f7
Merge pull request #9984 from nextcloud/inverted-svg-api 
Svg color api
 2018-07-19 23:54:29 +02:00
John Molakvoæ (skjnldsv)
37a4d2bbbc
Php code bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 22:46:32 +02:00
Morris Jobke
8032e362ec
Merge pull request #10291 from nextcloud/bugfix/10052/fix-lotus-notes 
EMailTemplate: Fix button background in Lotus Notes
 2018-07-19 19:47:22 +02:00
Joas Schilling
891de38080
Only create the schema when moving between databases 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-19 15:32:36 +02:00
Julius Härtl
7a4c23a720
Use index for format string parameters 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 11:43:15 +02:00
Roeland Jago Douma
16bfbb78ca
Don't fail contacts menu on unkown user 
If for some reason the system addressbook holds a user that is no longer
accessible from the usermanager (so it got somehow out of sync) we
should not fail hard but rather just ignore the entry.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-19 11:39:28 +02:00
Julius Härtl
9159ed3d76
Fix icon url regex 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 08:16:59 +02:00
Julius Härtl
6ed8c19ab9
Use proper URL prefix for icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 08:16:59 +02:00
John Molakvoæ (skjnldsv)
14bc9ffda4
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:59 +02:00
John Molakvoæ (skjnldsv)
a24cad1a1c
Fix accessibility invert 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:58 +02:00
John Molakvoæ (skjnldsv)
9e5885963c
Fixed icons detection and caching 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:58 +02:00
John Molakvoæ (skjnldsv)
8977c71f88
Mixin scss icon api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:58 +02:00
John Molakvoæ (skjnldsv)
29ff7efe9a
Svg icon api sass function and upgrade of all styles 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:57 +02:00
John Molakvoæ (skjnldsv)
84e90e26c0
Svg color api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:30 +02:00
Julius Härtl
185cb494c0
EMailTemplate: Move background color of buttons to the table to fix rendering in lotus notes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 07:49:48 +02:00
Robin Appelman
99c00972a0
make exception serializer a bit more robust 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-18 16:56:34 +02:00
Morris Jobke
a7adc4cb3c
Merge pull request #10260 from nextcloud/bugfix/7974/improved-sql-for-fetching-quota 
Use the path_hash instead of the path to query the filecache
 2018-07-17 13:04:18 +02:00
Morris Jobke
a155f80485
Merge pull request #10230 from nextcloud/feature/shareoverview 
Feature/shares overview
 2018-07-17 12:53:45 +02:00
Morris Jobke
19c49c8473
Use the path_hash instead of the path to query the filecache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-16 16:10:34 +02:00
Morris Jobke
82021b2b1b
Merge pull request #5280 from nextcloud/shared-with-display-name 
sharedWithDisplayName & sharedWithAvatar
 2018-07-13 17:29:57 +02:00
Morris Jobke
14314584ba
Merge pull request #10110 from nextcloud/feature/100500/whats-new-info-users 
Display What's New info to users
 2018-07-13 17:25:51 +02:00
Morris Jobke
1801e4e03f
Merge pull request #10168 from nextcloud/bugfix/10163/allow-utf8mb4-on-maria-10.3-or-later 
MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by default
 2018-07-13 16:23:36 +02:00
Morris Jobke
7a5768e259
Merge pull request #10198 from tml1024/master 
No need to convert to PDF with LibreOffice, just convert to PNG
 2018-07-13 16:21:36 +02:00
Morris Jobke
c7f8085cc2
Merge pull request #10226 from nextcloud/enable-scss-for-guest-pages 
Enable SCSS for guest pages
 2018-07-13 16:09:42 +02:00
Joas Schilling
79b540ecc3
Add return types and fully qualified function calls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-13 13:27:52 +02:00
Joas Schilling
28d8d15a98
Allow notifiers to know whether we are preparing push notifications 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-13 13:27:51 +02:00
John Molakvoæ (skjnldsv)
6f45607f57
Upgraded navigation submenu management and api + created sharing submenu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-13 09:33:57 +02:00
Daniel Calviño Sánchez
8c004fdc64 Enable SCSS for guest pages 
SCSS is disabled for several types of pages, as the SCSS compiler uses
the cache system, which is not available for example when Nextcloud is
not installed yet. However, in regular guest pages the cache system is
available, so SCSS is now enabled for them too.

To keep the same behaviour for guest pages the guest style is
automatically added for them, as before this commit it was automatically
added due to SCSS not being used.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-13 01:55:12 +02:00
Bjoern Schiessle
c668c5b997
fix selection of share provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-12 19:42:36 +02:00
Joas Schilling
50ee4e1397
Correctly init empty arrays 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-12 10:41:19 +02:00
Tor Lillqvist
37c8ed4b5c No need to convert to PDF with LibreOffice, just convert to PNG 
Exporting all pages of a document to a PDF is a waste of time. All we
need is a thumbnail of the first page anyway. Plus, reading that PDF
(even just the first page of it) into imagick is presumably much
slower than reading a simple PNG.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
 2018-07-12 11:40:41 +03:00
Morris Jobke
3036b1d03d
Merge pull request #9895 from nextcloud/fed-group-shares 
implement federated group sharing
 2018-07-11 21:44:48 +02:00
Morris Jobke
cc9073c251
Merge pull request #10179 from nextcloud/mount-filter 
Add the option to filter mounts for a user
 2018-07-11 16:29:09 +02:00
Morris Jobke
a11d198a06
Sanitize parameters in createSessionToken() while logging 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-11 14:26:57 +02:00
Julius Härtl
6da2b7c4f6
Separate fopen into read and write methods 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-11 12:08:37 +02:00
Julius Härtl
f1469e34aa
Add fopen method to ISimpleFile 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-11 10:29:03 +02:00
Bjoern Schiessle
2abc705632
start to get fed group shares into the share dialog 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:47 +02:00
Bjoern Schiessle
4c00c80a83
translate nextcloud share types to OCM share types 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:45 +02:00
Bjoern Schiessle
8bc0de3469
log error messgage 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:44 +02:00
Bjoern Schiessle
b23032e4c5
implement federated group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:44 +02:00
Roeland Jago Douma
0fe115a536
Add repair step 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-10 21:27:35 +02:00
Robin Appelman
3ad6084891
Add the option to filter mounts for a user 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-10 16:49:26 +02:00
Joas Schilling
011fe9e0f9
MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by default 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-09 15:37:22 +02:00
Morris Jobke
79801ad263
Suppress potential SQL injection warning as they are false positives 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:55:47 +02:00
Morris Jobke
8a64433ec9
Add repair job for pending cron jobs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:53:37 +02:00
Morris Jobke
8b1084adfe
Only wait for cron if fix for endless wait is included 
* see https://github.com/nextcloud/server/issues/9992

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:53:37 +02:00
Morris Jobke
a1a29d14c8
Unlock failed cron jobs and set a high "last_checked" value to avoid continous re-check 
* fixes issue where cronjobs of a not-loaded app are marked as "still running" because there is a "reserved_at" value stored
* fixed #9992

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:51:02 +02:00
Morris Jobke
103c8c373a
Merge pull request #10120 from nextcloud/allow-to-disable-encryption 
allow to disable encryption
 2018-07-09 13:39:57 +02:00
Joas Schilling
5541d3dd84
Add visio mimetypes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-06 15:16:21 +02:00
Morris Jobke
422c805e26
Merge pull request #10116 from nextcloud/lock-negative 
prevent lock values from going negative with memcache backend
 2018-07-06 14:50:18 +02:00
Joas Schilling
3ade347b0d
Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer 
Upgrade to swiftmailer-6
 2018-07-06 10:39:09 +02:00
Bjoern Schiessle
5d0fa12e12
allow to disable encryption 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-05 17:24:44 +02:00
Robin Appelman
3d5acbb1d0
prevent lock values from going negative with memcache backend 
This can be caused by the code releasing more locks then it acquires,
once the lock value becomes negative it's likely that it will never be able
to change into an exclusive lock again.

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-05 14:39:10 +02:00
Arthur Schiwon
772bbd99be
Backend work to provide NC whats New info to users 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-07-05 14:33:08 +02:00
John Molakvoæ (skjnldsv)
6a0552224d
getDeletedSharedWith method 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-05 12:43:57 +02:00
Roeland Jago Douma
d805959e81
Add API to undelete delete group shares 
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.

This endpoint makes it possible to get back the share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-05 12:43:56 +02:00
Roeland Jago Douma
be7db1573d
Swift to \Swift_Mailer as abstraction 
* \Swift_Mailer handles starting the transport etc properly
* Fixed tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-04 08:28:33 +02:00
Roeland Jago Douma
e6e6b5648a
Make swift 6 compatible 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-04 08:28:33 +02:00
Roeland Jago Douma
0dd4a3e0cf
Kill php mail from settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-04 08:28:33 +02:00
Morris Jobke
7025f16017
Merge pull request #9345 from nextcloud/federation20 
Federation 2.0
 2018-07-03 23:13:47 +02:00
Morris Jobke
10b8a4a8b1
Revert "Fix undeclared method warning in phan" 
This reverts commit f3093b2401.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-03 17:46:11 +02:00
Morris Jobke
aa64584d67
Merge pull request #10080 from nextcloud/bugfix/noid/fix-phan-warning 
Fix undeclared method warning in phan
 2018-07-02 17:40:39 +02:00
Morris Jobke
48b7499fa4
Merge pull request #10079 from nextcloud/search-double-slash 
fix double slash in search result path when the result is in a submount
 2018-07-02 15:49:27 +02:00
Morris Jobke
f3093b2401
Fix undeclared method warning in phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-02 15:38:49 +02:00
Robin Appelman
922c851494
fix double slash in search result path when the result is in a submount 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-02 14:17:38 +02:00
Bjoern Schiessle
7ff74ae8ed
cache results from ocm end-point discovery 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 12:43:43 +02:00
Bjoern Schiessle
411bae5163
fix return type from send share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 12:43:43 +02:00
Bjoern Schiessle
cdf8abb060
look for correct OCM permissions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
e251b34a8c
cleanup variable naming, it is actually a resource type 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
84fc188dfc
some minor fixes and clode cleanup 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +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
c572e84ad9
detect correctly if a share was send successful 
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
af178ef19a
check API Version 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +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
6208f250e8
check if cloud federation api is ready 
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
Michael Weimann
03a5856541 Disables the maintenance warning for the maintenance command itself. 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-07-01 20:54:19 +02:00
blizzz
2f8ebe2b35
Merge pull request #10048 from nextcloud/feature/9760/systemd-logger 
Systemd Logger
 2018-06-30 00:57:30 +02:00
Morris Jobke
e4c3c481a2
Merge pull request #10038 from nextcloud/files-scan-home-only 
Add option to only scan the home storage
 2018-06-29 15:23:15 +02:00
Morris Jobke
69e92ea71a
Merge pull request #10053 from nextcloud/feature/7378/password-security-move 
Move password change to security settings
 2018-06-29 14:53:09 +02:00
Julius Härtl
ff2c819ed3
Move social buttons to the personal settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-29 14:12:05 +02:00
Julius Härtl
97c13debdc
Remove unneeded param from personal settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-29 13:35:07 +02:00
Julius Härtl
3f77b0fc8b
Move user password form to security settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-29 13:35:07 +02:00
Morris Jobke
478b95cc20
Try to not run into the white page of death and still log something in the web server error log 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-29 11:22:05 +02:00
Morris Jobke
326f07e756
Merge pull request #8854 from nextcloud/drop-old-sharing-code 
Get rid of shareItem
 2018-06-29 10:40:32 +02:00
Johannes Ernst
72340b2230
Added Systemd.log documentation to config.sample.php 
Changed name of default system (not systemd) logger from ownCloud to Nextcloud, to be consistent
Fixed license per https://github.com/nextcloud/server/pull/9760#discussion_r195026784
Pulled upstream updates

Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
 2018-06-29 10:37:46 +02:00
Johannes Ernst
0a65e62f29
Added a logger for systemd/journald 
Added a unit test

Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
 2018-06-29 10:37:45 +02:00
Morris Jobke
17a9024fac
Improved wording 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-29 10:33:12 +02:00
Arthur Schiwon
25d9c3e529
adjust backend and gui to update and changelog server 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-06-29 09:11:04 +02:00
Arthur Schiwon
1e0761c6b8
adjust tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-06-29 09:08:33 +02:00