]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
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 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 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 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>
8 years agoalways show correct place holder, mention share by mail only if the share provider...
Bjoern Schiessle [Mon, 31 Oct 2016 10:52:00 +0000 (11:52 +0100)]
always show correct place holder, mention share by mail only if the share provider is enabled

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoenabled by default and add to shipped.json
Bjoern Schiessle [Thu, 27 Oct 2016 15:21:43 +0000 (17:21 +0200)]
enabled by default and add to shipped.json

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agounit tests updated and new added
Bjoern Schiessle [Thu, 27 Oct 2016 10:27:09 +0000 (12:27 +0200)]
unit tests updated and new added

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agofind and show share-by mail links
Bjoern Schiessle [Wed, 26 Oct 2016 10:18:39 +0000 (12:18 +0200)]
find and show share-by mail links

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agodon't show 'notify by mail' option or permissions not available for mail shares
Bjoern Schiessle [Wed, 26 Oct 2016 09:27:43 +0000 (11:27 +0200)]
don't show 'notify by mail' option or permissions not available for mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agosend mail for share-by-mail shares
Bjoern Schiessle [Wed, 26 Oct 2016 09:04:00 +0000 (11:04 +0200)]
send mail for share-by-mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoif we have a exact match, either for the federated cloud id or for the
Bjoern Schiessle [Tue, 25 Oct 2016 15:13:10 +0000 (17:13 +0200)]
if we have a exact match, either for the federated cloud id or for the
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agounified way to display remote shares and mail shares
Bjoern Schiessle [Tue, 25 Oct 2016 14:24:49 +0000 (16:24 +0200)]
unified way to display remote shares and mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoshow correct display name if we have the user in one of our address books
Bjoern Schiessle [Tue, 25 Oct 2016 14:24:24 +0000 (16:24 +0200)]
show correct display name if we have the user in one of our address books

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoimprove search for federated cloud ids and email adresses
Bjoern Schiessle [Tue, 25 Oct 2016 12:42:59 +0000 (14:42 +0200)]
improve search for federated cloud ids and email adresses

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agohandle case if no share-by-mail share provider is loaded
Bjoern Schiessle [Mon, 24 Oct 2016 15:04:40 +0000 (17:04 +0200)]
handle case if no share-by-mail share provider is loaded

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd method to check if a share provider for a given type is loaded
Bjoern Schiessle [Mon, 24 Oct 2016 15:03:36 +0000 (17:03 +0200)]
add method to check if a share provider for a given type is loaded

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoupdate permissions
Bjoern Schiessle [Wed, 5 Oct 2016 15:51:43 +0000 (17:51 +0200)]
update permissions

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd share by mail share provider
Bjoern Schiessle [Fri, 29 Jul 2016 13:38:31 +0000 (15:38 +0200)]
add share by mail share provider

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agointroduce share by mail, ui part
Bjoern Schiessle [Fri, 29 Jul 2016 13:37:08 +0000 (15:37 +0200)]
introduce share by mail, ui part

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoMerge pull request #339 from nextcloud/share-types-by-folder
Lukas Reschke [Tue, 1 Nov 2016 17:44:00 +0000 (18:44 +0100)]
Merge pull request #339 from nextcloud/share-types-by-folder

Add getShareTypesInFolder to optimize folder listening

8 years agoAdd defaultShareProvider & federatedshareprovider tests 339/head
Roeland Jago Douma [Tue, 1 Nov 2016 12:22:52 +0000 (13:22 +0100)]
Add defaultShareProvider & federatedshareprovider tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoAdd Manager unit tests
Roeland Jago Douma [Tue, 1 Nov 2016 11:35:50 +0000 (12:35 +0100)]
Add Manager unit tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoFix merging backend results
Roeland Jago Douma [Tue, 1 Nov 2016 11:15:14 +0000 (12:15 +0100)]
Fix merging backend results

* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 1 Nov 2016 01:06:57 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

8 years agoAdd remoteprovider getsharesinfolder function
Roeland Jago Douma [Mon, 31 Oct 2016 19:26:11 +0000 (20:26 +0100)]
Add remoteprovider getsharesinfolder function

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoStricter signature
Roeland Jago Douma [Mon, 31 Oct 2016 19:19:00 +0000 (20:19 +0100)]
Stricter signature

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoAdd tests for installer method 1940/head
Lukas Reschke [Mon, 31 Oct 2016 18:39:35 +0000 (19:39 +0100)]
Add tests for installer method

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoRemove non-required getter
Lukas Reschke [Mon, 31 Oct 2016 17:45:13 +0000 (18:45 +0100)]
Remove non-required getter

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMove to non-static version
Lukas Reschke [Mon, 31 Oct 2016 17:42:19 +0000 (18:42 +0100)]
Move to non-static version

The static version is used nowhere in the code and just decreases coverage

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoUse findAppInDirectories
Lukas Reschke [Mon, 31 Oct 2016 16:30:02 +0000 (17:30 +0100)]
Use findAppInDirectories

