Commit Graph

44724 Commits

Author SHA1 Message Date
Julius Härtl d6947a56c0
Adjust collaborative tags and automated tagging settings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 14:12:06 +02:00
Julius Härtl 0ec483b668
Fix padding in devices/sessions list
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 14:12:06 +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 77f0633e59
Fix tests
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 a788f49114
Merge pull request #10046 from nextcloud/fix-getting-the-information-of-a-group-share-as-a-sharee
Fix getting the information of a group share as a sharee
2018-06-29 13:14:41 +02:00
John Molakvoæ (skjnldsv) 6de49f7dc6
Fix controls background
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 13:12:56 +02:00
Morris Jobke bff20585c7
Merge pull request #10045 from nextcloud/groups-creation-fixes
Fix new group selection
2018-06-29 12:55:53 +02:00
John Molakvoæ (skjnldsv) b495716daf
Fix new group selection
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 12:27:34 +02:00
Morris Jobke 322a113cc5
Merge pull request #10049 from nextcloud/fix-code-integrity-check-link
Fix code integrity check-warning link
2018-06-29 12:20:10 +02:00
Marius Blüm f824ff500d
Fix code integrity check-warning link
Signed-off-by: Marius Blüm <marius@lineone.io>
2018-06-29 11:33:29 +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
Arthur Schiwon eded07f28f
whitelist audit.log
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 11:03:13 +02:00
Roeland Jago Douma f12922c7bf
Bump version of app else migrations don't run
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 10:45:47 +02:00
Georg Ehrke 4aa4e4080c
Include accept / decline links in CalDAV invitation emails
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-29 10:44:44 +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 32647a4855
Applied patch for CI to work per https://github.com/nextcloud/server/pull/9760#issuecomment-396888591
Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
2018-06-29 10:37:46 +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 3ff3141a1e
Merge pull request #9705 from nextcloud/feature/9163/whatsnew-admin-gui
display whats new info in admin settings
2018-06-29 10:36:04 +02:00
Morris Jobke 17a9024fac
Improved wording
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 10:33:12 +02:00
Morris Jobke 79f16f9d46
Merge pull request #10037 from nextcloud/dav-options-search
Fix search related results in OPTIONS requests
2018-06-29 09:36:12 +02:00
Morris Jobke 11f26be545
Bump version to trigger migration
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 09:11:04 +02:00
Roeland Jago Douma 000c302505
Update Vue settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 09:11:04 +02:00
Arthur Schiwon 241b59f458
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
Arthur Schiwon 6044733b2d
fix build step
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
Arthur Schiwon 89c3010d14
fix updating the db row due to lacking id col
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
Roeland Jago Douma 4e073010df
Rebuild
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 09:11:04 +02:00
Arthur Schiwon c7728c9a16
updated production js files
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +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
John Molakvoæ (skjnldsv) 4ed8ee1c1e
Unify vue template design
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 09:08:33 +02:00
John Molakvoæ (skjnldsv) 790c897d98
various fixes, typo, center popover, updated build
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 09:08:33 +02:00
John Molakvoæ (skjnldsv) a9e59ff732
Popover design fixes and settings update
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 09:08:33 +02:00
Arthur Schiwon 427ac19e91
adjust and reuse apps.css, makes additional class and rules unnecessary
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon 3fa5e46019
CSS fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon dfc56e4f03
do things with npm so make build-js-production succeeds without complaints
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon 7ad0a43cc1
fix method declaration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon 1e0761c6b8
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon bafb6b3c29
display whats new info in admin settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Daniel Calviño Sánchez d523777843 Extend integration tests to get the info of a group share as a sharee
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-29 08:20:19 +02:00
Daniel Calviño Sánchez 6cb2cb33ac Fix getting the information of group share as a sharee
When the receiver of a group share modifies it (for example, by moving
it to a different folder) the original share is not modified, but a
"ghost" share that keeps track of the changes made by that specific user
is used instead.

By default, the method "getShareById" in the share provider returns the
share from the point of view of the sharer, but it can be used too to
get the share from the point of view of a sharee by providing the
"recipient" parameter (and if the sharee is not found then the share is
returned from the point of view of the sharer).

The "ShareAPIController" always formats the share from the point of view
of the current user, but when getting the information of a specific
share the "recipient" parameter was not given, so it was always returned
from the point of view of the sharer, even if the current user was a
sharee. Now the "recipient" parameter is set to the current user, and
thus the information of the share is returned from the point of view of
the current user, be it the sharer or a sharee.

Note that this special behaviour of "getShareById" happens only with
group shares; with other types of shares the share is the same for the
sharer and the sharee, and thus the parameter is ignored; it was added
for them too just for consistency.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-29 08:20:19 +02:00
Morris Jobke 61842f66ee
Merge pull request #5623 from nextcloud/locale-setting
Add user locale/region setting
2018-06-29 08:03:43 +02:00
Morris Jobke c1682f4228
Update PHPDoc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 08:02:50 +02:00
Morris Jobke 89b6ee1a45
Merge pull request #9773 from nextcloud/feature/noid/resource_booking
resource booking
2018-06-29 06:51:49 +02:00
Morris Jobke e6780c4fc7
Merge pull request #10043 from nextcloud/bugfix/noid/mergejs-css-vars
Run mergejs to add css-vars-ponyfill
2018-06-29 06:51:16 +02:00
Nextcloud bot ab1b848268
[tx-robot] updated from transifex 2018-06-29 00:12:08 +00:00
blizzz 28e64afb8c
Merge pull request #10034 from nextcloud/fix/noid/ldap-silence-quota-logmsgs
lower log level for quota manipulation cases
2018-06-28 23:06:23 +02:00
Liam Dennehy 68e41a3aae trashbin:cleanup exceptions for invalid options
* throw on no parameters provided
* throw on --all-users and userid provided

Signed-off-by: Liam Dennehy <liam@wiemax.net>
2018-06-28 22:31:27 +02:00
Julius Härtl c04060243a
Run mergejs to add css-vars-ponyfill
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-28 22:16:32 +02:00