]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoFix initMountPoints to set usersSetup earlier 2007/head
Vincent Petry [Tue, 18 Oct 2016 09:35:54 +0000 (11:35 +0200)]
Fix initMountPoints to set usersSetup earlier

This is needed because in some cases like LDAP, the user manager itself
might trigger avatar updates which would internally also call
initMountPoints with the same user. This could cause the same user to
be setup twice, and in some sharing situations could cause recursive
deduplication of shares by adding "(2)" every time.

8 years agoMerge pull request #1733 from nextcloud/dav-events
Roeland Jago Douma [Thu, 3 Nov 2016 18:31:20 +0000 (19:31 +0100)]
Merge pull request #1733 from nextcloud/dav-events

Activities for calendars, events and todos

8 years agoMerge pull request #2003 from nextcloud/query-logger-limit
Morris Jobke [Thu, 3 Nov 2016 16:04:50 +0000 (17:04 +0100)]
Merge pull request #2003 from nextcloud/query-logger-limit

Cap the number of queries we save in the query logger

8 years agoCap the number of queries we save in the query logger 2003/head
Robin Appelman [Thu, 3 Nov 2016 13:35:44 +0000 (14:35 +0100)]
Cap the number of queries we save in the query logger

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoMerge pull request #2000 from nextcloud/sharebymail-icon
Björn Schießle [Thu, 3 Nov 2016 14:33:58 +0000 (15:33 +0100)]
Merge pull request #2000 from nextcloud/sharebymail-icon

add share by mail icon, fix #1979

8 years agoAdd more tests 1733/head
Joas Schilling [Thu, 3 Nov 2016 14:24:18 +0000 (15:24 +0100)]
Add more tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoAdd tests for triggerCalendarActivity
Joas Schilling [Thu, 3 Nov 2016 13:30:02 +0000 (14:30 +0100)]
Add tests for triggerCalendarActivity

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1908 from nextcloud/downstream-26078
Morris Jobke [Thu, 3 Nov 2016 13:21:35 +0000 (14:21 +0100)]
Merge pull request #1908 from nextcloud/downstream-26078

Upload autorename on client side

8 years agoMerge pull request #1994 from nextcloud/proper-cron-hints
Roeland Jago Douma [Thu, 3 Nov 2016 13:11:37 +0000 (14:11 +0100)]
Merge pull request #1994 from nextcloud/proper-cron-hints

Show a hint for system based cron user name

8 years agoadd share by mail icon, fix #1979 2000/head
Jan-Christoph Borchardt [Thu, 3 Nov 2016 13:05:43 +0000 (14:05 +0100)]
add share by mail icon, fix #1979

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #1997 from nextcloud/changelog
Roeland Jago Douma [Thu, 3 Nov 2016 12:57:10 +0000 (13:57 +0100)]
Merge pull request #1997 from nextcloud/changelog

Introducing changelog.md

8 years agoMerge pull request #1996 from nextcloud/allow-phpunit-options
Roeland Jago Douma [Thu, 3 Nov 2016 12:15:39 +0000 (13:15 +0100)]
Merge pull request #1996 from nextcloud/allow-phpunit-options

Allow to run autotest with phpunit options

8 years agoAdded changelog.md 1997/head
Roeland Jago Douma [Thu, 3 Nov 2016 12:12:14 +0000 (13:12 +0100)]
Added changelog.md

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoStart unit tests for the activity listener
Joas Schilling [Thu, 3 Nov 2016 11:57:40 +0000 (12:57 +0100)]
Start unit tests for the activity listener

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoAdd tests for dispatching of the events
Joas Schilling [Thu, 3 Nov 2016 11:28:12 +0000 (12:28 +0100)]
Add tests for dispatching of the events

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1915 from nextcloud/downstream-26398
Lukas Reschke [Thu, 3 Nov 2016 11:14:28 +0000 (12:14 +0100)]
Merge pull request #1915 from nextcloud/downstream-26398

Add using casing check/fix for initMountPoints

