]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoadd groups to user info output 3418/head
Bjoern Schiessle [Thu, 9 Feb 2017 15:12:57 +0000 (16:12 +0100)]
add groups to user info output

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #3297 from nextcloud/cloud-id-resolve
Robin Appelman [Thu, 9 Feb 2017 13:54:32 +0000 (14:54 +0100)]
Merge pull request #3297 from nextcloud/cloud-id-resolve

Add a single public api for resolving a cloud id to a user and remote and back

7 years agofix copyright headers 3297/head
Robin Appelman [Thu, 9 Feb 2017 12:32:36 +0000 (13:32 +0100)]
fix copyright headers

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoclean cloud ids
Robin Appelman [Thu, 9 Feb 2017 12:31:06 +0000 (13:31 +0100)]
clean cloud ids

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3184 from nextcloud/issue-3165
Lukas Reschke [Thu, 9 Feb 2017 12:29:08 +0000 (13:29 +0100)]
Merge pull request #3184 from nextcloud/issue-3165

Prevent migration from ownCloud 11 to Nextcloud 12

7 years agoMerge pull request #3408 from nextcloud/nullstorage-free-space
Joas Schilling [Thu, 9 Feb 2017 12:17:54 +0000 (13:17 +0100)]
Merge pull request #3408 from nextcloud/nullstorage-free-space

return unknown free space from nullstorage

7 years agoMerge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation
Lukas Reschke [Thu, 9 Feb 2017 11:19:53 +0000 (12:19 +0100)]
Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation

Don't log the password on confirmPassword when LDAP throws an exception

7 years agoMerge pull request #3407 from nextcloud/issue-3312-user-settings-email-accounts-table
Björn Schießle [Thu, 9 Feb 2017 11:10:45 +0000 (12:10 +0100)]
Merge pull request #3407 from nextcloud/issue-3312-user-settings-email-accounts-table

Update the email in the accounts table as well

7 years agoMerge pull request #3362 from nextcloud/fix/nc-token-cookie-name
Joas Schilling [Thu, 9 Feb 2017 09:07:59 +0000 (10:07 +0100)]
Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name

oc_token should be nc_token

7 years agoFix unit tests 3408/head
Morris Jobke [Thu, 9 Feb 2017 02:39:34 +0000 (20:39 -0600)]
Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 9 Feb 2017 01:07:10 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoreturn unknown free space from nullstorage
Robin Appelman [Wed, 8 Feb 2017 15:38:00 +0000 (16:38 +0100)]
return unknown free space from nullstorage

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoadd tests
Robin Appelman [Wed, 8 Feb 2017 14:06:38 +0000 (15:06 +0100)]
add tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoregister cloudidmanager for files_sharing
Robin Appelman [Mon, 6 Feb 2017 13:50:31 +0000 (14:50 +0100)]
register cloudidmanager for files_sharing

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agolog ocs exceptions
Robin Appelman [Mon, 6 Feb 2017 13:46:52 +0000 (14:46 +0100)]
log ocs exceptions

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoremove test for removed code
Robin Appelman [Mon, 6 Feb 2017 12:19:33 +0000 (13:19 +0100)]
remove test for removed code

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd a single public api for resolving a cloud id to a user and remote and back
Robin Appelman [Fri, 27 Jan 2017 11:52:17 +0000 (12:52 +0100)]
Add a single public api for resolving a cloud id to a user and remote and back

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3394 from nextcloud/issue-3344-files-activity-expects-parameter...
Lukas Reschke [Wed, 8 Feb 2017 13:47:45 +0000 (14:47 +0100)]
Merge pull request #3394 from nextcloud/issue-3344-files-activity-expects-parameter-1-to-be-an-array

Make sure ownCloud 8.2 activities also can get displayed

7 years agoUpdate the email in the accounts table as well 3407/head
Joas Schilling [Wed, 8 Feb 2017 12:52:55 +0000 (13:52 +0100)]
Update the email in the accounts table as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3403 from nextcloud/rename-dbpassword-toggle
Joas Schilling [Wed, 8 Feb 2017 11:16:53 +0000 (12:16 +0100)]
Merge pull request #3403 from nextcloud/rename-dbpassword-toggle

