Commit Graph

18283 Commits

Author SHA1 Message Date
Julius Härtl 94dcddc45e
Do not hide reset button
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 14:12:07 +02:00
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
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
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
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 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
Arthur Schiwon 241b59f458
adjust tests
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 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 89b6ee1a45
Merge pull request #9773 from nextcloud/feature/noid/resource_booking
resource booking
2018-06-29 06:51:49 +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
Arthur Schiwon cc51a00c93
lower log level for quota manipulation cases
and simplify the forest of ifs a little bit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-28 21:10:07 +02:00
Robin Appelman b21bec5c73
Fix search related results in OPTIONS requests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-28 14:54:46 +02:00
Georg Ehrke ab43251a45
Call Backgroundjob with parameter, as interface requires
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-28 10:55:47 +02:00
Morris Jobke a077c129c8
Merge pull request #10031 from nextcloud/fix/9987/ldap-backupserver-connect
LDAP backup server should not be queried when auth fails
2018-06-28 08:38:52 +02:00
Nextcloud bot 1bf486d93f
[tx-robot] updated from transifex 2018-06-28 00:12:20 +00:00
Arthur Schiwon 7a728f2154
LDAP backup server should not be queried when auth fails
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-27 23:12:07 +02:00
Georg Ehrke 3ffeb4ae06
fix tests / mistakes made during rebase
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:04 +02:00
Roeland Jago Douma 0872f0b4b2
Merge pull request #10018 from nextcloud/rakekniven-patch-2
Update root.vue
2018-06-27 20:22:31 +02:00
Julius Härtl f3949cf1a8
Add groupware settings section
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-27 19:16:21 +02:00
Morris Jobke 314ad266d5
Compile app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-27 13:47:31 +02:00
Thomas Citharel abab7eb7f0
handle config.php values
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:23 +02:00
Thomas Citharel 4a9f8623b5
Fix review & tests
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:21 +02:00
Thomas Citharel d8921ccd85
Allow user to choose locale
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:15:19 +02:00
Roeland Jago Douma 221f558f66
Merge pull request #10016 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.12.2
Bump webpack from 4.12.1 to 4.12.2 in /apps/accessibility
2018-06-27 12:47:53 +02:00
Roeland Jago Douma 719f62b9c9
Merge pull request #10013 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.12.2
Bump webpack from 4.12.1 to 4.12.2 in /apps/oauth2
2018-06-27 12:47:08 +02:00
Morris Jobke e4e3387417
Merge pull request #10009 from nextcloud/techdebt/noid/replace-headers-with-http_response_code-calls
Replace hard coded HTTP status codes with proper calls to http_response_code
2018-06-27 12:14:52 +02:00
Nextcloud bot 46b62ff579
[tx-robot] updated from transifex 2018-06-27 10:06:12 +00:00
rakekniven 94f5a21b48
Update root.vue
Fix for #8897 (Description of stable is not suitable )
2018-06-27 11:30:24 +02:00
dependabot[bot] fab3377ebb
Bump webpack from 4.12.1 to 4.12.2 in /apps/accessibility
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.1 to 4.12.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.1...v4.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-27 09:17:57 +00:00
dependabot[bot] e7cc2dd01c
Bump webpack from 4.12.1 to 4.12.2 in /apps/oauth2
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.1 to 4.12.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.1...v4.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-27 09:17:55 +00:00
dependabot[bot] 08aebce923
Bump webpack from 4.12.1 to 4.12.2 in /apps/updatenotification
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.1 to 4.12.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.1...v4.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-27 08:08:42 +00:00
Nextcloud bot a6666071be
[tx-robot] updated from transifex 2018-06-27 00:11:52 +00:00
Morris Jobke e9001fecb6
Merge pull request #10005 from nextcloud/group-exists-error
show error message when group exists
2018-06-26 17:35:55 +02:00
Morris Jobke 2b8a4f1aeb
Merge pull request #10007 from nextcloud/feature/noid/oauth_valid_redirect_uri
Validate OAuth2 redirect uri
2018-06-26 17:31:54 +02:00
Roeland Jago Douma 555de27567
Validate OAuth2 redirect uri
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-26 16:15:53 +02:00
Morris Jobke 79d9841bce
Replace hardcoded status headers with calls to http_response_code()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-26 16:14:15 +02:00