8 years agoUse the event dispatcher
Joas Schilling [Thu, 13 Oct 2016 13:34:26 +0000 (15:34 +0200)]
Use the event dispatcher

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoUse a different type for events and todos
Joas Schilling [Thu, 13 Oct 2016 11:20:53 +0000 (13:20 +0200)]
Use a different type for events and todos

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoActivities for events and todos
Joas Schilling [Thu, 13 Oct 2016 10:16:43 +0000 (12:16 +0200)]
Activities for events and todos

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMove the methods into a new class
Joas Schilling [Thu, 13 Oct 2016 09:04:22 +0000 (11:04 +0200)]
Move the methods into a new class

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoAdd activities for shares
Joas Schilling [Thu, 13 Oct 2016 07:44:16 +0000 (09:44 +0200)]
Add activities for shares

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoFix unshare actions for author != owner
Joas Schilling [Thu, 13 Oct 2016 07:19:14 +0000 (09:19 +0200)]
Fix unshare actions for author != owner

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoAdd activity for unshare from group
Joas Schilling [Fri, 7 Oct 2016 11:44:02 +0000 (13:44 +0200)]
Add activity for unshare from group

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoUnshare user activities
Joas Schilling [Fri, 7 Oct 2016 10:29:22 +0000 (12:29 +0200)]
Unshare user activities

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoStart working on calendar activities
Joas Schilling [Mon, 26 Sep 2016 11:50:39 +0000 (13:50 +0200)]
Start working on calendar activities

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoAllow to run autotest with phpunit options 1996/head
Joas Schilling [Thu, 3 Nov 2016 11:04:54 +0000 (12:04 +0100)]
Allow to run autotest with phpunit options

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1954 from nextcloud/issue_#1953
Christoph Wurst [Thu, 3 Nov 2016 10:50:29 +0000 (11:50 +0100)]
Merge pull request #1954 from nextcloud/issue_#1953

#1953 add can to subshare options

8 years agoFixes https://github.com/nextcloud/server/issues/1953 1954/head
Andreas Hechenberger [Sat, 29 Oct 2016 14:07:49 +0000 (16:07 +0200)]
Fixes https://github.com/nextcloud/server/issues/1953

Signed-off-by: Andreas Hechenberger <world@greenstation.de>
8 years agoMerge pull request #1993 from nextcloud/wait-600-seconds-for-mysqlmb4
Morris Jobke [Thu, 3 Nov 2016 10:03:21 +0000 (11:03 +0100)]
Merge pull request #1993 from nextcloud/wait-600-seconds-for-mysqlmb4

adjust autotest.sh to also wait 600 seconds for mysqlmb4

8 years agoShow a hint for system based cron user name 1994/head
Morris Jobke [Thu, 3 Nov 2016 09:18:16 +0000 (10:18 +0100)]
Show a hint for system based cron user name

* makes it easier to setup cron job
* gives hints for PHP documentation
* disables the cron setting if requirements not met
* fixes #1989

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoadjust autotest.sh to also wait 600 seconds for mysqlmb4 1993/head
Morris Jobke [Thu, 3 Nov 2016 08:45:16 +0000 (09:45 +0100)]
adjust autotest.sh to also wait 600 seconds for mysqlmb4

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoMerge pull request #1991 from nextcloud/code-check-more-shipped-apps
Morris Jobke [Thu, 3 Nov 2016 08:16:20 +0000 (09:16 +0100)]
Merge pull request #1991 from nextcloud/code-check-more-shipped-apps

Run code checker on more shipped apps

8 years agoMerge pull request #1990 from nextcloud/use-php-7.1-rc-5
Morris Jobke [Thu, 3 Nov 2016 08:15:38 +0000 (09:15 +0100)]
Merge pull request #1990 from nextcloud/use-php-7.1-rc-5

Use PHP 7.1 RC5 for CI

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 3 Nov 2016 01:07:06 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoRun code checker on more shipped apps 1991/head
Lukas Reschke [Wed, 2 Nov 2016 23:09:19 +0000 (00:09 +0100)]
Run code checker on more shipped apps