Rename database password toggle

7 years agoFix files sharing legacy as well 3394/head
Joas Schilling [Wed, 8 Feb 2017 10:55:50 +0000 (11:55 +0100)]
Fix files sharing legacy as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 8 Feb 2017 01:07:09 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoRename database password toggle 3403/head
Morris Jobke [Tue, 7 Feb 2017 22:59:12 +0000 (16:59 -0600)]
Rename database password toggle

* otherwise submitting the form with the password show will be overwritten
* see https://github.com/nextcloud/server/blob/2c9d7eeb763d2f907eea8234f6c60a829a5d39f7/core/Controller/SetupController.php#L59
* seems to be a legacy fallback
* fixes #3381

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoDon't log the password on confirmPassword when LDAP throws an exception 3396/head
Joas Schilling [Tue, 7 Feb 2017 11:16:11 +0000 (12:16 +0100)]
Don't log the password on confirmPassword when LDAP throws an exception

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd tests for getUser()
Joas Schilling [Tue, 7 Feb 2017 11:01:28 +0000 (12:01 +0100)]
Add tests for getUser()

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd tests for getFile()
Joas Schilling [Tue, 7 Feb 2017 10:49:01 +0000 (11:49 +0100)]
Add tests for getFile()

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMake sure ownCloud 8.2 activities also can get displayed
Joas Schilling [Tue, 7 Feb 2017 10:30:23 +0000 (11:30 +0100)]
Make sure ownCloud 8.2 activities also can get displayed

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 7 Feb 2017 01:08:50 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3352 from nextcloud/public-page-guest-css-loader
Morris Jobke [Tue, 7 Feb 2017 00:15:56 +0000 (18:15 -0600)]
Merge pull request #3352 from nextcloud/public-page-guest-css-loader

Fix public page css fallback loading

7 years agoTOTP css 3352/head
John Molakvoæ (skjnldsv) [Mon, 6 Feb 2017 21:26:01 +0000 (22:26 +0100)]
TOTP css

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoMerge pull request #3364 from nextcloud/sass-logging
Robin Appelman [Mon, 6 Feb 2017 11:52:57 +0000 (12:52 +0100)]
Merge pull request #3364 from nextcloud/sass-logging

Lower log levels of resource locator

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 6 Feb 2017 01:07:04 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 5 Feb 2017 01:07:05 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3353 from nextcloud/mobile-view-files-fix
Marius Blüm [Sat, 4 Feb 2017 20:00:40 +0000 (21:00 +0100)]
Merge pull request #3353 from nextcloud/mobile-view-files-fix

Fix files mobile view

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 4 Feb 2017 01:07:20 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agofix unit tests 3364/head
Morris Jobke [Fri, 3 Feb 2017 17:52:01 +0000 (11:52 -0600)]
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoLower log levels of resource locator
Robin Appelman [Fri, 3 Feb 2017 12:09:33 +0000 (13:09 +0100)]
Lower log levels of resource locator

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 3 Feb 2017 01:07:21 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agooc_token should be nc_token 3362/head
Christoph Wurst [Thu, 2 Feb 2017 20:56:44 +0000 (21:56 +0100)]
oc_token should be nc_token

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoMerge pull request #3359 from nextcloud/fix-sharing-app-description
Morris Jobke [Thu, 2 Feb 2017 20:47:45 +0000 (14:47 -0600)]
Merge pull request #3359 from nextcloud/fix-sharing-app-description

Fix Sharing app description

7 years agoFix Sharing app description 3359/head
Joas Schilling [Thu, 2 Feb 2017 15:22:21 +0000 (16:22 +0100)]
Fix Sharing app description

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 2 Feb 2017 01:07:05 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoFix files mobile view 3353/head
John Molakvoæ (skjnldsv) [Wed, 1 Feb 2017 17:39:27 +0000 (18:39 +0100)]
Fix files mobile view

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoVarious fixes guest css
John Molakvoæ (skjnldsv) [Wed, 1 Feb 2017 17:10:52 +0000 (18:10 +0100)]
Various fixes guest css

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoFix public page css fallback loading
John Molakvoæ (skjnldsv) [Wed, 1 Feb 2017 16:57:19 +0000 (17:57 +0100)]
Fix public page css fallback loading

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 1 Feb 2017 01:06:57 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3321 from nextcloud/revert-unintentional-change-of-log-timestamp...
Morris Jobke [Tue, 31 Jan 2017 14:44:06 +0000 (08:44 -0600)]
Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-timestamp-format

