13615 commits

Author	SHA1	Message	Date
Morris Jobke	ead9a10cc5	Merge pull request #3619 from nextcloud/fix-scss-for-apps ... Fix SCSS usage in apps	2017-03-16 22:51:31 -06:00
Nextcloud bot	5683365a2c	[tx-robot] updated from transifex	2017-03-17 01:07:41 +00:00
Lukas Reschke	39afcbd49f	Merge pull request #3679 from nextcloud/socialsharing ... Add social sharing	2017-03-16 23:08:47 +01:00
Lukas Reschke	d134dea508	Don't call function in constructor ... The constructor is iniitiated already very early in base.php, thus requiring this here will break the setup and some more. For now we probably have to live with a static function call here thus. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-16 21:59:47 +01:00
Morris Jobke	cd4ebe2777	Merge pull request #3008 from nextcloud/appmenu-experiment ... Show apps in header	2017-03-16 13:03:41 -06:00
Lukas Reschke	adfd1e63f6	Add base-uri to CSP policy ... As per https://twitter.com/we1x/status/842032709543333890 a nice security hardening Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-16 15:16:20 +01:00
Roeland Jago Douma	57c1be8633	Merge pull request #3802 from Ko-/master ... Check that set_time_limit is not disabled before calling it	2017-03-16 12:27:26 +01:00
Julius Haertl	7eae6690ad	Make app management icon act like a normal app icon ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2017-03-16 11:55:09 +01:00
Julius Haertl	61dc78e6dc	Fix menu issues ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2017-03-16 11:55:09 +01:00
Julius Haertl	a630e4629f	Generate seperate menu list for header bar ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2017-03-16 11:55:09 +01:00
Julius Haertl	e3e4cb3e67	Move active app to the first slot ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2017-03-16 11:55:09 +01:00
Lukas Reschke	085891a15d	Escape like parameters in database user backend ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-15 22:46:40 +01:00
Joas Schilling	f2d3704e97	Merge pull request #3843 from nextcloud/encryption-fix-mail-share ... take share by mail into consideration if we calculate the access list	2017-03-15 15:23:17 +01:00
Nextcloud bot	4da6b7e796	[tx-robot] updated from transifex	2017-03-15 01:07:49 +00:00
Roeland Jago Douma	67faf7edc4	Merge pull request #3838 from Xuanwo/basename-fix ... [OC/Files/Cache]: Fix wrong usage of basename	2017-03-14 21:00:24 +01:00
Roeland Jago Douma	25553172f4	Merge pull request #3836 from nextcloud/do-not-double-check-app-update ... Do not check for app update twice	2017-03-14 19:26:01 +01:00
Bjoern Schiessle	8f92808caf	take share by mail into consideration if we calculate the access list ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-03-14 17:40:42 +01:00
Roeland Jago Douma	6565533d3b	Merge pull request #3600 from coletivoEITA/master ... added method needsPartFile() in Storage	2017-03-14 15:14:59 +01:00
Roeland Jago Douma	3c2312fb09	Merge pull request #3783 from andrius-kulbis/master ... Fix deleted objectstore shares	2017-03-14 15:14:39 +01:00
Vinicius Cubas Brand	13e50cbcd7	added method needsPartFile() in Storage ... Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>	2017-03-14 10:06:50 -03:00
Xuanwo	210f4106c4	[OC/Files/Cache]: Fix wrong usage of basename ... Fix https://github.com/nextcloud/server/issues/3837 Signed-off-by: Xuanwo <xuanwo@yunify.com>	2017-03-14 13:27:17 +08:00
Morris Jobke	252858ec5e	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>	2017-03-13 18:07:41 -06:00
Roeland Jago Douma	bb94b39745	Do not clear CSRF token on logout (fix for #1303) ... This is a hacky way to allow the use case of #1303. What happens is 1. User tries to login 2. PreLoginHook kicks in and figures out that the user need to change their LDAP password or whatever => redirects user 3. While loading the redirect some logic of ours kicks in and logouts the user (thus clearing the session). 4. We render the new page but now the session and the page disagree about the CSRF token This is kind of hacky but I don't think it introduces new attack vectors. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-13 22:16:56 +01:00
Robin Appelman	6d0c756ff9	dont allow empty wildcard search ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-03-13 16:06:19 +01:00
Lukas Reschke	4395cf4fa7	Merge pull request #3780 from GitHubUser4234/audit_log_agent ... Audit log the User-Agent	2017-03-13 12:38:04 +01:00
Morris Jobke	f7cef9f702	Merge pull request #3772 from nextcloud/favorite-search ... Allow searching for favorites	2017-03-13 00:55:12 -06:00
Ko-	0024b67aaf	Check that set_time_limit is not disabled before calling it ... Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>	2017-03-11 17:04:21 +01:00
Lukas Reschke	801b600ec3	Merge pull request #3739 from fti7/master ... Serve robots.txt if the RewriteBase is configured	2017-03-11 09:56:38 +01:00
Nextcloud bot	456cd81a20	[tx-robot] updated from transifex	2017-03-11 01:07:48 +00:00
Roeland Jago Douma	f86b5c2ebb	Properly calculate webdir using the serverroot ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-10 20:00:34 +01:00
Roeland Jago Douma	f7ebf1d47d	SCSS files don't exist on the default fs so just add them to the ... resource list Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-10 19:13:44 +01:00
Lukas Reschke	42ee401376	Merge pull request #3778 from nextcloud/verify_jpg_files ... Test if a file is a valid jpg file	2017-03-10 18:17:51 +01:00
Lukas Reschke	f74911b638	Merge pull request #3787 from nextcloud/ocs-cookie ... dont require strict same site cookies for ocs requests	2017-03-10 18:14:38 +01:00
Morris Jobke	3ca9d53194	Fix SCSS usage in apps ... * fix the web root detection of the ResourceLocator for apps Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-10 14:44:01 +01:00
Roger Szabo	35369ecc96	author update ... Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-03-10 17:24:37 +08:00
Roger Szabo	38d8492f30	improvement of userAgent variable assigment ... Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-03-10 17:20:19 +08:00
Roger Szabo	06a8ac6ff6	log user agent globally instead ... Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-03-10 16:50:15 +08: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
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	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
Roeland Jago Douma	8626ccab1c	dont require strict same site cookies for ocs requests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-09 16:48:48 +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
Andrius	708b62f223	Fix detecting deleted shares in object store ... While using the object store, the shares, that are moved to trashbin were still detected as accessible and cause broken shares to be shown in file/folder listing.	2017-03-09 14:36:20 +02: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	3584e54a89	announce public endpoints to sync trusted servers ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-03-09 10:07:52 +01:00
Roeland Jago Douma	7dd760d737	Test is a file is a valid jpg file ... During preview generation if we provide an invalid JPG file the system errors out with a PHP Fatal Error. Now we can't catch Fatal Errors (in 5.6). I suspect that exif_imagetype to fall back to the extention. However a valid jpg file has a size. So we request the size of the image and just drop out if that returns false. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-08 21:48:30 +01:00
Robin Appelman	e61606a767	Allow searching for favorites ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-03-08 16:30:55 +01:00
Robin Appelman	2a8e922d67	Merge pull request #3360 from nextcloud/dav-search ... Implement webdav SEARCH	2017-03-08 13:09:19 +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
Frank Isemann	3c18096812	Serve robots.txt if the RewriteBase is configured	2017-03-06 21:55:29 +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	fd71b8bde8	Move social buttons to menu ... * If there are social sharing buttons move them and the copy action to a menu * If there are no social sharing buttons just leave the copy action where it is directly Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-03 13:27:06 +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
Roeland Jago Douma	a85327fe87	Add social sharing ... * Add socialshare manager * Add social share field under link share Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-03 10:19:41 +01:00
Roeland Jago Douma	e648b8cb6d	Merge pull request #3682 from whitekiba/master ... Remove deprecated OC_User::isLoggedIn	2017-03-03 09:23:42 +01:00
Morris Jobke	6174a514b7	Get rid of static OCS::notFound() ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-03 00:41:21 -06:00
Morris Jobke	d85a351e77	Cleanup not used legacy classes ... * Person was removed via #2170 * other lcasses/interfaces are not used at all Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-03 00:31:33 -06:00
Morris Jobke	0b12eb0640	Execute UpdateLanguageCode only once ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-02 21:53:36 -06:00
Nextcloud bot	b55ce43ba5	[tx-robot] updated from transifex	2017-03-03 01:07:45 +00:00
Sebastian Wessalowski	e399097e3a	Remove deprecated OC_User::isLoggedIn ... Signed-off-by: Sebastian Wessalowski <sebastian@wessalowski.org>	2017-03-02 22:59:39 +01:00
Nextcloud bot	53195b156c	[tx-robot] updated from transifex	2017-03-02 16:48:52 +00:00
Joas Schilling	ba472f7ce0	Fix table name and add a test for more than 1 entries ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-02 09:11:47 +01:00
Morris Jobke	1bcd396679	Change language code for languages with only one translation ... * then the language is not that specific and get also matched for fi * fallback from fi_FI to fi is supported - the other way around not * contains repair script * contains tests for repair script * fixes #869 Order results to make postgres happy Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-01 22:35:28 -06:00
Robin Appelman	d8c89688f4	autoloader ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-03-01 14:06:40 +01:00
Robin Appelman	e6a896f2f0	add tests for searchQuery ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-03-01 14:06:40 +01:00
Robin Appelman	df2063ee7b	Implement webdav SEARCH ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-03-01 14:06:39 +01:00
Joas Schilling	7f54013fdb	Fix return type of share provider ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-01 13:45:04 +01:00
Morris Jobke	552921d429	Fix injection of defaults ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-28 16:30:34 -06:00
Morris Jobke	50f3efad6f	OCS API endpoint to resend welcome message ... * send a POST request to ocs/v1.php/cloud/users/USERNAME/resendWelcomeMessage to trigger the welcome message to be send * fixes #3367 example curl statement: curl -i https://example.org/ocs/v1.php/cloud/users/USERNAME/welcome -H "OCS-APIRequest: true" -u admin:password -X POST Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-28 16:30:33 -06:00
Robin Appelman	706131b394	add icewind/searchdav ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-02-28 14:24:18 +01:00
Maxence Lange	cfb40941c4	Fix condition ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-26 11:45:17 -06:00
Nextcloud bot	556b958af2	[tx-robot] updated from transifex	2017-02-25 01:25:07 +00:00
Lukas Reschke	dd6d2893a6	Merge pull request #3588 from GreenArchon/issue_#3461 ... Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs	2017-02-24 17:25:21 +01:00
KB7777	7347849bf9	Update Setup.php	2017-02-24 12:13:26 +01:00
Joas Schilling	d0980bec73	Merge pull request #3287 from nextcloud/readd_appstoreenabled_switch ... Add back appstoreenabled config switch	2017-02-24 10:07:25 +01:00
Joas Schilling	b26568133f	Merge pull request #3605 from nextcloud/single-user ... Clean up single user mode	2017-02-24 08:52:26 +01:00
Morris Jobke	f3bfacc976	Fix unit tests and improve appstore logic ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-24 08:34:14 +01:00
Steffen Lindner	cfb6223de7	Add back appstoreenabled config switch ... Signed-off-by: Steffen Lindner <mail@steffen-lindner.de>	2017-02-24 08:31:56 +01:00
Morris Jobke	ee52313e76	Merge pull request #3589 from nextcloud/remove-unneeded-repair-step ... Remove unneeded repair steps	2017-02-23 15:57:21 -06:00
Morris Jobke	254c98bb9e	Merge pull request #3576 from robert-scheck/timezone ... According to issue #3553, the default logtimezone is always UTC	2017-02-23 15:36:50 -06:00
Joas Schilling	8bfa50bd12	Merge pull request #3575 from nextcloud/better-thumbnail-quality ... Use 90% JPEG quality for thumbnails and previews by default	2017-02-23 09:54:32 +01:00
Morris Jobke	9533f4e5ed	Clean up single user mode ... Single user mode basically disables WebDAV, OCS and cron execution. Since we heavily rely on WebDAV and OCS also in the web UI it's basically useless. An admin only sees a broken interface and can't even change any settings nor sees any files. Also sharing is not possible. As this is at least the case since Nextcloud 9 and we haven't received any reports for this it seems that this feature is not used at all so I removed it. The encryption commands now rely on the well tested maintenance mode. Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-22 23:02:31 -06:00
Morris Jobke	2bbf3b18d9	cleanup old and not needed repair steps to speed up the update ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-22 22:35:18 -06:00
Morris Jobke	c2d3e12e23	Remove unneeded UpdateCertificateStore. ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-22 21:26:59 -06:00
Nextcloud bot	54317e80c0	[tx-robot] updated from transifex	2017-02-23 01:18:48 +00:00
Frédéric Fortier	55a37c1db9	Refactor files' CacheEntry object creation to call cacheEntryFromData() all the time thus allowing proper casts to be done ... Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>	2017-02-22 20:03:32 -05:00
Robert Scheck	568ff4ba38	According to issue #3553, the default logtimezone is always UTC ... Signed-off-by: Robert Scheck <robert@fedoraproject.org>	2017-02-23 00:15:45 +01:00
Björn Schießle	621f920d68	Merge pull request #3567 from nextcloud/autocomplete-settings ... some sharing settings	2017-02-22 16:30:21 +01:00
Joas Schilling	079888f918	Fix code quality a bit ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-22 14:53:15 +01:00
Joas Schilling	1e281bc616	Use 90% JPEG quality for thumbnails and previews by default ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-22 14:53:15 +01:00
Lukas Reschke	9e21a555cb	Merge pull request #3573 from nextcloud/correctly-catch-the-exception-from-pathinfo ... Catch exception from path info	2017-02-22 12:15:50 +01:00
Joas Schilling	899af7831e	Catch exception from path info ... We don't really care when the path info can not be gathered correctly. we will simply not use SCSS then but the CSS fallback. Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-22 11:08:58 +01:00
Nextcloud bot	a08dfd9951	[tx-robot] updated from transifex	2017-02-22 01:12:24 +00:00
Morris Jobke	8e3d0fecd2	Use intval() for validation of config options ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-21 17:22:06 -06:00
Morris Jobke	3284efd199	Improve the UX for sharing settings ... * shows a info when list is potentially truncated * shows a warning when characters length is not enough Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-21 17:07:07 -06:00
Frédéric Fortier	cc511ac7b8	Typecast filecache 'storage' as int to return it as documented, fixes #3461 ... Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>	2017-02-20 22:23:27 -05:00
Morris Jobke	cab27eabc6	Merge pull request #3544 from nextcloud/iservercontainer-container ... IServerContainer is effectively an IContainer	2017-02-20 11:02:14 -06:00
Lukas Reschke	d3f774d035	Merge pull request #3505 from robert-scheck/autoindex ... Only request "IndexIgnore" if mod_autoindex is loaded	2017-02-20 14:25:09 +01:00
Robert Scheck	25a2cb8c6e	Only request "IndexIgnore" if mod_autoindex is loaded ... Signed-off-by: Robert Scheck <robert@fedoraproject.org>	2017-02-20 13:09:15 +01:00
Christoph Wurst	cb322d84e4	IServerContainer is effectively an IContainer ... This relation was not explicitly declared in the class description. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2017-02-20 11:44:40 +01:00
Nextcloud bot	6af8ba15ae	[tx-robot] updated from transifex	2017-02-18 01:08:23 +00:00
Morris Jobke	2b898bd82c	Revert "cache the storage info for 5 min"	2017-02-16 11:58:45 -06:00
Lukas Reschke	cf582a6d14	Merge pull request #3439 from nextcloud/oc-26963 ... Make sure invalid images don't flood the log file	2017-02-16 16:34:18 +01:00
Lukas Reschke	92c74d2f9a	Don't force displayname if backend already provides one ... `\OC_User::loginWithApache` is used in combination with backend mechanisms like our SSO / SAML integration. Those can optionally already provide a displayname using other means. For example by mapping SAML attributes. The current approach makes it however impossible for backends using `\OCP\Authentication\IApacheBackend` to set a displayname on their own. Because the display name will simply be overwritten with the loginname. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-02-16 13:55:48 +01:00
blizzz	19fc68cbdc	Merge pull request #2606 from temparus/master ... Add preLoginValidation hook	2017-02-15 21:47:47 +01:00
Roeland Jago Douma	79a16bc2d3	Merge pull request #3495 from nextcloud/dav-protected ... Make it easier to subclass DAV storage	2017-02-15 20:49:06 +01:00
Roeland Jago Douma	17c07e5caf	Merge pull request #3447 from nextcloud/getmetadata-permissions-mask ... also apply permissions mask in getMetaData	2017-02-15 20:22:08 +01:00
Roeland Jago Douma	f60d95840e	Merge pull request #3262 from nextcloud/jail-scanner-storage-id ... Make sure we use the correct storage id and parent id when scanning a jailed storage	2017-02-15 20:21:03 +01:00
Robin Appelman	25dc140511	Make it easier to subclass DAV storage ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-02-15 14:00:00 +01:00
Nextcloud bot	41276f720b	[tx-robot] updated from transifex	2017-02-15 01:07:29 +00:00
Morris Jobke	b5b541d084	Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injection ... Fix DI of the cloud id manager into apps	2017-02-14 17:42:53 -06:00
Morris Jobke	c5dffc465c	Merge pull request #3472 from nextcloud/enable-avatars-always ... Always enable avatars	2017-02-14 09:22:02 -06:00
Lukas Reschke	257e28f46d	Merge pull request #3465 from nextcloud/storage-log-locks ... Add option to enable locking debug logging	2017-02-14 15:08:21 +01:00
Joas Schilling	0be2921966	Fix DI of the cloud id manager into apps ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-14 12:47:46 +01:00
Nextcloud bot	7113af3f91	[tx-robot] updated from transifex	2017-02-14 01:07:20 +00:00
Morris Jobke	69c9ca4522	Merge pull request #3444 from nextcloud/recognize-bat-and-cmd ... Recognize .bat and .cmd files	2017-02-13 18:09:12 -06:00
Morris Jobke	7f73ee0764	Add missing PHPDoc and properly throw exception ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-13 18:03:35 -06:00
Morris Jobke	200a28255e	Always enable avatars ... * we introduced this setting in the begining because our avatar support caused some performance issues, but we fixed them and should only provide one way how Nextcloud looks Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-13 17:53:33 -06:00
Lukas Reschke	181b298d7c	Merge pull request #3448 from kuimovvg/master ... bug when connect to yandex webdav server	2017-02-13 23:00:44 +01:00
Lukas Reschke	a422a59f99	Add storage to log item as well ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-02-13 22:49:44 +01:00
Robin Appelman	8c1ed7507a	Add option to enable locking debug logging ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-02-13 15:03:46 +01:00
Nextcloud bot	88047aaea7	[tx-robot] updated from transifex	2017-02-13 01:07:10 +00:00
Nextcloud bot	01b3da612b	[tx-robot] updated from transifex	2017-02-11 01:07:23 +00:00
Morris Jobke	dfaaebd765	Merge pull request #3417 from nextcloud/push-notification ... Push notification	2017-02-10 16:00:47 -06:00
Robin Appelman	f27113a6ee	also apply permissions mask in getMetaData ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-02-10 22:36:12 +01:00
Morris Jobke	abf0606054	Merge pull request #3430 from nextcloud/fix-ios-client-detection ... Fix detection of the new iOS app	2017-02-10 14:24:45 -06:00
vkuimov	71a022640b	bug when connect to yandex webdav server ... server think that request like <?xml version="1.0" encoding="UTF-8"?> <d:propfind xmlns:d="DAV:"> <d:prop/> </d:propfind> is 400: Bad Request	2017-02-10 16:31:49 +00:00
Victor Dubiniuk	2585f195da	Check if color exists in palette before using it ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-02-10 16:27:51 +01:00
Joas Schilling	ade91c8fe2	Recognize .bat and .cmd files ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-10 14:25:25 +01:00
Joas Schilling	69046c6662	Make sure invalid images don't flood the log file ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-10 13:44:16 +01:00
Björn Schießle	b4ade76665	Merge pull request #3424 from nextcloud/fix-upgrade-path ... Fix return value of getAllowedPreviousVersions()	2017-02-10 11:48:30 +01:00
Joas Schilling	33fb86f68b	Fix detection of the new iOS app ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-10 10:10:21 +01:00
Morris Jobke	d548329543	Set vendor during install ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-09 23:37:00 -06:00
Morris Jobke	b8c749b903	Fix return value of getAllowedPreviousVersions() ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-09 23:24:24 -06:00
Joas Schilling	efdc51c155	Make sure to use the right appdata directory ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-09 15:03:00 +01:00
Joas Schilling	7c47f822a1	Save the used token id in the session so it can be used later on ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-09 15:02:59 +01:00
Robin Appelman	bf88060a98	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	2017-02-09 14:54:32 +01:00
Robin Appelman	0d8d658b7e	fix copyright headers ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-02-09 13:32:36 +01:00
Robin Appelman	f6cd5200a2	clean cloud ids ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-02-09 13:31:06 +01:00
Lukas Reschke	4a5a3681d9	Merge pull request #3184 from nextcloud/issue-3165 ... Prevent migration from ownCloud 11 to Nextcloud 12	2017-02-09 13:29:08 +01:00
Joas Schilling	ed4633a552	Merge pull request #3408 from nextcloud/nullstorage-free-space ... return unknown free space from nullstorage	2017-02-09 13:17:54 +01:00
Lukas Reschke	51f0555b5c	Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation ... Don't log the password on confirmPassword when LDAP throws an exception	2017-02-09 12:19:53 +01:00
Joas Schilling	ac841ee002	Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name ... oc_token should be nc_token	2017-02-09 10:07:59 +01:00
Robin Appelman	ad5d04ccbe	return unknown free space from nullstorage ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-02-08 16:38:00 +01:00
Robin Appelman	ae66cf8d37	add tests ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-02-08 15:17:03 +01:00
Robin Appelman	fa49c4a13b	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>	2017-02-08 15:17:02 +01:00
Nextcloud bot	1aba2d9ed8	[tx-robot] updated from transifex	2017-02-08 01:07:09 +00:00
Joas Schilling	d0e6235b03	Don't log the password on confirmPassword when LDAP throws an exception ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-07 12:16:11 +01:00
Nextcloud bot	5e4bbb394c	[tx-robot] updated from transifex	2017-02-07 01:08:50 +00:00
Sandro Lutz	9b6f99ab08	Update license header ... Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>	2017-02-07 01:25:39 +01:00
Morris Jobke	5157f16d28	Merge pull request #3352 from nextcloud/public-page-guest-css-loader ... Fix public page css fallback loading	2017-02-06 18:15:56 -06:00
Sandro Lutz	fa1d607bfa	Merge remote-tracking branch 'nextcloud/master' ... Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>	2017-02-07 00:15:30 +01:00
Robin Appelman	b55f5af7ea	Merge pull request #3364 from nextcloud/sass-logging ... Lower log levels of resource locator	2017-02-06 12:52:57 +01:00
Robin Appelman	3d8a300b77	Lower log levels of resource locator ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-02-03 13:09:33 +01:00
Christoph Wurst	5e728d0eda	oc_token should be nc_token ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2017-02-02 21:56:44 +01:00
Nextcloud bot	b946ec9d6c	[tx-robot] updated from transifex	2017-02-02 01:07:05 +00:00
Sandro Lutz	6feff0ceba	Add check if UserManager is of type PublicEmitter before calling preLogin hook ... Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>	2017-02-01 21:53:50 +01:00
Sandro Lutz	e30d28f7eb	Change where preLogin hook gets called ... Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>	2017-02-01 21:53:42 +01:00
Sandro Lutz	6ab0a3215d	Remove preLoginValidation hook ... Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>	2017-02-01 21:53:29 +01:00
Sandro Lutz	e14d50eb1f	Fix indentation ... Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>	2017-02-01 21:50:47 +01:00
Sandro Lutz	4ebcd5ac0b	Add preLoginValidation hook ... Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>	2017-02-01 21:50:25 +01:00
John Molakvoæ (skjnldsv)	2c9d7eeb76	Fix public page css fallback loading ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-02-01 18:03:51 +01:00
Morris Jobke	db5af891c3	Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-timestamp-format ... Revert unintentional log timestamp format change	2017-01-31 08:44:06 -06:00
Morris Jobke	5bad417e57	Merge pull request #2044 from nextcloud/login-credential-store ... Login credential store	2017-01-30 19:30:04 -06:00
Nextcloud bot	9a13fac418	[tx-robot] updated from transifex	2017-01-31 01:07:05 +00:00
Morris Jobke	687e38c409	Merge pull request #2970 from nextcloud/notify-self-test ... Add self-test for files_external:notify	2017-01-30 17:15:57 -06:00
blizzz	f70f427a63	Merge pull request #3298 from nextcloud/downstream-26928 ... remove obsolete hack (#26928)	2017-01-30 18:01:06 +01:00
Joas Schilling	0a837ac64e	Revert unintentional log timestamp format change ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-30 15:06:23 +01:00
blizzz	64e9a1aec0	Merge pull request #3176 from nextcloud/default-value-datadir ... Add proper default value for datadir	2017-01-30 13:01:24 +01:00
Nextcloud bot	f4de328695	[tx-robot] updated from transifex	2017-01-29 01:06:55 +00:00
duritong	dbf4a4b844	only chmod logfile if necessary ... otherwise e.g. on SELinux this will log an error, so we better avoid it if not necessary.	2017-01-29 00:55:39 +01:00
Nextcloud bot	b614547ff8	[tx-robot] updated from transifex	2017-01-28 01:06:59 +00:00
Jörn Friedrich Dreyer	6fd7d4efd0	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>	2017-01-27 12:20:48 -06:00
Morris Jobke	8b95bd29ee	Merge pull request #2822 from nextcloud/add-navigation-via-info.xml ... Add navigation via info.xml (#26785)	2017-01-27 11:25:26 -06:00
Joas Schilling	05884bcd7c	Merge pull request #3178 from nextcloud/default-value-logdateformat ... fix default value for logdateformat	2017-01-27 12:08:57 +01:00
Robin Appelman	90c011379c	update autoloader ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-27 10:51:00 +01:00
Robin Appelman	76f8247516	Add since ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-27 10:44:48 +01:00
Robin Appelman	269747985e	Add a more powerful notify mechanism ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-27 10:44:33 +01:00
Lukas Reschke	b5990b740d	Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive ... Make sure different webroots use different cached paths	2017-01-27 10:14:22 +01:00
Joas Schilling	27f8a832e4	Force to specify the name ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-27 09:44:11 +01:00
Morris Jobke	98dc58356f	Merge pull request #3284 from nextcloud/remove-avatar-fixup ... remote now unneeded AvatarPermissions repair step	2017-01-26 20:14:24 -06:00
Morris Jobke	e21170bd1a	Merge pull request #3246 from nextcloud/fix-sqlite-dependency ... Remove useless dependency on SQLite (non-PDO)	2017-01-26 15:41:11 -06:00
Robin Appelman	c76fe2b4f5	remote now unneeded AvatarPermissions repair step ... Avatars are now stored in appdata Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-26 19:24:55 +01:00
Lukas Reschke	29f5ab1758	Merge pull request #3238 from nextcloud/dav-test ... Make DAV external storage test more reliable	2017-01-26 18:43:36 +01:00
Morris Jobke	e7523b07bd	Merge pull request #3197 from nextcloud/enable-scss-for-all-apps ... Enable every app to generate their scss file	2017-01-25 22:53:23 -06:00
Morris Jobke	4536ead454	Remove useless dependency on SQLite (non-PDO) ... * we only require the PDO driver * fixes #481 Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-25 22:23:05 -06:00
Robin Appelman	2520a4831b	Make sure we use the correct storage id when scanning a jailed storage ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-25 17:03:45 +01:00
Björn Schießle	f469b3e958	Merge pull request #3223 from nextcloud/fix-public-page-style ... Fix public page style	2017-01-25 11:45:36 +01:00
Christoph Wurst	933fd9c94d	Merge pull request #3240 from nextcloud/storage-interface-tweaks ... minor storage interface tweaks	2017-01-25 08:52:32 +01:00
Morris Jobke	95ab46e3d2	Merge pull request #3030 from nextcloud/filesapi-renamefailcase ... Fix files node API failed rename/copy	2017-01-24 21:23:59 -06:00
Morris Jobke	e09bba5e36	Merge pull request #3151 from nextcloud/navigation-icons ... add icons to navigation of personal & admin settings	2017-01-24 10:56:31 -06:00
John Molakvoæ (skjnldsv)	dcad6032b1	Appdata var fix ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-01-24 17:46:20 +01:00
John Molakvoæ (skjnldsv)	a440c3e94c	Remove unused webroot ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-01-24 17:27:35 +01:00
Robin Appelman	f73527c42f	minor storage interface tweaks ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-24 16:58:04 +01:00
Robin Appelman	38ec2a35f2	Make DAV external storage test more reliable ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-24 16:56:24 +01:00
Robin Appelman	f55260bc83	Merge pull request #3214 from nextcloud/cache-storage-info ... cache the storage info for 5 min	2017-01-24 13:49:45 +01:00
Robin Appelman	cbc18b7c8b	hash the path used for the cache key to prevent key length problems ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-24 11:18:05 +01:00
Nextcloud bot	30e9d67ee9	[tx-robot] updated from transifex	2017-01-24 01:07:14 +00:00
Robin Appelman	d4d116503c	Merge pull request #3212 from mwalbeck/mimetype-hidden-files ... Mimetype detection for hidden files	2017-01-23 21:45:16 +01:00
Morris Jobke	9b0c6c0eff	Merge pull request #3157 from nextcloud/fcloseafterkill ... [uc] Prevent PHP request to get killed when using fclose callback (#26775)	2017-01-23 13:51:43 -06:00
Morris Jobke	46ef0f832d	Fix public page style ... * checks if the user is on the login page or not instead of check if the user is logged in * fixes #3207 Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-23 12:42:59 -06:00
Magnus Walbeck	3d99ec6832	Reduced code for filename trim ... Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>	2017-01-23 17:14:39 +01:00
Robin Appelman	e38a978623	cache the storage info for 5 min ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-23 14:52:50 +01:00
Magnus Walbeck	eadc1ac637	Mimetype detection for hidden files ... Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>	2017-01-23 13:28:35 +01:00
Vincent Petry	0aaf209c66	Prevent PHP request to get killed when using fclose callback (#26775) ... * Prevent PHP request to get killed when using fclose callback * Add ignore_user_abort everywhere where the time limit is set to 0 Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-23 12:33:20 +01:00
Joas Schilling	5d486478d3	Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-group ... Subadmin check on removing user from group	2017-01-23 12:10:06 +01:00
Joas Schilling	18d7701d09	Prevent migration from ownCloud 11 to Nextcloud 12 ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-23 12:04:46 +01:00
John Molakvoæ (skjnldsv)	4ceb2bf84c	Enable every app to generate their scss file ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-01-22 19:33:45 +01:00
Lukas Reschke	bde1150d04	Merge pull request #3004 from nextcloud/fix-installation-css ... Fixed installation page	2017-01-22 18:28:33 +01:00
Morris Jobke	2316083256	fix default value for logdateformat - fixes #3107 ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-19 20:08:15 -06:00
Morris Jobke	12e3b357d4	Fix default of mail_smtpmode - fixes #3102 ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-19 19:59:53 -06:00
Morris Jobke	a4ad8af6e3	Add proper default value for datadir ... * better safe than sorry * fixes #3091 Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-19 19:49:41 -06:00
Morris Jobke	4253a9bde3	update autoloader static class files ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-19 16:12:09 -06:00
Joas Schilling	c3985aba70	Add the icon for the default sections ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-19 10:42:21 +01:00
Joas Schilling	8c8354399a	Allow apps to specify an icon with the sections via the API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-19 10:42:21 +01:00
Bjoern Schiessle	cdf01feba7	add action to existing brute force protection ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-01-18 15:25:16 +01:00
Bjoern Schiessle	32e0ec3e58	handle optional annotation parameters ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-01-18 15:25:16 +01:00
Joas Schilling	29a0a23918	Fix the regex for annotations with values ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-18 15:25:16 +01:00
Bjoern Schiessle	df296249d6	introduce brute force protection for api calls ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-01-18 15:25:15 +01:00
Joas Schilling	55db07a20b	Fix CamelCasing ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-18 11:45:26 +01:00
Lukas Reschke	4009d3db03	Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitive ... Make sure the spreed TURN server secret stays a secret	2017-01-17 14:49:43 +01:00
Joas Schilling	ce973929e8	Merge pull request #3075 from nils/debug-no-versionhash ... Do not add version hash in debug mode	2017-01-17 11:44:50 +01:00
Joas Schilling	35b8f03c07	Merge pull request #3106 from nextcloud/spreed-calls-are-objects ... Define spreed calls	2017-01-17 11:42:13 +01:00
Joas Schilling	30b9262a5a	Make sure the spreed TURN server secret stays a secret ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-17 11:29:10 +01:00
Joas Schilling	aea1b72f54	Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions ... Markdown support for app descriptions	2017-01-17 11:11:16 +01:00
Christoph Wurst	012708e1ba	Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs ... Filter out sensitive appconfig values	2017-01-17 11:01:42 +01:00
Joas Schilling	377e536417	Add call-type in case the information shall be used for styling or something else in the future ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-17 10:08:02 +01:00
Nextcloud bot	b1a82969e6	[tx-robot] updated from transifex	2017-01-17 01:07:54 +00:00
Joas Schilling	745b707cd9	Define spreed calls ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-16 18:41:00 +01:00
Nextcloud bot	203436b16b	[tx-robot] updated from transifex	2017-01-16 01:15:50 +00:00
Nils	ba3506c431	[Enhancement] Do not add version hash in debug mode ... Signed-off-by: Nils <git@to.nilsschnabel.de>	2017-01-15 13:29:32 +01:00
Joas Schilling	fcfb4205bc	Fix tests ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-13 18:33:43 +01:00
Joas Schilling	587eca3ccd	Remove the magic parsing of the description ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-13 18:33:42 +01:00
Joas Schilling	91beb178a7	Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation ... Change the row-format before changing the collation	2017-01-13 14:43:06 +01:00
Morris Jobke	622101f2dd	Merge pull request #2918 from nextcloud/encryption-recovery-improvements ... create new encryption keys on password reset and backup the old one	2017-01-13 11:28:43 +01:00
Joas Schilling	77b5d7bc86	Change the row-format before changing the collation ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-12 16:54:29 +01:00
Joas Schilling	77577b952b	Make sure different webroots use different cached paths ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-12 15:58:18 +01:00
Vincent Petry	e667b28298	Fix files node API failed rename/copy ... Whenever a rename or copy operation failed on the view, we must throw an exception instead of just ignoring. Signed-off-by: Vincent Petry <pvince81@owncloud.com>	2017-01-12 13:52:59 +01:00
Joas Schilling	5dc6899d1a	Fix tests ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-12 10:49:22 +01:00
Christoph Wurst	140555b786	always allow remembered login ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2017-01-11 19:20:11 +01:00
Christoph Wurst	21d3fe5883	do not hard-require the token provider ... The provider might need DB access and therefore depenedency resolution fails on the setup page where we cannot inject the db implementation. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2017-01-11 19:20:11 +01:00
Christoph Wurst	6f74ecd94a	use login hook credentials as fallback ... If no session token is available, we can use the credentials provided by the login hook. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2017-01-11 19:20:11 +01:00
Christoph Wurst	3316a9d294	fix @since annotations (9.1->12) ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2017-01-11 19:20:11 +01:00