]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agofix sorting in the backend 3889/head
Morris Jobke [Wed, 22 Mar 2017 23:11:09 +0000 (17:11 -0600)]
fix sorting in the backend

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoSharing dialog: Names sorting is case sensitive #25971
Ilja Neumann [Tue, 17 Jan 2017 13:35:22 +0000 (14:35 +0100)]
Sharing dialog: Names sorting is case sensitive #25971

Sharing dialog: Names sorting is case sensitive: adding tests #25971

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3679 from nextcloud/socialsharing
Lukas Reschke [Thu, 16 Mar 2017 22:08:47 +0000 (23:08 +0100)]
Merge pull request #3679 from nextcloud/socialsharing

Add social sharing

7 years agoMerge pull request #3862 from nextcloud/dont-set-the-status-twice
Lukas Reschke [Thu, 16 Mar 2017 21:05:47 +0000 (22:05 +0100)]
Merge pull request #3862 from nextcloud/dont-set-the-status-twice

Don't set the HTTP status twice

7 years agoMerge pull request #3008 from nextcloud/appmenu-experiment
Morris Jobke [Thu, 16 Mar 2017 19:03:41 +0000 (13:03 -0600)]
Merge pull request #3008 from nextcloud/appmenu-experiment

Show apps in header

7 years agoMerge pull request #3863 from nextcloud/additional-hardening-of-t
Roeland Jago Douma [Thu, 16 Mar 2017 14:54:04 +0000 (15:54 +0100)]
Merge pull request #3863 from nextcloud/additional-hardening-of-t

Harden t() with DOMPurify

7 years agoHarden t() with DOMPurify 3863/head
Lukas Reschke [Thu, 16 Mar 2017 12:47:27 +0000 (13:47 +0100)]
Harden t() with DOMPurify

This mitigates issues where developers pass untrusted user-input through t() which may lead to XSS issues.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3860 from nextcloud/fix_master_after_3802
Lukas Reschke [Thu, 16 Mar 2017 13:08:32 +0000 (14:08 +0100)]
Merge pull request #3860 from nextcloud/fix_master_after_3802

Fix unit tests of master

7 years agoDon't set the HTTP status twice 3862/head
Joas Schilling [Thu, 16 Mar 2017 12:35:41 +0000 (13:35 +0100)]
Don't set the HTTP status twice

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix unit tests of master 3860/head
Roeland Jago Douma [Thu, 16 Mar 2017 11:30:21 +0000 (12:30 +0100)]
Fix unit tests of master

Follow up to #3802

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3802 from Ko-/master
Roeland Jago Douma [Thu, 16 Mar 2017 11:27:26 +0000 (12:27 +0100)]
Merge pull request #3802 from Ko-/master

Check that set_time_limit is not disabled before calling it

7 years agoMerge pull request #3857 from nextcloud/issue-3901-legacy-caldav-endpoint-email-invit...
Joas Schilling [Thu, 16 Mar 2017 11:14:32 +0000 (12:14 +0100)]
Merge pull request #3857 from nextcloud/issue-3901-legacy-caldav-endpoint-email-invitations

Fix scheduling plugin on legacy caldav endpoint

7 years agoFix html formating issues 3008/head
Julius Haertl [Fri, 3 Mar 2017 14:09:21 +0000 (15:09 +0100)]
Fix html formating issues

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRebuild menu to keep order of icons correct
Julius Haertl [Fri, 3 Mar 2017 14:09:08 +0000 (15:09 +0100)]
Rebuild menu to keep order of icons correct

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoReduce device width and hide app name when menu is open
Julius Haertl [Fri, 3 Mar 2017 12:16:30 +0000 (13:16 +0100)]
Reduce device width and hide app name when menu is open

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMake enabling/disabling apps work with the new menu
Julius Haertl [Fri, 3 Mar 2017 12:00:37 +0000 (13:00 +0100)]
Make enabling/disabling apps work with the new menu

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix positioning of popovermenu
Julius Haertl [Fri, 3 Mar 2017 12:00:10 +0000 (13:00 +0100)]
Fix positioning of popovermenu

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix popover positioning after window resize
Julius Haertl [Fri, 3 Mar 2017 01:09:49 +0000 (02:09 +0100)]
Fix popover positioning after window resize

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoCleanup SCSS for app menu and fix mobile view
Julius Haertl [Fri, 3 Mar 2017 01:09:24 +0000 (02:09 +0100)]
Cleanup SCSS for app menu and fix mobile view

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMake app management icon act like a normal app icon
Julius Haertl [Wed, 1 Mar 2017 22:57:16 +0000 (23:57 +0100)]
Make app management icon act like a normal app icon

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix menu issues
Julius Haertl [Wed, 1 Mar 2017 22:21:38 +0000 (23:21 +0100)]
Fix menu issues

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoGenerate seperate menu list for header bar
Julius Haertl [Wed, 1 Mar 2017 22:04:27 +0000 (23:04 +0100)]
Generate seperate menu list for header bar

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMove active app to the first slot
Julius Haertl [Wed, 11 Jan 2017 11:34:49 +0000 (12:34 +0100)]
Move active app to the first slot

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoShow app icons in the header
Julius Haertl [Sun, 18 Dec 2016 14:05:39 +0000 (15:05 +0100)]
Show app icons in the header

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoAdd warning on admin screen when set_time_limit is unavailable 3802/head
Ko- [Thu, 16 Mar 2017 10:48:28 +0000 (11:48 +0100)]
Add warning on admin screen when set_time_limit is unavailable

