37394 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Lukas Reschke	1045bf4a2b	Merge pull request #3793 from stefan-squareweave/master ... Correct incorrectly typed X-OC-Mtime header	2017-03-10 18:12:55 +01:00
Lukas Reschke	350aa8d8d2	Merge pull request #3794 from nextcloud/fix_2739 ... MP3 without cover don't get a preview	2017-03-10 18:10:49 +01:00
Roeland Jago Douma	53640bbc47	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>	2017-03-10 08:52:23 +01:00
Stefan Schneider	f6ef024159	Correct incorrectly typed X-OC-Mtime header ... Signed-off-by: Stefan Schneider <stefan.schneider@squareweave.com.au>	2017-03-10 18:16:27 +11:00
Morris Jobke	c38f87e799	Merge pull request #3690 from nextcloud/cleanup-legacy-groups-class ... Remove legacy class OC_Group and OC_User	2017-03-09 19:09:22 -06:00
Nextcloud bot	8904fb1cf3	[tx-robot] updated from transifex	2017-03-10 01:08:01 +00:00
Morris Jobke	a5ba1f7803	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>	2017-03-09 17:35:09 -06:00
Lukas Reschke	6fd0e7e939	Merge pull request #3791 from nextcloud/combine_sass ... Combine sass	2017-03-09 23:25:17 +01:00
Morris Jobke	0c22a66967	Add more styles to the server.scss ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-09 15:36:03 -06:00
Roeland Jago Douma	db5fc4d3cb	Merge pull request #3693 from nextcloud/get-user-folder-of-correct-user ... Get the user folder of the correct user for mention notifications	2017-03-09 21:50:05 +01:00
Roeland Jago Douma	c16cb1978b	Merge pull request #3621 from kuimovvg/master ... don't setted status when file is lock	2017-03-09 21:28:32 +01:00
Joas Schilling	d4200a08cc	Get the user folder of the correct user ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-09 21:07:37 +01:00
Roeland Jago Douma	f2cf85fad2	[PoC] combine 2 scss files! ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-09 20:42:34 +01:00
Roeland Jago Douma	57be594f1f	Allow using import in sass files ... This allows us to combine multiple sass files that we have to always load together anyway. Fixes #3389 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-09 20:29:50 +01:00
Morris Jobke	15fa306ae8	Merge pull request #3785 from nextcloud/bump_autoloader ... Bump autoloader	2017-03-09 09:27:12 -06:00
Björn Schießle	c23c062c89	Merge pull request #3611 from nextcloud/announce-trsuted-server-endpoints ... Announce trusted server endpoints	2017-03-09 14:39:18 +01:00
Roeland Jago Douma	d6ce7ac465	Bump autoloader ... Composer was updated so lets update the autoloader Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-09 14:21:38 +01:00
Lukas Reschke	6d10a2aece	Merge pull request #3754 from trustelem/user_saml-samesite-exclude ... Extend Same Site cookie user_saml exemption rule	2017-03-09 12:53:21 +01:00
Bjoern Schiessle	43bca9f7f6	add and adjust unit tests ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-03-09 10:07:52 +01:00
Bjoern Schiessle	3584e54a89	announce public endpoints to sync trusted servers ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-03-09 10:07:52 +01:00
Bjoern Schiessle	e08c3f1b1d	add new routes for trusted servers which are more align with the other end-points ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-03-09 09:54:52 +01:00
Nextcloud bot	a4aea572e4	[tx-robot] updated from transifex	2017-03-09 01:07:49 +00:00
Robin Appelman	2a8e922d67	Merge pull request #3360 from nextcloud/dav-search ... Implement webdav SEARCH	2017-03-08 13:09:19 +01:00
Roeland Jago Douma	74ac5dffbd	Merge pull request #3757 from nextcloud/issue-2887-no-subsystem-for-locking ... Add new user agent of windows 10 dav backend	2017-03-08 09:27:12 +01:00
Roeland Jago Douma	abecae2388	Merge pull request #3725 from nextcloud/issue-fac-55-mimetype-detection-on-public-uploads ... Fix mimetype detection on public uploads for the workflow engine	2017-03-08 08:55:33 +01:00
Nextcloud bot	98c56f9adb	[tx-robot] updated from transifex	2017-03-08 01:07:47 +00:00
Joas Schilling	d228acabf6	Set a status code when setting a body ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-07 17:31:32 +01:00
Joas Schilling	a94f9d8d94	Add new user agent of windows 10 dav backend ... Thanks Microsoft Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-07 17:24:26 +01:00
Vincent Vanackere	be36513819	Extend Same Site cookie user_saml exemption rule ... The current check does not trigger if $request->getRequestUri() does not return index.php as a prefix (on my config this was occuring using nginx to serve Nextcloud) Signed-off-by: Vincent Vanackere <vincent.vanackere@trustelem.com>	2017-03-07 16:22:57 +01:00
Joas Schilling	b029ffca62	Merge pull request #3671 from nextcloud/1070-user-management-no-results ... FIX: Add feedback on user settings when no results	2017-03-07 15:51:30 +01:00
Joas Schilling	13c98fe6cd	Merge pull request #3747 from nextcloud/design/input-tel-styling ... Apply text input styling to 'tel' inputs too	2017-03-07 15:30:32 +01:00
Robin Appelman	c225c82fea	Merge pull request #3744 from nextcloud/fix-avatar-buttons ... Avatar button layout improvements	2017-03-07 14:19:12 +01:00
Christoph Wurst	920f611332	Apply text input styling to 'tel' inputs too ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2017-03-07 08:51:41 +01:00
Roeland Jago Douma	a5a872c9d7	Merge pull request #3743 from nextcloud/MorrisJobke-patch-1 ... Only run drone on master/stable branches	2017-03-07 08:46:29 +01:00
Morris Jobke	741691835a	Avatar button layout improvements ... * fixes #3736 Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-06 21:17:10 -06:00
Morris Jobke	1df26d438c	Run drone only on master/stable branches ... * fixes #3729 Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-06 20:57:32 -06:00
Nextcloud bot	e6dcbb39ac	[tx-robot] updated from transifex	2017-03-07 01:07:40 +00:00
Joas Schilling	76e52eb2f6	Fix admin panel missing some JS files ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-06 12:05:31 +01:00
Joas Schilling	e8be73f485	Fix mimetype detection on public uploads for the workflow engine ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-06 12:04:54 +01:00
Nextcloud bot	15673bc601	[tx-robot] updated from transifex	2017-03-06 01:07:58 +00:00
Nextcloud bot	1d5e94a4f2	[tx-robot] updated from transifex	2017-03-05 01:07:46 +00:00
Nextcloud bot	badb45fce4	[tx-robot] updated from transifex	2017-03-04 01:07:41 +00:00
giorgia	3afc16bf77	clean search when new user is added ... Signed-off-by: giorgia <g.sambrotta@gmail.com>	2017-03-03 14:47:47 +01:00
giorgia	abc48f9e91	add emptycontent div, show/hide emptycontent div, fix #1070 ... Signed-off-by: giorgia <g.sambrotta@gmail.com>	2017-03-03 14:46:06 +01:00
Roeland Jago Douma	53a484ede6	Merge pull request #3597 from nextcloud/remove-data-from-lookup-server ... add posibility to remove all personal data from lookup server	2017-03-03 14:31:21 +01:00
Roeland Jago Douma	8e27b8197d	Merge pull request #3684 from nextcloud/run-lang-update-only-once ... Execute UpdateLanguageCode only once	2017-03-03 13:51:32 +01:00
Roeland Jago Douma	f8c459f1a4	Merge pull request #3607 from nextcloud/api-to-resend-welcome-message ... OCS API endpoint to resend welcome message	2017-03-03 13:50:30 +01:00
Roeland Jago Douma	e54b9d3fcd	Merge pull request #3678 from nextcloud/issue-3677-caldav-sharing-permission-problem ... CalDAV sharing permissions should not depend on the order	2017-03-03 13:48:33 +01:00
Joas Schilling	0beb78517f	Fix DI ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-03 12:20:02 +01:00
Joas Schilling	9f82bb9b4f	Merge pull request #3689 from nextcloud/cleanup-legacy-classes ... Cleanup not used legacy classes	2017-03-03 12:04:27 +01:00