3798 commits

Author	SHA1	Message	Date
Roeland Jago Douma	16a0bccefa	Merge pull request #3972 from nextcloud/merge-some-more-css ... Merge some CSS files using our SCSS compiler	2017-03-22 08:46:10 +01:00
Nextcloud bot	cae8702ab2	[tx-robot] updated from transifex	2017-03-22 01:07:53 +00:00
Lukas Reschke	5c7ad6d3ec	Merge some CSS files using our SCSS compiler ... This saves around 4 requests on the average page load. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-21 16:35:31 +01:00
Nextcloud bot	fd0e42e093	[tx-robot] updated from transifex	2017-03-21 01:08:16 +00:00
Sujith H	f654f29532	Providing --path option to transfer-ownership ... This will help user to selectively move the folders specified using --path option, instead of moving entire folder under files directory. Signed-off-by: Sujith H <sharidasan@owncloud.com> Update the integration test for transfer-ownership Update the integration test for transfer-ownership as the new option --path is introduced in the command. Signed-off-by: Sujith H <sharidasan@owncloud.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-20 18:29:21 -06:00
Lukas Reschke	ac1aff7d92	Merge pull request #3950 from nextcloud/downstream-27149 ... Forbid to upload part files via web UI	2017-03-20 11:44:57 +01:00
Lukas Reschke	1e61c17932	Fix grammar ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-20 11:08:39 +01:00
Vincent Petry	b8a8f43fce	Log files:scan exception, add InterruptedException ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-20 02:24:28 -06:00
Felix Heidecke	11f838f9e4	Add ignore_files to config, ... test files against ignore_files list on upload fix typo and indentation Move blacklist declaration to lib/public/Files/FileInfo.php, Rename *ignored to *blacklisted Mocked blacklist_files for testing Mocked blacklist_files for testing Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-20 01:17:12 -06:00
Nextcloud bot	528a903a7b	[tx-robot] updated from transifex	2017-03-20 01:07:43 +00:00
Nextcloud bot	1983606f80	[tx-robot] updated from transifex	2017-03-19 01:08:20 +00:00
Nextcloud bot	9e1e7dac47	[tx-robot] updated from transifex	2017-03-18 01:07:50 +00:00
Nextcloud bot	5683365a2c	[tx-robot] updated from transifex	2017-03-17 01:07:41 +00:00
Nextcloud bot	2fafdb39ac	[tx-robot] updated from transifex	2017-03-16 01:07:36 +00:00
Roeland Jago Douma	5ed45fc8e6	Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query ... Remove single quotes around search query like in user search	2017-03-15 15:05:15 +01:00
Joas Schilling	0fe45966a0	Remove single quotes around search query like in user search ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-15 12:53:44 +01:00
Nextcloud bot	4da6b7e796	[tx-robot] updated from transifex	2017-03-15 01:07:49 +00:00
Nextcloud bot	8d91c84ec4	[tx-robot] updated from transifex	2017-03-14 01:07:46 +00:00
Robin Appelman	ad4b5c82da	dont preserve mtime when uploading trough the web interface ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-03-13 13:33:18 +01:00
Nextcloud bot	0dd0242d2f	[tx-robot] updated from transifex	2017-03-13 01:08:19 +00:00
Nextcloud bot	456cd81a20	[tx-robot] updated from transifex	2017-03-11 01:07:48 +00: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
Nextcloud bot	8904fb1cf3	[tx-robot] updated from transifex	2017-03-10 01:08:01 +00:00
Nextcloud bot	badb45fce4	[tx-robot] updated from transifex	2017-03-04 01:07:41 +00:00
Joas Schilling	dd646fdf58	Merge pull request #3687 from nextcloud/proper-transfer-ownership-date ... Use a proper date format for transfer ownership	2017-03-03 11:56:59 +01:00
Joas Schilling	29e9b1f3d5	Merge pull request #3686 from nextcloud/downstream-27282 ... filelist only refreshed if directory changes	2017-03-03 11:55:53 +01:00
Morris Jobke	503a9160ae	Use a proper date format for transfer ownership ... * on Windows : is not allowed as filename and doesn't get synced then * uses 2017-03-02 22-00-00 instead of 2017-03-02T22:00:00+00:00 as format Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-02 22:36:18 -06:00
noveens	93f9db4d59	filelist only refreshed if directory changes ... check introduced at another method comment added to explain one check comment added to explain one check unit tests added small fixes in unit tests missing semicolon added Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-02 21:43:44 -06:00
Nextcloud bot	b55ce43ba5	[tx-robot] updated from transifex	2017-03-03 01:07:45 +00:00
Nextcloud bot	53195b156c	[tx-robot] updated from transifex	2017-03-02 16:48:52 +00:00
Lukas Reschke	b5a6f03362	Merge pull request #3643 from nextcloud/replace-deprecated-tipsy ... Replace deprecated $.tipsy(...) by $.tooltip(...)	2017-02-28 10:49:14 +01:00
Morris Jobke	86149508d0	fix typo ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-28 00:14:34 -06:00
Nextcloud bot	7fc3129f0c	[tx-robot] updated from transifex	2017-02-28 01:07:54 +00:00
Christoph Wurst	3e7e49884e	Replace deprecated $.tipsy(...) by $.tooltip(...) ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2017-02-27 22:25:05 +01:00
Nextcloud bot	97b6c1496e	[tx-robot] updated from transifex	2017-02-24 01:21:37 +00:00
Nextcloud bot	a08dfd9951	[tx-robot] updated from transifex	2017-02-22 01:12:24 +00:00
John Molakvoæ	2836b54236	Merge pull request #3557 from marncz/master ... Fixed path in other folders search	2017-02-21 20:20:17 +01:00
Nextcloud bot	d754227b4c	[tx-robot] updated from transifex	2017-02-21 01:08:46 +00:00
Marcin	20ad3f33d0	Fixed path in other folders search ... Signed-off-by: Marcin Czarnecki <marcin.czarnecki@protonmail.com>	2017-02-21 00:38:46 +00:00
Nextcloud bot	c1bb89d65b	[tx-robot] updated from transifex	2017-02-17 01:07:58 +00:00
blizzz	cd49eb36e8	Merge pull request #3485 from nextcloud/Popovermenu-files-css-fix ... Popovermenu files css fix	2017-02-15 12:33:08 +01:00
Morris Jobke	b954c2f186	Fix app name of files app ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-02-14 17:36:23 -06:00
John Molakvoæ (skjnldsv)	31d56155d4	Css fix ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-02-15 00:09:32 +01:00
Nextcloud bot	7113af3f91	[tx-robot] updated from transifex	2017-02-14 01:07:20 +00:00
Nextcloud bot	88047aaea7	[tx-robot] updated from transifex	2017-02-13 01:07:10 +00:00
Nextcloud bot	f9d94edb0f	[tx-robot] updated from transifex	2017-02-12 01:07:26 +00:00
Nextcloud bot	01b3da612b	[tx-robot] updated from transifex	2017-02-11 01:07:23 +00:00
Björn Schießle	a88fc0c283	Merge pull request #3181 from nextcloud/fix-favorite-activity-mail ... Make sure the file information is available when sending the email	2017-02-10 11:35:45 +01:00
Nextcloud bot	3c4b539fdf	[tx-robot] updated from transifex	2017-02-09 01:07:10 +00:00
Lukas Reschke	1a591cea97	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	2017-02-08 14:47:45 +01:00
Joas Schilling	54e39d4b93	Fix files sharing legacy as well ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-08 11:55:50 +01:00
Nextcloud bot	1aba2d9ed8	[tx-robot] updated from transifex	2017-02-08 01:07:09 +00:00
Joas Schilling	d79838ac9b	Add tests for getUser() ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-07 12:01:28 +01:00
Joas Schilling	881c7275a2	Add tests for getFile() ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-07 11:49:32 +01:00
Joas Schilling	c031c77e3c	Make sure ownCloud 8.2 activities also can get displayed ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-02-07 11:30:23 +01:00
Nextcloud bot	5e4bbb394c	[tx-robot] updated from transifex	2017-02-07 01:08:50 +00:00
Nextcloud bot	fa96b9e356	[tx-robot] updated from transifex	2017-02-06 01:07:04 +00:00
Marius Blüm	9ce8437b8b	Merge pull request #3353 from nextcloud/mobile-view-files-fix ... Fix files mobile view	2017-02-04 21:00:40 +01:00
Nextcloud bot	b946ec9d6c	[tx-robot] updated from transifex	2017-02-02 01:07:05 +00:00
John Molakvoæ (skjnldsv)	e0e5b32f94	Fix files mobile view ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-02-01 18:39:27 +01:00
Nextcloud bot	1952560ac7	[tx-robot] updated from transifex	2017-02-01 01:06:57 +00:00
Nextcloud bot	9a13fac418	[tx-robot] updated from transifex	2017-01-31 01:07:05 +00:00
Nextcloud bot	f4de328695	[tx-robot] updated from transifex	2017-01-29 01:06:55 +00:00
Nextcloud bot	b614547ff8	[tx-robot] updated from transifex	2017-01-28 01:06:59 +00: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	27f8a832e4	Force to specify the name ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-27 09:44:11 +01:00
Nextcloud bot	a5aeddc810	[tx-robot] updated from transifex	2017-01-27 01:07:18 +00:00
Nextcloud bot	05e3aa491a	[tx-robot] updated from transifex	2017-01-26 01:07:15 +00:00
Nextcloud bot	c3e57d228f	[tx-robot] updated from transifex	2017-01-25 01:10:00 +00:00
Nextcloud bot	30e9d67ee9	[tx-robot] updated from transifex	2017-01-24 01:07:14 +00:00
Robin Appelman	0f698e2021	open the sidebar when opening a permalink ... Also works for search results Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-01-23 18:06:24 +01:00
Morris Jobke	16afaa783b	Merge pull request #3118 from nextcloud/newFileMenu-css-guidelines ... Fit newFileMenu to css guidelines	2017-01-22 20:39:16 -06:00
Nextcloud bot	8024f5a17f	[tx-robot] updated from transifex	2017-01-23 00:17:39 +00:00
John Molakvoæ (skjnldsv)	0fc0bcf6b3	Popover newFolder input fix ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-01-22 11:45:09 -06:00
John Molakvoæ (skjnldsv)	3d86275f1e	Popover positionning fix ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-01-22 11:45:09 -06:00
John Molakvoæ (skjnldsv)	961fcfa1fb	Popover positionning and classes ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-01-22 11:45:08 -06:00
John Molakvoæ (skjnldsv)	418ebfbdf4	fit newFileMenu to css guidelines ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-01-22 11:45:08 -06:00
Nextcloud bot	d0c6179ec1	[tx-robot] updated from transifex	2017-01-21 01:07:47 +00:00
Joas Schilling	fef4462904	Make sure the file information is available when sending the email ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-01-20 12:52:56 +01:00
Morris Jobke	08cdcf8f7f	Merge pull request #2776 from nextcloud/prevent-quotes-from-being-a-problem ... Escape the name for the jquery selector	2017-01-17 18:40:11 -06:00
Nextcloud bot	b1a82969e6	[tx-robot] updated from transifex	2017-01-17 01:07:54 +00:00
Nextcloud bot	203436b16b	[tx-robot] updated from transifex	2017-01-16 01:15:50 +00:00
Nextcloud bot	c35ea15916	[tx-robot] updated from transifex	2017-01-11 15:20:22 +00:00
Rodrigo Almeida	4f3da2bee4	Update mobile.css	2017-01-11 09:12:08 +01:00
Nextcloud bot	4f9ff96f79	[tx-robot] updated from transifex	2017-01-09 08:24:58 +00:00
Nextcloud bot	d9035e2805	[tx-robot] updated from transifex	2017-01-05 13:09:52 +00:00
Nextcloud bot	2e0cf21f7f	[tx-robot] updated from transifex	2017-01-04 12:09:43 +00:00
Nextcloud bot	acad4ba93e	[tx-robot] updated from transifex	2017-01-03 01:07:46 +00:00
Roeland Jago Douma	fdf10e242d	Merge pull request #2850 from nextcloud/downstream-26603 ... Fixed size issues on main detail view and disappearing of share recipients (#26603)	2017-01-02 21:19:43 +01:00
Morris Jobke	47d7d26bda	remove unused parameters and add viewBox ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-02 15:32:16 +01:00
Nextcloud bot	5c50df72b7	[tx-robot] updated from transifex	2017-01-01 01:07:30 +00:00
Nextcloud bot	02eb0f7fa4	[tx-robot] updated from transifex	2016-12-31 01:08:36 +00:00
Nextcloud bot	fc02564ea6	[tx-robot] updated from transifex	2016-12-30 01:07:28 +00:00
Nextcloud bot	52b734b3e4	[tx-robot] updated from transifex	2016-12-29 01:07:59 +00:00
Nextcloud bot	bd20139f55	[tx-robot] updated from transifex	2016-12-27 01:07:38 +00:00
Nextcloud bot	3fc4e1b5b9	[tx-robot] updated from transifex	2016-12-26 01:09:23 +00:00
Michael Jobst	969c19b2e9	Fixed size issues on main detail view and disappearing of share recipients (#26603) ... * fixed size issues on main detail view and disappearing of share recipients * Changes due to code comments * Moved reloadProperties() to FileInfoModel * Solved Scrutinizer issues * Bugfix: undefined value used on error * check if options are set for FileInfoModel.initialize() Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-12-23 16:56:55 +01:00
Lukas Reschke	56c016946d	Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patch ... [downstream] Fix maindetailsview favorite star patch	2016-12-23 16:36:53 +01:00
Christoph Wurst	cfada468e6	OC.Uploader does not have a 'state' method, therefore the ... dead code can be removed Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2016-12-23 15:38:48 +01:00
Thomas Müller	aa8755bd4b	Add navigation via info.xml (#26785) ... * Read navigation information from info.xml * Load files navigation elements from info.xml * Add comment about ignoring the exception Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-12-22 12:34:41 +01:00
Thomas Müller	2bf4661e40	Just use moment to comupte the time left for the upload - translations are delivered as part of moment.js - fixes #26804 ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-12-22 10:01:58 +01:00
Nextcloud bot	f50252c7c1	[tx-robot] updated from transifex	2016-12-20 12:02:31 +00:00
Joas Schilling	e53d0c0d69	Escape the name for the jquery selector ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-12-20 09:32:47 +01:00
Lukas Reschke	450373fd18	Fix indentation ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-12-19 17:34:55 +01:00
Michael Jobst	a7526b9837	Style modifications of favorite star on main detail view (#26658) ... * Style modifications of favorite star on main detail view * Removed unused opacity change on mouse over * favorite star title fixed * favorite star opacity should always be .7 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-12-19 17:34:09 +01:00
Lukas Reschke	34fb313466	Merge pull request #2689 from andreas-p/fix-remote-conflict ... Fix showConflict	2016-12-19 14:34:56 +01:00
pflug	c7fc010215	Fix showConflict ... use getFullFileName to show conflicting file add original.directory to make fileExists happy Signed-off-by: Andreas Pflug <dev@admin4.org>	2016-12-19 08:11:04 +01:00
Joas Schilling	6de0eb0b74	Remove leading slash from sharing activity ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-12-15 15:53:48 +01:00
Joas Schilling	edec1fafe7	Update app versions and requirements ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-12-13 20:41:55 +01:00
Nextcloud bot	0c6c85bafb	[tx-robot] updated from transifex	2016-12-12 01:07:18 +00:00
Nextcloud bot	7cb99e74db	[tx-robot] updated from transifex	2016-12-10 01:07:15 +00:00
Nextcloud bot	88d90066ba	[tx-robot] updated from transifex	2016-12-09 01:07:18 +00:00
Roeland Jago Douma	158cc9c261	Merge pull request #2545 from nextcloud/fix-popover-width ... Fix popover width	2016-12-08 13:49:56 +01:00
Nextcloud bot	74d1b0bada	[tx-robot] updated from transifex	2016-12-08 01:07:26 +00:00
John Molakvoæ (skjnldsv)	2eca4e65b3	Fix popover margin and width ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2016-12-07 10:50:54 +01:00
Nextcloud bot	ea801d7d7c	[tx-robot] updated from transifex	2016-12-07 01:07:46 +00:00
Arthur Schiwon	7e2b866fd7	fix type in jsdoc ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-12-06 18:08:13 +01:00
Morris Jobke	7ce5303374	Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemet ... Add an activity when managing favorites	2016-12-05 15:44:24 +01:00
Robin Appelman	af9b3e3889	fix conflict dialog styling in firefox ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-12-05 14:20:54 +01:00
Joas Schilling	1a802d3383	Add tests for favorite action ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-12-04 12:54:34 +01:00
Joas Schilling	7c1b288b57	Add some generic tests ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-12-04 12:41:14 +01:00
Joas Schilling	8baf986d3b	Add an activity when managing favorites ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-12-04 12:16:49 +01:00
Nextcloud bot	3bea7ac6ac	[tx-robot] updated from transifex	2016-12-04 01:07:30 +00:00
Nextcloud bot	181cf9c7f3	[tx-robot] updated from transifex	2016-12-03 01:07:26 +00:00
Morris Jobke	717f1d380c	Merge pull request #2475 from nextcloud/fix-filename-local-link ... fix width of filename in sidebar to accommodate local link	2016-12-02 18:04:57 +01:00
Morris Jobke	48dddf82eb	properly calculate the width of the name in the sidebar ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-12-02 16:08:41 +01:00
Jan-Christoph Borchardt	ac527769c5	fix width of filename in sidebar to accommodate local link ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-12-02 14:49:19 +01:00
Morris Jobke	b6184b0bc2	Increase width of new menu ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-12-02 14:29:15 +01:00
Jan-Christoph Borchardt	40a11f12c0	fix vertical sizing change of popover in new folder flow ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-12-02 13:22:48 +01:00
Morris Jobke	4bb1154f50	Fix input field for new folder - fixes #2245 ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-12-02 12:53:24 +01:00
Morris Jobke	ac1bf3c2b7	Merge pull request #2432 from nextcloud/activity-mail-language ... Make sure the activity emails can be sent in the users language	2016-12-01 23:01:00 +01:00
Christoph Wurst	ea45b22053	Merge pull request #2444 from nextcloud/detect-also-a-400-status ... Catch status code 400	2016-12-01 21:25:54 +01:00
Roeland Jago Douma	61d61e794c	Merge pull request #2435 from nextcloud/sidebar-preview-non-preview ... allow registering sidebar preview handlers for mimetypes that dont co…	2016-12-01 21:14:10 +01:00
Lukas Reschke	9704b4df52	Catch status code 400 ... In case the server returns a statuscode 400 we should also gracefully return to the home directory. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-12-01 19:13:28 +01:00
Robin Appelman	a4900bf23f	allow registering sidebar preview handlers for mimetypes that dont come with server side previews ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-12-01 15:43:17 +01:00
Roeland Jago Douma	b89aafc241	We should always show permanent actions ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-12-01 15:16:06 +01:00
Joas Schilling	b2f46bfa04	Adjust all implementations in the server repo ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-12-01 11:35:23 +01:00
Nextcloud bot	4ca7f9c896	[tx-robot] updated from transifex	2016-12-01 01:07:17 +00:00
Robin Appelman	d7dd399bbd	Merge pull request #2422 from nextcloud/text-preview-debug ... remove js debug statements in sidebar text preview generator	2016-11-30 15:39:59 +01:00
Nextcloud bot	f075c22c72	[tx-robot] updated from transifex	2016-11-30 14:18:08 +00:00
Robin Appelman	7fc118e8ea	remove js debug statements in sidebar text preview generator ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-30 14:54:54 +01:00
Nextcloud bot	41dcceeb35	[tx-robot] updated from transifex	2016-11-30 01:07:16 +00:00
Nextcloud bot	a84dacc16f	[tx-robot] updated from transifex	2016-11-29 17:03:24 +00:00
John Molakvoæ (skjnldsv)	bd18349f46	Fix mobile view ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2016-11-29 13:47:37 +01:00
Nextcloud bot	e8ea9a5d27	[tx-robot] updated from transifex	2016-11-29 01:06:47 +00:00
Morris Jobke	a12d2e67e7	Merge pull request #2335 from nextcloud/grouping-for-activities ... Bring back grouping for activities	2016-11-28 16:18:02 +01:00
Bjoern Schiessle	e5c31b72e1	bring back permissions for mail shares ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-28 11:24:05 +01:00
Nextcloud bot	ca7b9e5490	[tx-robot] updated from transifex	2016-11-28 09:51:57 +00:00
Nextcloud bot	4e682d4113	[tx-robot] updated from transifex	2016-11-28 01:06:56 +00:00
Nextcloud bot	8f4ec8583d	[tx-robot] updated from transifex	2016-11-26 01:06:57 +00:00