Revert unintentional log timestamp format change

7 years agoMerge pull request #2044 from nextcloud/login-credential-store
Morris Jobke [Tue, 31 Jan 2017 01:30:04 +0000 (19:30 -0600)]
Merge pull request #2044 from nextcloud/login-credential-store

Login credential store

7 years agoMerge pull request #3169 from nextcloud/update-doctrine
Morris Jobke [Tue, 31 Jan 2017 01:23:16 +0000 (19:23 -0600)]
Merge pull request #3169 from nextcloud/update-doctrine

Update doctrine

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 31 Jan 2017 01:07:05 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3282 from nextcloud/header-menu-arrow-up
Morris Jobke [Mon, 30 Jan 2017 23:23:10 +0000 (17:23 -0600)]
Merge pull request #3282 from nextcloud/header-menu-arrow-up

Merge similar properties and standardize the arrow to the menu class

7 years agoUpdate doctrine 3169/head
Joas Schilling [Thu, 19 Jan 2017 16:40:25 +0000 (17:40 +0100)]
Update doctrine

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2970 from nextcloud/notify-self-test
Morris Jobke [Mon, 30 Jan 2017 23:15:57 +0000 (17:15 -0600)]
Merge pull request #2970 from nextcloud/notify-self-test

Add self-test for files_external:notify

7 years agoFix config.sample.php 3321/head
Morris Jobke [Mon, 30 Jan 2017 22:52:30 +0000 (16:52 -0600)]
Fix config.sample.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3298 from nextcloud/downstream-26928
blizzz [Mon, 30 Jan 2017 17:01:06 +0000 (18:01 +0100)]
Merge pull request #3298 from nextcloud/downstream-26928