The other function doesn't work if the appstore is disabled

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoProxy images through usercontent.apps.nextcloud.com
Lukas Reschke [Mon, 31 Oct 2016 16:08:11 +0000 (17:08 +0100)]
Proxy images through usercontent.apps.nextcloud.com

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoAdd update support
Lukas Reschke [Mon, 31 Oct 2016 10:07:54 +0000 (11:07 +0100)]
Add update support

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoQuery the timefactory instead of creating it
Lukas Reschke [Fri, 28 Oct 2016 10:56:41 +0000 (12:56 +0200)]
Query the timefactory instead of creating it

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoAdd support for CRL
Lukas Reschke [Fri, 28 Oct 2016 10:46:02 +0000 (12:46 +0200)]
Add support for CRL

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoReplace with exception instead of boolean return value
Lukas Reschke [Fri, 28 Oct 2016 10:36:44 +0000 (12:36 +0200)]
Replace with exception instead of boolean return value

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago%d instead %s
Lukas Reschke [Fri, 28 Oct 2016 08:37:08 +0000 (10:37 +0200)]
%d instead %s

These are only numbers. THX @nickvergessen

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoUse substr and explode instead of a regex
Lukas Reschke [Fri, 28 Oct 2016 08:34:00 +0000 (10:34 +0200)]
Use substr and explode instead of a regex

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoRead array elements instead of substr
Lukas Reschke [Fri, 28 Oct 2016 08:13:02 +0000 (10:13 +0200)]
Read array elements instead of substr

Otherwise this would break with 11.0.0

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMake non-static
Lukas Reschke [Thu, 27 Oct 2016 18:18:54 +0000 (20:18 +0200)]
Make non-static

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoFix tests
Lukas Reschke [Thu, 27 Oct 2016 18:13:15 +0000 (20:13 +0200)]
Fix tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoUse new appstore API
Lukas Reschke [Thu, 27 Oct 2016 15:41:15 +0000 (17:41 +0200)]
Use new appstore API

This change introduces the new appstore API in Nextcloud.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoAdd getShareTypesInFolder to optimize folder listening
Robin Appelman [Sat, 18 Jun 2016 20:04:56 +0000 (22:04 +0200)]
Add getShareTypesInFolder to optimize folder listening

Signed-off-by: Robin Appelman <icewind@owncloud.com>
8 years agoColor the trusted domain to alert the admin a bit more 1964/head
Joas Schilling [Mon, 31 Oct 2016 11:22:21 +0000 (12:22 +0100)]
Color the trusted domain to alert the admin a bit more

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoAdded Exception catch in case of DB User exists 1958/head
Hemanth Kumar Veeranki [Mon, 31 Oct 2016 11:02:22 +0000 (16:32 +0530)]
Added Exception catch in case of DB User exists

Signed-off-by: Hemanth Kumar Veeranki <hemanthveeranki@gmail.com>
8 years agoMerge pull request #1961 from nextcloud/configphp_begone
Roeland Jago Douma [Mon, 31 Oct 2016 10:51:20 +0000 (11:51 +0100)]
Merge pull request #1961 from nextcloud/configphp_begone

Remove config.php for oc.js

8 years agoMerge pull request #1937 from nextcloud/ros-for-notification-message
Roeland Jago Douma [Mon, 31 Oct 2016 10:51:02 +0000 (11:51 +0100)]
Merge pull request #1937 from nextcloud/ros-for-notification-message

Allow rich object strings in messages as well

8 years agoMerge pull request #1952 from nextcloud/deprecated_backgroudjob
Lukas Reschke [Mon, 31 Oct 2016 10:30:46 +0000 (11:30 +0100)]
Merge pull request #1952 from nextcloud/deprecated_backgroudjob

Cleanup deprecated backgroudjob functions

8 years agoRemove config.php for oc.js 1961/head
Roeland Jago Douma [Mon, 31 Oct 2016 10:00:39 +0000 (11:00 +0100)]
Remove config.php for oc.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoType hints already make sure it is an array 1937/head
Joas Schilling [Fri, 28 Oct 2016 07:23:43 +0000 (09:23 +0200)]
Type hints already make sure it is an array

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoAllow rich object strings in messages as well
Joas Schilling [Thu, 27 Oct 2016 13:43:34 +0000 (15:43 +0200)]
Allow rich object strings in messages as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1935 from nextcloud/downstream-ldap-26
Lukas Reschke [Mon, 31 Oct 2016 08:27:09 +0000 (09:27 +0100)]
Merge pull request #1935 from nextcloud/downstream-ldap-26

Add prefix to the connection

8 years agoMerge pull request #1903 from nextcloud/fix-log-in-button
Lukas Reschke [Mon, 31 Oct 2016 07:51:09 +0000 (08:51 +0100)]
Merge pull request #1903 from nextcloud/fix-log-in-button

remove slight transparency of primary action button, ref #1615