7 years agoFix scheduling plugin on legacy caldav endpoint 3857/head
Joas Schilling [Thu, 16 Mar 2017 08:55:15 +0000 (09:55 +0100)]
Fix scheduling plugin on legacy caldav endpoint

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3624 from marncz/master
Roeland Jago Douma [Thu, 16 Mar 2017 06:56:51 +0000 (07:56 +0100)]
Merge pull request #3624 from marncz/master

Update.js: countdown feedback before redirect

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 16 Mar 2017 01:07:36 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3788 from nextcloud/fed-share-modify
Roeland Jago Douma [Wed, 15 Mar 2017 16:32:35 +0000 (17:32 +0100)]
Merge pull request #3788 from nextcloud/fed-share-modify

Add api to change the remote of an incoming federated share

7 years agoMerge pull request #3843 from nextcloud/encryption-fix-mail-share
Joas Schilling [Wed, 15 Mar 2017 14:23:17 +0000 (15:23 +0100)]
Merge pull request #3843 from nextcloud/encryption-fix-mail-share

take share by mail into consideration if we calculate the access list

7 years agoMerge pull request #3848 from nextcloud/remove-single-quotes-around-search-query
Roeland Jago Douma [Wed, 15 Mar 2017 14:05:15 +0000 (15:05 +0100)]
Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query

Remove single quotes around search query like in user search

7 years agoRemove single quotes around search query like in user search 3848/head
Joas Schilling [Wed, 15 Mar 2017 11:53:44 +0000 (12:53 +0100)]
Remove single quotes around search query like in user search

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3841 from nextcloud/encyryption-trash-bin
Björn Schießle [Wed, 15 Mar 2017 08:07:07 +0000 (09:07 +0100)]
Merge pull request #3841 from nextcloud/encyryption-trash-bin

Delete files on encryption error

7 years agoSpacing 3624/head
Marcin Czarnecki [Wed, 15 Mar 2017 06:35:40 +0000 (06:35 +0000)]
Spacing

Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
7 years agoFix layout of sharing buttons 3679/head
Morris Jobke [Wed, 15 Mar 2017 04:50:32 +0000 (22:50 -0600)]
Fix layout of sharing buttons

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

7 years agoUpdate: feedback before redirect
Marcin Czarnecki [Tue, 14 Mar 2017 20:36:17 +0000 (20:36 +0000)]
Update: feedback before redirect

Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
7 years agoMerge pull request #3838 from Xuanwo/basename-fix
Roeland Jago Douma [Tue, 14 Mar 2017 20:00:24 +0000 (21:00 +0100)]
Merge pull request #3838 from Xuanwo/basename-fix

[OC/Files/Cache]: Fix wrong usage of basename

7 years agoMerge pull request #3829 from nextcloud/reshares-in-folder
Roeland Jago Douma [Tue, 14 Mar 2017 19:13:09 +0000 (20:13 +0100)]
Merge pull request #3829 from nextcloud/reshares-in-folder

switch reshares to true (display reshares in the folder/filelist)

7 years agofix mock 3829/head
Maxence Lange [Tue, 14 Mar 2017 15:28:45 +0000 (14:28 -0100)]
fix mock

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoswitch reshares to true
Maxence Lange [Mon, 13 Mar 2017 18:24:12 +0000 (17:24 -0100)]
switch reshares to true

Signed-off-by: Maxence Lange <maxence@nextcloud.com>
7 years agoMerge pull request #3836 from nextcloud/do-not-double-check-app-update
Roeland Jago Douma [Tue, 14 Mar 2017 18:26:01 +0000 (19:26 +0100)]
Merge pull request #3836 from nextcloud/do-not-double-check-app-update