remove obsolete hack (#26928)

7 years agoRevert unintentional log timestamp format change
Joas Schilling [Mon, 30 Jan 2017 14:06:23 +0000 (15:06 +0100)]
Revert unintentional log timestamp format change

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3176 from nextcloud/default-value-datadir
blizzz [Mon, 30 Jan 2017 12:01:24 +0000 (13:01 +0100)]
Merge pull request #3176 from nextcloud/default-value-datadir

Add proper default value for datadir

7 years agoMerge pull request #3260 from nextcloud/various-scss-fixes
Christoph Wurst [Mon, 30 Jan 2017 10:34:39 +0000 (11:34 +0100)]
Merge pull request #3260 from nextcloud/various-scss-fixes

Various scss fixes

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 30 Jan 2017 01:07:14 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 29 Jan 2017 01:06:55 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 28 Jan 2017 01:06:59 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

7 years agoremove obsolete hack (#26928) 3298/head
Jörn Friedrich Dreyer [Thu, 12 Jan 2017 15:07:41 +0000 (16:07 +0100)]
remove obsolete hack (#26928)

* remove obsolete hack

> // file_get_contents() has a memory leak: https://bugs.php.net/bug.php?id=61961
was closed 4 years ago. we could also use the Common implementation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #2822 from nextcloud/add-navigation-via-info.xml
Morris Jobke [Fri, 27 Jan 2017 17:25:26 +0000 (11:25 -0600)]
Merge pull request #2822 from nextcloud/add-navigation-via-info.xml

Add navigation via info.xml (#26785)

7 years agoMerge pull request #3178 from nextcloud/default-value-logdateformat
Joas Schilling [Fri, 27 Jan 2017 11:08:57 +0000 (12:08 +0100)]
Merge pull request #3178 from nextcloud/default-value-logdateformat

fix default value for logdateformat

7 years agoupdate autoloader 2970/head
Robin Appelman [Wed, 11 Jan 2017 15:09:54 +0000 (16:09 +0100)]
update autoloader

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd since
Robin Appelman [Tue, 10 Jan 2017 12:33:38 +0000 (13:33 +0100)]
Add since

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoadd unit tests for smb notify backend
Robin Appelman [Fri, 6 Jan 2017 15:34:29 +0000 (16:34 +0100)]
add unit tests for smb notify backend

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoadd notify self test
Robin Appelman [Fri, 6 Jan 2017 15:11:18 +0000 (16:11 +0100)]
add notify self test

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoswitch occ files_external:notify to new notify mechanism
Robin Appelman [Fri, 6 Jan 2017 14:42:43 +0000 (15:42 +0100)]
switch occ files_external:notify to new notify mechanism

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd a more powerful notify mechanism
Robin Appelman [Fri, 6 Jan 2017 14:39:01 +0000 (15:39 +0100)]
Add a more powerful notify mechanism

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd missing smb files
Robin Appelman [Fri, 6 Jan 2017 14:10:50 +0000 (15:10 +0100)]
Add missing smb files

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive
Lukas Reschke [Fri, 27 Jan 2017 09:14:22 +0000 (10:14 +0100)]
Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive

Make sure different webroots use different cached paths

7 years agoForce to specify the name 2822/head
Joas Schilling [Fri, 27 Jan 2017 08:38:10 +0000 (09:38 +0100)]
Force to specify the name

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3284 from nextcloud/remove-avatar-fixup
Morris Jobke [Fri, 27 Jan 2017 02:14:24 +0000 (20:14 -0600)]
Merge pull request #3284 from nextcloud/remove-avatar-fixup

remote now unneeded AvatarPermissions repair step

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 27 Jan 2017 01:07:18 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bug
Morris Jobke [Thu, 26 Jan 2017 23:30:51 +0000 (17:30 -0600)]
Merge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bug

fix shared-as-busy events for owner

7 years agoMerge pull request #3249 from nextcloud/add-clear-search-button
Morris Jobke [Thu, 26 Jan 2017 21:42:52 +0000 (15:42 -0600)]
Merge pull request #3249 from nextcloud/add-clear-search-button

Add clear search button

7 years agoMerge pull request #3246 from nextcloud/fix-sqlite-dependency
Morris Jobke [Thu, 26 Jan 2017 21:41:11 +0000 (15:41 -0600)]
Merge pull request #3246 from nextcloud/fix-sqlite-dependency

Remove useless dependency on SQLite (non-PDO)

7 years agoBlue shadow fix 2 3260/head
John Molakvoæ (skjnldsv) [Thu, 26 Jan 2017 19:35:22 +0000 (20:35 +0100)]
Blue shadow fix 2

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoBlue left shadow fix #3288
John Molakvoæ (skjnldsv) [Thu, 26 Jan 2017 19:26:15 +0000 (20:26 +0100)]
Blue left shadow fix #3288

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoremote now unneeded AvatarPermissions repair step 3284/head
Robin Appelman [Thu, 26 Jan 2017 15:21:47 +0000 (16:21 +0100)]
remote now unneeded AvatarPermissions repair step

Avatars are now stored in appdata

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3163 from nextcloud/issue-3148-wrong-page-title-on-non-nonce...
Lukas Reschke [Thu, 26 Jan 2017 17:44:48 +0000 (18:44 +0100)]
Merge pull request #3163 from nextcloud/issue-3148-wrong-page-title-on-non-nonce-browser

Use correct theming when returning the defaults

7 years agoMerge pull request #3238 from nextcloud/dav-test
Lukas Reschke [Thu, 26 Jan 2017 17:43:36 +0000 (18:43 +0100)]
Merge pull request #3238 from nextcloud/dav-test

Make DAV external storage test more reliable

7 years agoMerge pull request #3272 from nextcloud/fix_user_controller
Lukas Reschke [Thu, 26 Jan 2017 17:37:36 +0000 (18:37 +0100)]
Merge pull request #3272 from nextcloud/fix_user_controller

make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API

7 years agoMerge similar properties and apply arrow to menu class 3282/head
John Molakvoæ (skjnldsv) [Thu, 26 Jan 2017 14:50:18 +0000 (15:50 +0100)]
Merge similar properties and apply arrow to menu class

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoJs magic to reset search 3249/head
John Molakvoæ (skjnldsv) [Thu, 26 Jan 2017 14:33:05 +0000 (15:33 +0100)]
Js magic to reset search

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoMerge pull request #3160 from nextcloud/streams52
Roeland Jago Douma [Thu, 26 Jan 2017 13:55:37 +0000 (14:55 +0100)]
Merge pull request #3160 from nextcloud/streams52

update icewind/streams to 0.5.2

7 years agoupdate icewind/streams to 0.5.2 3160/head
Robin Appelman [Thu, 19 Jan 2017 13:38:03 +0000 (14:38 +0100)]
update icewind/streams to 0.5.2

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agofix shared-as-busy events for owner 3275/head
Georg Ehrke [Thu, 26 Jan 2017 11:02:27 +0000 (12:02 +0100)]
fix shared-as-busy events for owner

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoMerge pull request #3265 from nextcloud/brute-force-protection-public-link-auth
Lukas Reschke [Thu, 26 Jan 2017 11:05:16 +0000 (12:05 +0100)]
Merge pull request #3265 from nextcloud/brute-force-protection-public-link-auth

add brute force protection for public link authentication

7 years agomake sure that 'getCurrentUser' gets an array in order to manipulate the data to... 3272/head
Bjoern Schiessle [Thu, 26 Jan 2017 10:31:08 +0000 (11:31 +0100)]
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #3264 from nextcloud/ldap-deny-long-dns
Morris Jobke [Thu, 26 Jan 2017 07:15:43 +0000 (01:15 -0600)]
Merge pull request #3264 from nextcloud/ldap-deny-long-dns

Gracefully deny users or groups with too long DNs

7 years agoMerge pull request #3197 from nextcloud/enable-scss-for-all-apps
Morris Jobke [Thu, 26 Jan 2017 04:53:23 +0000 (22:53 -0600)]
Merge pull request #3197 from nextcloud/enable-scss-for-all-apps

Enable every app to generate their scss file

7 years agoMerge pull request #3162 from nextcloud/ldap-ocs
Morris Jobke [Thu, 26 Jan 2017 04:45:34 +0000 (22:45 -0600)]
Merge pull request #3162 from nextcloud/ldap-ocs

Part 1 of LDAP Backend OCS Api

7 years agoRemove useless dependency on SQLite (non-PDO) 3246/head
Morris Jobke [Tue, 24 Jan 2017 22:14:20 +0000 (16:14 -0600)]
Remove useless dependency on SQLite (non-PDO)

* we only require the PDO driver
* fixes #481

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3208 from nextcloud/issue-3125-bring-user-management-endpoints...
Morris Jobke [Thu, 26 Jan 2017 04:16:25 +0000 (22:16 -0600)]
Merge pull request #3208 from nextcloud/issue-3125-bring-user-management-endpoints-in-line

Error out when subadmin doesn't select any group

7 years agoMerge pull request #3252 from nextcloud/remove-activity-icon-hacking
Morris Jobke [Thu, 26 Jan 2017 01:19:44 +0000 (19:19 -0600)]
Merge pull request #3252 from nextcloud/remove-activity-icon-hacking

Remove the icon since it's defined by the app itself

7 years agoMerge pull request #3255 from nextcloud/fix-password-form
Morris Jobke [Thu, 26 Jan 2017 01:19:26 +0000 (19:19 -0600)]
Merge pull request #3255 from nextcloud/fix-password-form

fix personal page password form layout

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 26 Jan 2017 01:07:15 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3258 from nextcloud/you-get-a-copyright-you-get-a-copyright-every...
Morris Jobke [Thu, 26 Jan 2017 01:00:55 +0000 (19:00 -0600)]
Merge pull request #3258 from nextcloud/you-get-a-copyright-you-get-a-copyright-everybody-gets-a-copyright

Copyright of scss files