Adds:
- sharebymail
- systemtags
- theming
- workflowengine

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoUse PHP 7.1 RC5 for CI 1990/head
Lukas Reschke [Wed, 2 Nov 2016 22:35:40 +0000 (23:35 +0100)]
Use PHP 7.1 RC5 for CI

This image has PHP 7.1 RC5 inside and the currently used one only RC4.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoAdjust tests and DI for Share.php 1915/head
Lukas Reschke [Wed, 2 Nov 2016 22:26:49 +0000 (23:26 +0100)]
Adjust tests and DI for Share.php

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoDI for root.php
Lukas Reschke [Wed, 2 Nov 2016 22:16:51 +0000 (23:16 +0100)]
DI for root.php

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #1978 from nextcloud/remove-send-mail-option
Morris Jobke [Wed, 2 Nov 2016 21:36:05 +0000 (22:36 +0100)]
Merge pull request #1978 from nextcloud/remove-send-mail-option

Remove send mail option

8 years agoMerge pull request #1988 from nextcloud/silly-but-effective-test
Morris Jobke [Wed, 2 Nov 2016 21:30:52 +0000 (22:30 +0100)]
Merge pull request #1988 from nextcloud/silly-but-effective-test

Add test for "languageCodes.php"

8 years agoDo not expose user data in exceptions & fix typo
Morris Jobke [Wed, 26 Oct 2016 08:13:31 +0000 (10:13 +0200)]
Do not expose user data in exceptions & fix typo

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoFix mock warning in some FS tests (#26464)
Vincent Petry [Mon, 24 Oct 2016 20:17:37 +0000 (22:17 +0200)]
Fix mock warning in some FS tests (#26464)

8 years agoAdd using casing check/fix for initMountPoints
Vincent Petry [Tue, 4 Oct 2016 10:28:41 +0000 (12:28 +0200)]
Add using casing check/fix for initMountPoints

8 years agoUpload autorename on client side 1908/head
Vincent Petry [Fri, 9 Sep 2016 10:19:29 +0000 (12:19 +0200)]
Upload autorename on client side

Removes the need for POST to collection which would hit against upload
limits.

The client tries to auto rename the file by adding a suffix "(2)".
It tries to use the file list on the client side to guess a
suitable name. In case a file still cannot be uploaded and creates a
conflict, which can happen when the file was concurrently uploaded, the
logic will continue increasing the suffix.

8 years agoMerge pull request #1981 from nextcloud/multibucket-num-buckets
Lukas Reschke [Wed, 2 Nov 2016 21:05:57 +0000 (22:05 +0100)]
Merge pull request #1981 from nextcloud/multibucket-num-buckets

Allow setting a maximun number of buckets for multibucket

8 years agoAdd test for "languageCodesTest.php" 1988/head
Lukas Reschke [Wed, 2 Nov 2016 20:53:54 +0000 (21:53 +0100)]
Add test for "languageCodesTest.php"

Arguably not the most awesome test but increases coverage and is an easy gain.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #1943 from nextcloud/log-query-builder-queries
Lukas Reschke [Wed, 2 Nov 2016 20:51:39 +0000 (21:51 +0100)]
Merge pull request #1943 from nextcloud/log-query-builder-queries

Log QueryBuilder queries

8 years agoAllow setting a maximun number of buckets for multibucket 1981/head
Robin Appelman [Wed, 2 Nov 2016 13:42:36 +0000 (14:42 +0100)]
Allow setting a maximun number of buckets for multibucket

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoMerge pull request #1511 from nextcloud/master-kill-upload-limit
Roeland Jago Douma [Wed, 2 Nov 2016 20:24:10 +0000 (21:24 +0100)]
Merge pull request #1511 from nextcloud/master-kill-upload-limit

Remove upload_limit in files app as it is not needed with PUT upload

8 years agoMerge pull request #1973 from nextcloud/dont-disable-shipped-apps-but-throw-instead
Morris Jobke [Wed, 2 Nov 2016 20:20:23 +0000 (21:20 +0100)]
Merge pull request #1973 from nextcloud/dont-disable-shipped-apps-but-throw-instead

Throw an exception when a shipped app was not replaced before the update

8 years agoRemove from core.json 1978/head
Roeland Jago Douma [Wed, 2 Nov 2016 18:57:47 +0000 (19:57 +0100)]
Remove from core.json

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoremove the 'shareapi_allow_mail_notification' setting
Bjoern Schiessle [Wed, 2 Nov 2016 11:03:52 +0000 (12:03 +0100)]
remove the 'shareapi_allow_mail_notification' setting

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoAdd tests 1943/head
Lukas Reschke [Wed, 2 Nov 2016 20:10:51 +0000 (21:10 +0100)]
Add tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #1986 from nextcloud/add-htaccess-checker
Morris Jobke [Wed, 2 Nov 2016 19:52:16 +0000 (20:52 +0100)]
Merge pull request #1986 from nextcloud/add-htaccess-checker

Add .htaccess checker as CI step

8 years agoRemove upload_limit in files app as it is not needed with PUT upload (#26069) 1511/head
Vincent Petry [Mon, 19 Sep 2016 19:29:48 +0000 (21:29 +0200)]
Remove upload_limit in files app as it is not needed with PUT upload (#26069)

The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoInject config and logger
Joas Schilling [Fri, 28 Oct 2016 11:48:58 +0000 (13:48 +0200)]
Inject config and logger

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoLog the queries of the QueryBuilder as well
Joas Schilling [Fri, 28 Oct 2016 09:29:38 +0000 (11:29 +0200)]
Log the queries of the QueryBuilder as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoFix missing update of session, when it was already used.
Joas Schilling [Fri, 28 Oct 2016 09:29:02 +0000 (11:29 +0200)]
Fix missing update of session, when it was already used.

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1958 from harry-7/1428issue
Lukas Reschke [Wed, 2 Nov 2016 19:22:48 +0000 (20:22 +0100)]
Merge pull request #1958 from harry-7/1428issue

Added Exception catch and ignore for DBuser exists

8 years agoMerge pull request #1984 from nextcloud/improve-error-messages-federated-sharing
Lukas Reschke [Wed, 2 Nov 2016 19:19:44 +0000 (20:19 +0100)]
Merge pull request #1984 from nextcloud/improve-error-messages-federated-sharing

improved error messages in case federated sharing fails

8 years agoAdd .htaccess checker as CI step 1986/head
Lukas Reschke [Wed, 2 Nov 2016 19:11:30 +0000 (20:11 +0100)]
Add .htaccess checker as CI step

Don't want anyone to commit invalid changes in that file again :see_no_evil:

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #1960 from nextcloud/adjust-link-to-contributing.md
Roeland Jago Douma [Wed, 2 Nov 2016 19:04:45 +0000 (20:04 +0100)]
Merge pull request #1960 from nextcloud/adjust-link-to-contributing.md

Adjust link to contributing.md

8 years agoMerge pull request #1971 from nextcloud/fix-checkbox-glitch
Roeland Jago Douma [Wed, 2 Nov 2016 19:02:36 +0000 (20:02 +0100)]
Merge pull request #1971 from nextcloud/fix-checkbox-glitch

Fix checkbox left margin glitch

8 years agoMerge pull request #1347 from nextcloud/bring-back-remember-me
Morris Jobke [Wed, 2 Nov 2016 17:32:38 +0000 (18:32 +0100)]
Merge pull request #1347 from nextcloud/bring-back-remember-me

fix remember me login

8 years agoremove 'send mail notification' option from sharing, replaced by send-by-mail feature
Bjoern Schiessle [Wed, 2 Nov 2016 10:37:25 +0000 (11:37 +0100)]
remove 'send mail notification' option from sharing, replaced by send-by-mail feature

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agocatch all exception and return a user friendly exception message 1984/head
Bjoern Schiessle [Wed, 2 Nov 2016 17:05:14 +0000 (18:05 +0100)]
catch all exception and return a user friendly exception message

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoMerge pull request #1940 from nextcloud/new-appstore
Michael Grosser [Wed, 2 Nov 2016 17:00:24 +0000 (17:00 +0000)]
Merge pull request #1940 from nextcloud/new-appstore

Use new appstore API

8 years agodocument what the method does 1347/head
Christoph Wurst [Wed, 2 Nov 2016 16:32:44 +0000 (17:32 +0100)]
document what the method does

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
8 years agoMerge pull request #1982 from nextcloud/revert-1949-disable-codecov-comments
Lukas Reschke [Wed, 2 Nov 2016 15:33:08 +0000 (16:33 +0100)]
Merge pull request #1982 from nextcloud/revert-1949-disable-codecov-comments

Revert "Disable codecov comments"

8 years agoRemove sunburst 1982/head
Lukas Reschke [Wed, 2 Nov 2016 14:33:22 +0000 (15:33 +0100)]
Remove sunburst

8 years agoRevert "Disable codecov comments"
Lukas Reschke [Wed, 2 Nov 2016 14:29:13 +0000 (15:29 +0100)]
Revert "Disable codecov comments"

8 years agoFix #1782 1971/head
John Molakvoæ [Tue, 1 Nov 2016 17:21:14 +0000 (18:21 +0100)]
Fix #1782

Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoMerge pull request #1887 from nextcloud/downstream-26370
Morris Jobke [Wed, 2 Nov 2016 13:57:45 +0000 (14:57 +0100)]
Merge pull request #1887 from nextcloud/downstream-26370

Added functions to check etag of elements - integration tests

8 years agoAdd missing tests and fix PHPDoc
Lukas Reschke [Wed, 2 Nov 2016 12:37:39 +0000 (13:37 +0100)]
Add missing tests and fix PHPDoc

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoFix typ in constant name
Lukas Reschke [Wed, 2 Nov 2016 12:08:09 +0000 (13:08 +0100)]
Fix typ in constant name

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoFix invalid PHPDocs
Lukas Reschke [Wed, 2 Nov 2016 12:07:49 +0000 (13:07 +0100)]
Fix invalid PHPDocs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoinject ISecureRandom into user session and use injected config too
Christoph Wurst [Mon, 31 Oct 2016 08:36:55 +0000 (09:36 +0100)]
inject ISecureRandom into user session and use injected config too

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
8 years agobring back remember-me
Christoph Wurst [Tue, 6 Sep 2016 19:41:15 +0000 (21:41 +0200)]
bring back remember-me
* try to reuse the old session token for remember me login
* decrypt/encrypt token password and set the session id accordingly
* create remember-me cookies only if checkbox is checked and 2fa solved
* adjust db token cleanup to store remembered tokens longer
* adjust unit tests

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
8 years agoMerge pull request #1977 from nextcloud/adjust-badges
Joas Schilling [Wed, 2 Nov 2016 11:35:32 +0000 (12:35 +0100)]
Merge pull request #1977 from nextcloud/adjust-badges

Adjust badges

8 years agoMerge pull request #1966 from nextcloud/fix-csrf-token-generation
Roeland Jago Douma [Wed, 2 Nov 2016 11:09:30 +0000 (12:09 +0100)]
Merge pull request #1966 from nextcloud/fix-csrf-token-generation

Fix CSRF token generation / validation

8 years agoMerge pull request #1975 from nextcloud/federated-sharing-always-https-by-default
Roeland Jago Douma [Wed, 2 Nov 2016 11:09:11 +0000 (12:09 +0100)]
Merge pull request #1975 from nextcloud/federated-sharing-always-https-by-default

use https by default if no protocol is given.

8 years agoAdjust badges 1977/head
Lukas Reschke [Wed, 2 Nov 2016 10:50:14 +0000 (11:50 +0100)]
Adjust badges

- Removes the Drone badge
  - This one is lying most of the time since it isn't checking master but the latest build. Thus it fails when it effectively doesn't fail. Let's remove that since it makes us look bad.
- Add CodeCov badge
- Add CII badge

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #657 from nextcloud/share-by-mail
Joas Schilling [Wed, 2 Nov 2016 10:04:33 +0000 (11:04 +0100)]
Merge pull request #657 from nextcloud/share-by-mail

New share provider: Share by mail

8 years agouse https by default if no protocol is given. Only use unsecure connection if it... 1975/head
Bjoern Schiessle [Wed, 2 Nov 2016 09:44:55 +0000 (10:44 +0100)]
use https by default if no protocol is given. Only use unsecure connection if it is explicitely given

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoFix CSRF token generation / validation 1966/head
Leon Klingele [Mon, 31 Oct 2016 17:22:42 +0000 (18:22 +0100)]
Fix CSRF token generation / validation

Operate on raw bytes instead of base64-encoded strings.
Issue was introduced in a977465

Signed-off-by: Leon Klingele <git@leonklingele.de>
8 years agoAdjust link to contributing.md 1960/head
Joas Schilling [Mon, 31 Oct 2016 08:27:16 +0000 (09:27 +0100)]
Adjust link to contributing.md

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoRevert "Move CONTRIBUTUNG and issue template into .github subfolder"
Joas Schilling [Wed, 2 Nov 2016 09:26:47 +0000 (10:26 +0100)]
Revert "Move CONTRIBUTUNG and issue template into .github subfolder"

This reverts commit 9ebd8d80ff5ba655db8cf94dbb9112a9dacff6cf.

8 years agoMerge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the-admin
Roeland Jago Douma [Wed, 2 Nov 2016 09:06:35 +0000 (10:06 +0100)]
Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the-admin

Color the trusted domain to alert the admin a bit more

8 years agoThrow an exception when a shipped app was not replaced before the update 1973/head
Joas Schilling [Wed, 2 Nov 2016 08:40:10 +0000 (09:40 +0100)]
Throw an exception when a shipped app was not replaced before the update

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoFix intergration tests 1887/head
Roeland Jago Douma [Thu, 27 Oct 2016 18:40:03 +0000 (20:40 +0200)]
Fix intergration tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoFix OCS API to be able to remove group shares from self as recipient
Roeland Jago Douma [Tue, 25 Oct 2016 08:18:42 +0000 (10:18 +0200)]
Fix OCS API to be able to remove group shares from self as recipient

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoAdded test case about issue 26346
Sergio Bertolin [Fri, 14 Oct 2016 08:58:44 +0000 (08:58 +0000)]
Added test case about issue 26346

8 years agoChanged description of variable
Sergio Bertolin [Fri, 14 Oct 2016 07:33:46 +0000 (07:33 +0000)]
Changed description of variable

8 years agoAdded functions to check etag of elements
Sergio Bertolin [Thu, 13 Oct 2016 13:16:30 +0000 (13:16 +0000)]
Added functions to check etag of elements

8 years agoMerge pull request #1951 from nextcloud/settingsmaxheight
Roeland Jago Douma [Wed, 2 Nov 2016 07:45:05 +0000 (08:45 +0100)]
Merge pull request #1951 from nextcloud/settingsmaxheight

restricted the height of the settings area in core/css/apps.css

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 2 Nov 2016 01:07:09 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoimport exception 657/head
Bjoern Schiessle [Tue, 1 Nov 2016 19:12:01 +0000 (20:12 +0100)]
import exception

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoremove unused variable
Bjoern Schiessle [Tue, 1 Nov 2016 19:11:30 +0000 (20:11 +0100)]
remove unused variable

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd new method getSharesInFolder(), see #339
Bjoern Schiessle [Tue, 1 Nov 2016 19:05:09 +0000 (20:05 +0100)]
add new method getSharesInFolder(), see #339

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd tests for the share-by-mail provider
Bjoern Schiessle [Mon, 31 Oct 2016 13:19:34 +0000 (14:19 +0100)]
add tests for the share-by-mail provider

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>