Do not check for app update twice

7 years agotake share by mail into consideration if we calculate the access list 3843/head
Bjoern Schiessle [Tue, 14 Mar 2017 16:40:42 +0000 (17:40 +0100)]
take share by mail into consideration if we calculate the access list

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #3600 from coletivoEITA/master
Roeland Jago Douma [Tue, 14 Mar 2017 14:14:59 +0000 (15:14 +0100)]
Merge pull request #3600 from coletivoEITA/master

added method needsPartFile() in Storage

7 years agoMerge pull request #3783 from andrius-kulbis/master
Roeland Jago Douma [Tue, 14 Mar 2017 14:14:39 +0000 (15:14 +0100)]
Merge pull request #3783 from andrius-kulbis/master

Fix deleted objectstore shares

7 years agoMerge pull request #3824 from nextcloud/dav-search-getlastmodified
Robin Appelman [Tue, 14 Mar 2017 13:42:57 +0000 (14:42 +0100)]
Merge pull request #3824 from nextcloud/dav-search-getlastmodified

fix searching and ordering on getlastmodified

7 years agosafer casting of datetime 3824/head
Robin Appelman [Tue, 14 Mar 2017 13:12:40 +0000 (14:12 +0100)]
safer casting of datetime

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoadded method needsPartFile() in Storage 3600/head
Vinicius Cubas Brand [Thu, 23 Feb 2017 16:32:16 +0000 (13:32 -0300)]
added method needsPartFile() in Storage

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
7 years agodelete files right away in case of a encryption exception 3841/head
Bjoern Schiessle [Tue, 14 Mar 2017 11:05:25 +0000 (12:05 +0100)]
delete files right away in case of a encryption exception

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoalways throw a encryption exception
Bjoern Schiessle [Tue, 14 Mar 2017 10:31:46 +0000 (11:31 +0100)]
always throw a encryption exception

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago[OC/Files/Cache]: Fix wrong usage of basename 3838/head
Xuanwo [Tue, 14 Mar 2017 05:27:17 +0000 (13:27 +0800)]
[OC/Files/Cache]: Fix wrong usage of basename

Fix https://github.com/nextcloud/server/issues/3837

Signed-off-by: Xuanwo <xuanwo@yunify.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 14 Mar 2017 01:07:46 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoDo not double cherck app update 3836/head
Morris Jobke [Tue, 14 Mar 2017 00:07:41 +0000 (18:07 -0600)]
Do not double cherck app update

In base.php the apps are already checked for an update. No need to
repeat this during loading of the app.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3827 from nextcloud/issue-3826-remove-double-password-confirmation
Morris Jobke [Mon, 13 Mar 2017 22:03:11 +0000 (16:03 -0600)]
Merge pull request #3827 from nextcloud/issue-3826-remove-double-password-confirmation

Remove the double password confirmation on changing cron

7 years agofix unit test
Morris Jobke [Mon, 13 Mar 2017 21:59:04 +0000 (15:59 -0600)]
fix unit test

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3828 from nextcloud/no-no-empty-wildcard-search
Lukas Reschke [Mon, 13 Mar 2017 18:28:00 +0000 (19:28 +0100)]
Merge pull request #3828 from nextcloud/no-no-empty-wildcard-search

dont allow empty wildcard search

7 years agoMerge pull request #3648 from nextcloud/sabre-3.2.2
Lukas Reschke [Mon, 13 Mar 2017 18:27:09 +0000 (19:27 +0100)]
Merge pull request #3648 from nextcloud/sabre-3.2.2

[3rdparty] Bump sabre/dav to 3.2.2

7 years agodont allow empty wildcard search 3828/head
Robin Appelman [Mon, 13 Mar 2017 15:06:19 +0000 (16:06 +0100)]
dont allow empty wildcard search

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoRemove the double password confirmation on changing cron 3827/head
Joas Schilling [Mon, 13 Mar 2017 14:52:16 +0000 (15:52 +0100)]
Remove the double password confirmation on changing cron

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3822 from nextcloud/webui-upoad-no-mtime
Robin Appelman [Mon, 13 Mar 2017 14:48:59 +0000 (15:48 +0100)]
Merge pull request #3822 from nextcloud/webui-upoad-no-mtime

dont preserve mtime when uploading trough the web interface

7 years agoMerge pull request #3814 from nextcloud/oc-27328-delay-language-initialisation
Roeland Jago Douma [Mon, 13 Mar 2017 14:00:26 +0000 (15:00 +0100)]
Merge pull request #3814 from nextcloud/oc-27328-delay-language-initialisation

use closure to properly defer l10n initialization (#27328)

7 years agoMerge pull request #3819 from nextcloud/dont-add-user-to-subadmin
Roeland Jago Douma [Mon, 13 Mar 2017 13:59:48 +0000 (14:59 +0100)]
Merge pull request #3819 from nextcloud/dont-add-user-to-subadmin

Call right function after sudo mode

7 years agofix searching and ordering on getlastmodified
Robin Appelman [Mon, 13 Mar 2017 13:44:52 +0000 (14:44 +0100)]
fix searching and ordering on getlastmodified

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agodont preserve mtime when uploading trough the web interface 3822/head
Robin Appelman [Mon, 13 Mar 2017 12:19:41 +0000 (13:19 +0100)]
dont preserve mtime when uploading trough the web interface

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3780 from GitHubUser4234/audit_log_agent
Lukas Reschke [Mon, 13 Mar 2017 11:38:04 +0000 (12:38 +0100)]
Merge pull request #3780 from GitHubUser4234/audit_log_agent

Audit log the User-Agent

7 years agoMerge pull request #3803 from Thijsdh/master
Lukas Reschke [Mon, 13 Mar 2017 11:37:19 +0000 (12:37 +0100)]
Merge pull request #3803 from Thijsdh/master

Create app password by pressing enter

7 years agoCall right function after sudo mode 3819/head
Lukas Reschke [Mon, 13 Mar 2017 11:22:44 +0000 (12:22 +0100)]
Call right function after sudo mode

This should call the `applyGroupSelect` and not the `applySubadminSelect`.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoCreate app password by pressing enter 3803/head
Thijs den Hartog [Sat, 11 Mar 2017 22:01:30 +0000 (23:01 +0100)]
Create app password by pressing enter

Signed-off-by: Thijs den Hartog <Thijs@thijsbeer.nl>
7 years agouse closure to properly defer l10n initialization (#27328) 3814/head
Jörn Friedrich Dreyer [Tue, 7 Mar 2017 23:19:24 +0000 (00:19 +0100)]
use closure to properly defer l10n initialization (#27328)

7 years agoMerge pull request #3772 from nextcloud/favorite-search
Morris Jobke [Mon, 13 Mar 2017 06:55:12 +0000 (00:55 -0600)]
Merge pull request #3772 from nextcloud/favorite-search

Allow searching for favorites

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 13 Mar 2017 01:08:19 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 12 Mar 2017 01:08:05 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoCheck that set_time_limit is not disabled before calling it
Ko- [Sat, 11 Mar 2017 16:04:21 +0000 (17:04 +0100)]
Check that set_time_limit is not disabled before calling it

Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
7 years agoMerge pull request #3739 from fti7/master
Lukas Reschke [Sat, 11 Mar 2017 08:56:38 +0000 (09:56 +0100)]
Merge pull request #3739 from fti7/master

Serve robots.txt if the RewriteBase is configured

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 11 Mar 2017 01:07:48 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3798 from nextcloud/fix-login
Morris Jobke [Fri, 10 Mar 2017 20:57:05 +0000 (14:57 -0600)]
Merge pull request #3798 from nextcloud/fix-login

Fix login page, because only guest.css is loaded now

7 years agoFix login page, because only guest.css is loaded now 3798/head
Morris Jobke [Fri, 10 Mar 2017 20:43:14 +0000 (14:43 -0600)]
Fix login page, because only guest.css is loaded now

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3755 from nextcloud/scan-tipstricks
Lukas Reschke [Fri, 10 Mar 2017 20:31:37 +0000 (21:31 +0100)]
Merge pull request #3755 from nextcloud/scan-tipstricks

Add security scan to tips & tricks section

7 years agoMake intergration tests work again 3648/head
Roeland Jago Douma [Tue, 28 Feb 2017 19:18:31 +0000 (20:18 +0100)]
Make intergration tests work again

The regex was to greedy

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix tests
Roeland Jago Douma [Tue, 28 Feb 2017 09:36:42 +0000 (10:36 +0100)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[3rdparty] Bump sabre/dav to 3.2.2
Roeland Jago Douma [Tue, 28 Feb 2017 08:30:27 +0000 (09:30 +0100)]
[3rdparty] Bump sabre/dav to 3.2.2

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3774 from artem-sidorenko/posix-exit-1
Lukas Reschke [Fri, 10 Mar 2017 17:18:59 +0000 (18:18 +0100)]
Merge pull request #3774 from artem-sidorenko/posix-exit-1

Exit with error code if posix ext missing or wrong user

7 years agoMerge pull request #3778 from nextcloud/verify_jpg_files
Lukas Reschke [Fri, 10 Mar 2017 17:17:51 +0000 (18:17 +0100)]
Merge pull request #3778 from nextcloud/verify_jpg_files

Test if a file is a valid jpg file

7 years agoMerge pull request #3787 from nextcloud/ocs-cookie
Lukas Reschke [Fri, 10 Mar 2017 17:14:38 +0000 (18:14 +0100)]
Merge pull request #3787 from nextcloud/ocs-cookie

dont require strict same site cookies for ocs requests

7 years agoMerge pull request #3793 from stefan-squareweave/master
Lukas Reschke [Fri, 10 Mar 2017 17:12:55 +0000 (18:12 +0100)]
Merge pull request #3793 from stefan-squareweave/master

Correct incorrectly typed X-OC-Mtime header

7 years agoMerge pull request #3794 from nextcloud/fix_2739
Lukas Reschke [Fri, 10 Mar 2017 17:10:49 +0000 (18:10 +0100)]
Merge pull request #3794 from nextcloud/fix_2739

MP3 without cover don't get a preview

7 years agoAdd api to change the remote of an incoming federated share 3788/head
Robin Appelman [Thu, 9 Mar 2017 15:49:40 +0000 (16:49 +0100)]
Add api to change the remote of an incoming federated share

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoadd test for skipping cookie checks for ocs 3787/head
Robin Appelman [Fri, 10 Mar 2017 13:11:00 +0000 (14:11 +0100)]
add test for skipping cookie checks for ocs

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoauthor update 3780/head
Roger Szabo [Fri, 10 Mar 2017 09:24:37 +0000 (17:24 +0800)]
author update

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years agoimprovement of userAgent variable assigment
Roger Szabo [Fri, 10 Mar 2017 09:20:19 +0000 (17:20 +0800)]
improvement of userAgent variable assigment

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years agolog user agent globally instead
Roger Szabo [Fri, 10 Mar 2017 08:50:15 +0000 (16:50 +0800)]
log user agent globally instead

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years agoMP3 without cover don't get a preview 3794/head
Roeland Jago Douma [Fri, 10 Mar 2017 07:52:23 +0000 (08:52 +0100)]
MP3 without cover don't get a preview

* Fixes #2739

It tries to create an image from an SVG file. Which we don't support. So
this fails and prints an log line. Then we fall back anyways to the 404
and fetch the default icon.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoCorrect incorrectly typed X-OC-Mtime header 3793/head
Stefan Schneider [Fri, 10 Mar 2017 05:45:02 +0000 (16:45 +1100)]
Correct incorrectly typed X-OC-Mtime header

Signed-off-by: Stefan Schneider <stefan.schneider@squareweave.com.au>
7 years agoMerge pull request #3690 from nextcloud/cleanup-legacy-groups-class
Morris Jobke [Fri, 10 Mar 2017 01:09:22 +0000 (19:09 -0600)]
Merge pull request #3690 from nextcloud/cleanup-legacy-groups-class

Remove legacy class OC_Group and OC_User

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 10 Mar 2017 01:08:01 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoRemove legacy class OC_Group and OC_User 3690/head
Morris Jobke [Fri, 3 Mar 2017 07:24:27 +0000 (01:24 -0600)]
Remove legacy class OC_Group and OC_User

* basically a straight replacement of the wrapped code at the calling code parts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3791 from nextcloud/combine_sass
Lukas Reschke [Thu, 9 Mar 2017 22:25:17 +0000 (23:25 +0100)]
Merge pull request #3791 from nextcloud/combine_sass

Combine sass

7 years agoAdd more styles to the server.scss 3791/head
Morris Jobke [Thu, 9 Mar 2017 21:36:03 +0000 (15:36 -0600)]
Add more styles to the server.scss

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3693 from nextcloud/get-user-folder-of-correct-user
Roeland Jago Douma [Thu, 9 Mar 2017 20:50:05 +0000 (21:50 +0100)]
Merge pull request #3693 from nextcloud/get-user-folder-of-correct-user

Get the user folder of the correct user for mention notifications

7 years agoMerge pull request #3621 from kuimovvg/master
Roeland Jago Douma [Thu, 9 Mar 2017 20:28:32 +0000 (21:28 +0100)]
Merge pull request #3621 from kuimovvg/master

don't setted status when file is lock