server

Author	SHA1	Message	Date
Morris Jobke	74936e15d1	Remove unused CSS Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-18 20:36:54 -05:00
Nextcloud bot	febe01f571	[tx-robot] updated from transifex	2017-04-19 00:07:40 +00:00
Nextcloud bot	6b490f45fd	[tx-robot] updated from transifex	2017-04-18 23:08:43 +00:00
Morris Jobke	269600a04f	Merge pull request #4369 from nextcloud/fix-translations Fix translations	2017-04-18 18:01:50 -05:00
Joas Schilling	1c0bffe87f	Fix translations Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-18 16:40:53 -05:00
Nextcloud bot	c40b7acb09	[tx-robot] updated from transifex	2017-04-18 20:47:45 +00:00
Lukas Reschke	203ef88509	Add "Reply-To" on ShareByMailProvider mails Fixes https://github.com/nextcloud/server/issues/4209 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-04-18 22:23:07 +02:00
Artur Neumann	bf58d24b5c	remove accidently left over fit Signed-off-by: Artur Neumann <info@individual-it.net>	2017-04-18 20:53:49 +05:45
Artur Neumann	88f02f27a3	JS tests for upload only function Signed-off-by: Artur Neumann <info@individual-it.net>	2017-04-18 20:43:25 +05:45
Artur Neumann	cdb65eff34	refactor to make it easier to test Signed-off-by: Artur Neumann <info@individual-it.net>	2017-04-18 20:42:36 +05:45
Nextcloud bot	b072d2c49d	[tx-robot] updated from transifex	2017-04-18 00:07:25 +00:00
Nextcloud bot	df2235c71f	[tx-robot] updated from transifex	2017-04-17 00:07:33 +00:00
Nextcloud bot	69e0e2420c	[tx-robot] updated from transifex	2017-04-16 00:07:23 +00:00
Morris Jobke	10290eb006	Merge pull request #2834 from nextcloud/accesListToShareManager Access list to share manager	2017-04-15 13:06:24 -05:00
Nextcloud bot	dafa9c740a	[tx-robot] updated from transifex	2017-04-15 00:07:36 +00:00
Ardinis	3db84ed90a	Remove json handling for files_external:config #4347	2017-04-14 15:42:45 +02:00
Lukas Reschke	727688ebd9	Adjust existing bruteforce protection code - Moves code to annotation - Adds the `throttle()` call on the responses on existing annotations Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-04-14 13:42:40 +02:00
Nextcloud bot	0f96d5a641	[tx-robot] updated from transifex	2017-04-14 00:07:36 +00:00
Morris Jobke	ec034757fa	Merge pull request #4337 from nextcloud/fix-adblock-share-icon Fix AdBlock blocking share icon, ref #866	2017-04-13 12:10:37 -05:00
Morris Jobke	13c71203bb	Merge pull request #4341 from nextcloud/local-link-explanation Explain local link	2017-04-13 12:01:57 -05:00
Jos Poortvliet	a8b09c860e	Explain local link The local link is a clever thing and the clients should support this imho but it might not be clear to all users. For one, the term 'local link' is a bit odd. Local with respect to what? It links directly to the file or folder, so direct link seems to make more sense to me. And we should explain the difference with a public link. So this PR: * renames local link to direct link * adds a short explanation, noting it only works for users who have access to this file/folder. As other links are called public link you could also consider calling this 'private link', I suppose. But the links we sent by mail to ppl could also be called 'private link' (they are for one user, who git it by email) so I think it might be confusing. What do @nextcloud/designers think? Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-13 12:01:45 -05:00
Lukas Reschke	f3dbfd68a2	Merge pull request #4336 from nextcloud/add-ratelimiting Add support for ratelimiting via annotations	2017-04-13 18:53:56 +02:00
Roeland Jago Douma	cab41118f6	Mail shares trigger the public key Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-04-13 15:19:23 +02:00
Joas Schilling	629b7c0fc3	Adjust docs and make !$currentAccess simpler Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-13 12:58:52 +02:00
Joas Schilling	6c23a5fa35	Add unit tests for sharebymail provider Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-13 12:58:52 +02:00
Joas Schilling	5df727d4ad	Fix federated file sharing Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-13 12:58:51 +02:00
Joas Schilling	3c1365c0d1	Fix returned paths for remote shares Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-13 12:58:51 +02:00
Joas Schilling	4bcb7d88b5	Return the token as well Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-13 12:58:51 +02:00
Joas Schilling	91e650791d	Return the paths for the users without setting them all up Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-13 12:58:50 +02:00
Roeland Jago Douma	12afd7d1d5	Add mail element to access list * Each provider just returns what they have so adding an element won't require changing everything * Added tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-04-13 12:58:50 +02:00
Roeland Jago Douma	2cbac3357b	Offload acceslist creation to providers * This allows for effective queries. * Introduce currentAccess parameter to speciy if the users needs to have currently acces (deleted incomming group share). (For notifications) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-04-13 12:58:50 +02:00
Lukas Reschke	51377f3d8c	Merge pull request #4313 from nextcloud/ldap-name-change Change LDAP method names	2017-04-13 12:28:24 +02:00
Lukas Reschke	66835476b5	Add support for ratelimiting via annotations This allows adding rate limiting via annotations to controllers, as one example: ``` @UserRateThrottle(limit=5, period=100) @AnonRateThrottle(limit=1, period=100) ``` Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-04-13 12:00:16 +02:00
Lukas Reschke	06f8ea247b	Remove invalid route Said file doesn't exist anymore and accessing it would just return a 500 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-04-13 11:05:44 +02:00
Nextcloud bot	396618fd19	[tx-robot] updated from transifex	2017-04-13 00:08:02 +00:00
Roeland Jago Douma	b3b24172e4	Merge pull request #4307 from nextcloud/sharing-emails New emails for sharebymail	2017-04-12 21:23:11 +02:00
Morris Jobke	31024b7700	Merge pull request #4329 from nextcloud/move-out-shared-folder Fix moving files out of a shared folder	2017-04-12 11:44:26 -05:00
Joas Schilling	983210de2e	Dont add click-button text for plaintext mails Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-12 17:16:27 +02:00
Joas Schilling	506c7731a6	Don't duplicate the sentence with the header Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-12 17:16:26 +02:00
Morris Jobke	d0bae447fb	Use new email design for sharebymail emails Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-12 17:16:26 +02:00
Morris Jobke	229d17e13b	Change LDAP method names Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-12 10:10:07 -05:00
Björn Schießle	b90e91144b	Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints Discover federatedsharing endpoints	2017-04-12 16:01:07 +02:00
Jan-Christoph Borchardt	37145a275f	Fix AdBlock blocking share icon, ref #866 Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2017-04-12 15:04:12 +02:00
Robin Appelman	2f949f4515	rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-04-12 14:55:47 +02:00
Joas Schilling	a3c3124762	Allow file upload when storage is unlimited Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-12 12:27:47 +02:00
Björn Schießle	53787a29e1	Merge pull request #4317 from nextcloud/cleanup-files_trashbin-update [files_trashbin] Remove unneeded update steps	2017-04-12 10:57:09 +02:00
Björn Schießle	35188899e9	Merge pull request #4316 from nextcloud/cleanup-files_sharing-update [files_sharing] Remove unneeded update steps	2017-04-12 10:56:25 +02:00
Björn Schießle	49d8716eaa	Merge pull request #4312 from nextcloud/cleanup-name Update comments to Nextcloud	2017-04-12 10:54:20 +02:00
Lukas Reschke	39468f627f	Merge pull request #4315 from nextcloud/cleanup-files_external-update [files_external] Remove unneeded update steps	2017-04-12 10:16:42 +02:00
Lukas Reschke	feb594e212	Merge pull request #4314 from nextcloud/remove-not-needed-update.php Remove update.php of files app	2017-04-12 10:14:04 +02:00
Morris Jobke	4f200040aa	[files_trashbin] Remove unneeded update steps Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-12 00:52:27 -05:00
Morris Jobke	4d7c7b1816	[files_sharing] Remove unneeded update steps Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-12 00:49:50 -05:00
Morris Jobke	83864d465e	[files_external] Remove unneeded update steps Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-12 00:45:19 -05:00
Morris Jobke	5d444f493e	Remove update.php of files app * contains only update steps for 8.1/8.2 to 9.0 update Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-12 00:35:12 -05:00
Morris Jobke	1729e4471f	Update comments to Nextcloud * based on PR by @Ardinis * see #4311 Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-11 23:16:27 -05:00
Nextcloud bot	633b952358	[tx-robot] updated from transifex	2017-04-12 00:07:44 +00:00
Morris Jobke	6bd1c50dc3	Merge pull request #4304 from nextcloud/add-email-template-to-ocp Add IEMailTemplate to public OCP API	2017-04-11 15:09:27 -05:00
Roeland Jago Douma	8175ac6ecd	Merge pull request #4302 from nextcloud/test-integration-test [Integration Tests] Clear opcode cache after config change	2017-04-11 21:29:58 +02:00
Lukas Reschke	4cf61481e5	Clear opcode cache after config change Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-04-11 18:57:40 +02:00
Michael Jobst	81b1dc4930	share api expanded by tags (#26583 ) * share api expanded by tags * Modified files_sharing JS Unit tests * modified tests. renamed request parameter. refactoring * Update Share20OCS.php Added missing function description * Update Helper.php Added missing function description * Update Helper.php implicit boolean conversion to !empty() * Update Share20OCSTest.php Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-11 11:54:13 -05:00
Morris Jobke	45a6e37699	Merge pull request #4293 from nextcloud/fix_4248 Do reload shared views	2017-04-11 11:53:01 -05:00
Lukas Reschke	280a075c9c	Adjust class references Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-04-11 17:35:59 +02:00
Roeland Jago Douma	53bca14a27	Do proper DI Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-04-11 15:04:01 +02:00
Bjoern Schiessle	3bc72f7224	give old end-points a seperate name Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-11 15:04:01 +02:00
Bjoern Schiessle	e2d7bffcda	fix constructor Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-11 15:04:01 +02:00
Bjoern Schiessle	449011dae7	remove discovery manager in favour of the OCSDiscoveryService Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-11 15:04:01 +02:00
Bjoern Schiessle	821e287805	adjust existing tests Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-11 15:04:01 +02:00
Bjoern Schiessle	d5dec527c9	get addressbook url and carddav user from remote server Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-11 15:04:01 +02:00
Bjoern Schiessle	930c507d89	use discovered end-point for trusted servers Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-11 15:04:01 +02:00
Lukas Reschke	afb5d45705	Merge pull request #4256 from nextcloud/theming Move OC_Defaults to OCP\Defaults	2017-04-11 14:39:46 +02:00
Roeland Jago Douma	8c01e45d6b	Do reload shared views Fixes #4248 The magic introduced in #3686 caused the shared views not to be updated properly. Thus we just overwrite the _onUrlChange method in the sharedfilelist. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-04-11 09:33:27 +02:00
Morris Jobke	1846e1262d	Merge pull request #4289 from nextcloud/maintenance-mode-also-on-dav Add missing maintenance plugin to new DAV endpoint	2017-04-11 00:44:20 -05:00
Morris Jobke	11d6fe1023	Merge pull request #4283 from nextcloud/shares-by-folder-quote properly quota table names in getSharesInFolder	2017-04-10 19:39:19 -05:00
Nextcloud bot	4d90b0520e	[tx-robot] updated from transifex	2017-04-11 00:07:29 +00:00
Lukas Reschke	aacbb560ae	Add missing maintenance plugin to new DAV endpoint The `/remote.php/dav/` endpoint was not implementing the MaintenancePlugin. Thus when the instance was put into maintenance mode the endpoints were still accessible and delivered empty content. Sync clients really do love this. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-04-11 01:31:57 +02:00
Morris Jobke	a045f3c4d7	Merge pull request #4146 from nextcloud/unread-comments-folder Allow getting the unread comment count for an entire folder at once	2017-04-10 13:21:39 -05:00
Roeland Jago Douma	a750436ebc	Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilities move share by mail capabilities to the share provider	2017-04-10 19:50:13 +02:00
Robin Appelman	a555672f21	properly quota table names in getSharesInFolder Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-04-10 17:59:40 +02:00
Bjoern Schiessle	cbacca4202	move capabilities to share by mail app Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-10 17:18:13 +02:00
Roeland Jago Douma	e9c6fe2fd8	Merge pull request #4222 from nextcloud/dav-search-fileid Allow searching file by fileid	2017-04-10 15:57:56 +02:00
Björn Schießle	235563f0a0	Merge pull request #4250 from nextcloud/disable-lookupserver-upload allow admin to disable lookupserver upload	2017-04-10 11:04:19 +02:00
Lukas Reschke	09c66c93c5	Merge pull request #4266 from nextcloud/fix_missing_owner_on_public_calendars don't remove owner property for public calendars	2017-04-10 10:41:13 +02:00
Bjoern Schiessle	78f0b5c19f	simplify return statement Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-10 09:44:23 +02:00
Morris Jobke	d83c8e0271	ThemingDefaults append cacheBusterCounter to logo URL by default Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-09 21:43:09 -05:00
Morris Jobke	5b4adf66e5	Move OC_Defaults to OCP\Defaults * currently there are two ways to access default values: OCP\Defaults or OC_Defaults (which is extended by OCA\Theming\ThemingDefaults) * our code used a mixture of both of them, which made it hard to work on theme values * this extended the public interface with the missing methods and uses them everywhere to only rely on the public interface Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-09 21:43:01 -05:00
Nextcloud bot	d25a96d921	[tx-robot] updated from transifex	2017-04-10 00:08:50 +00:00
Georg Ehrke	c99bdc9eb4	don't remove owner property for public calendars Signed-off-by: Georg Ehrke <developer@georgehrke.com>	2017-04-09 21:20:59 +02:00
Nextcloud bot	16091f4424	[tx-robot] updated from transifex	2017-04-09 00:07:40 +00:00
Nextcloud bot	4b0f50c456	[tx-robot] updated from transifex	2017-04-08 00:07:45 +00:00
Morris Jobke	ca9d25169d	Merge pull request #4136 from nextcloud/expire-date-for-all-shares Unified sharing options	2017-04-07 17:14:05 -05:00
Morris Jobke	8838ed4c2e	Merge pull request #4244 from nextcloud/welcome-email New layout for welcome email	2017-04-07 14:52:28 -05:00
Morris Jobke	4c60360bf7	Merge pull request #4221 from nextcloud/provisioning-api-for-account-info Allow to change account info via provisioning api	2017-04-07 12:48:44 -05:00
Lukas Reschke	281ad406e8	Add support for theming Add support for theming in generated emails and simplify API Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-04-07 12:03:47 -05:00
Bjoern Schiessle	9afd160e66	allow to disable upload to lookup server, by default it is enabled Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-07 16:30:07 +02:00
Bjoern Schiessle	11b46389af	adjust to changes in the theming app Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-07 15:44:00 +02:00
Bjoern Schiessle	3323d01db1	update unit tests Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-07 15:43:59 +02:00
Bjoern Schiessle	676a4c781a	update capabilities Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-07 15:43:59 +02:00
Joas Schilling	3d628783d9	Allow to change account info via provisioning api Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-07 12:50:47 +02:00
Roger Szabo	5fa218051b	unit test adjustment Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-04-07 18:06:50 +08:00
Nextcloud bot	536650c02f	[tx-robot] updated from transifex	2017-04-07 00:09:11 +00:00
Roger Szabo	0ea8729d1d	lower case for attributes Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-04-06 19:17:24 +08:00
Roger Szabo	f49ff74943	blizzz comments 03.04.2017 with caching Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-04-06 16:57:07 +08:00
Roger Szabo	33c8bf1857	blizzz comments 03.04.2017 Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-04-06 16:26:41 +08:00
Joas Schilling	287bae8c5f	Merge pull request #4153 from nextcloud/fix-upload Fix upload of folders in Chrome	2017-04-06 09:56:41 +02:00
Morris Jobke	6e72fd5f9f	Fix upload of folders in Chrome Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-06 00:50:58 -05:00
Morris Jobke	b084ceec3d	Merge pull request #4224 from nextcloud/dont-list-on-public-calendar-endpoint Don't list on public calendar endpoints	2017-04-05 20:55:39 -05:00
Nextcloud bot	7d9688c89e	[tx-robot] updated from transifex	2017-04-06 00:07:50 +00:00
Lukas Reschke	63288ebc50	Don't list on public calendar endpoints There is no need to allow listing here. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-04-05 22:43:05 +02:00
Robin Appelman	bb7e236e74	Allow searching file by fileid Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-04-05 15:22:53 +02:00
Roeland Jago Douma	00558de782	Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storages Also add the root of external storages to the file id list	2017-04-05 15:21:38 +02:00
Artur Neumann	3795636b90	validate file name before uploading in upload only folder fixes #4211 Signed-off-by: Artur Neumann <info@individual-it.net>	2017-04-05 13:26:40 +05:45
Nextcloud bot	84035862f7	[tx-robot] updated from transifex	2017-04-05 00:08:20 +00:00
Arthur Schiwon	30c95b51fb	fix fseek against string not resource by removing append support Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-04-04 20:25:59 +02:00
Roeland Jago Douma	da178db98e	Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12 Make public links work with master key	2017-04-04 11:46:13 +02:00
Joas Schilling	b6c1f3fc6d	Some more hardening Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-04-04 08:51:21 +02:00
SarthikaDhawan	62fb3bb3ef	file-upload.js modified : Remaining upload time corrected Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-04-04 08:51:20 +02:00
Nextcloud bot	ec5377306d	[tx-robot] updated from transifex	2017-04-04 00:07:46 +00:00
Morris Jobke	51bcb0bbe1	Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_shared_calendars allow sharees to edit certain calendar properties for themselves	2017-04-03 13:12:56 -05:00
Roeland Jago Douma	455542d306	Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparency-on-calendars Make sure transparency is an integer when saving a calendar	2017-04-03 12:46:00 +02:00
Bjoern Schiessle	dac6826ad7	setting to disable sending password by mail Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-03 10:29:33 +02:00
Bjoern Schiessle	b84fd7c361	set expire date for all share types Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-03 10:29:32 +02:00
Bjoern Schiessle	c191173d59	allow password protected mail shares Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-03 10:29:32 +02:00
Bjoern Schiessle	c6613ee8fc	fix share provider id Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-03 10:20:49 +02:00
Bjoern Schiessle	0d5147bd49	add new password column to the share table in order to set passwords for share by mails Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-04-03 10:20:49 +02:00
Nextcloud bot	d56f6399eb	[tx-robot] updated from transifex	2017-04-03 00:08:20 +00:00
Nextcloud bot	0056211672	[tx-robot] updated from transifex	2017-04-02 00:07:48 +00:00
Nextcloud bot	9098042c95	[tx-robot] updated from transifex	2017-04-01 00:08:09 +00:00
Roeland Jago Douma	57020a0c36	Merge pull request #3438 from nextcloud/external-storage-user-folder Allow using '/' as external storage mountpoint	2017-03-31 15:07:39 +02:00
Roger Szabo	bd907a5dac	usertest adjustment Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-03-31 17:30:59 +08:00
Roger Szabo	9ed4fb0494	usertest adjustment Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-03-31 16:54:22 +08:00
Roger Szabo	1853c1ade2	remove redundant tabs Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-03-31 15:27:50 +08:00
Roger Szabo	5e7723f15c	restore ldap_password_renew_pr Signed-off-by: Roger Szabo <roger.szabo@web.de>	2017-03-31 15:16:22 +08:00
Nextcloud bot	6a6300b1f2	[tx-robot] updated from transifex	2017-03-31 00:08:35 +00:00
Joas Schilling	738730f7b2	Also add the root of external storages to the file id list Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-30 23:26:19 +02:00
Joas Schilling	43143e170e	Make sure transparency is an integer when saving a calendar Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-30 17:58:33 +02:00
Roeland Jago Douma	70f93bf53a	Merge pull request #4143 from nextcloud/ldap-downstream-64 Correctly apply quota	2017-03-30 14:10:21 +02:00
Robin Appelman	429f8ae011	Allow getting the unread comment count for an entire folder at once Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-03-30 12:48:24 +02:00
Nextcloud bot	f984cf0987	[tx-robot] updated from transifex	2017-03-30 00:07:41 +00:00
Morris Jobke	d17678b5b2	Merge pull request #4141 from nextcloud/ldap-downstream-9 Convert the group limit to match the same behaviour as the user search	2017-03-29 15:47:28 -06:00
Roeland Jago Douma	0315e2ea36	Merge pull request #4145 from nextcloud/ldap-downstream-54 Add tooltips to LDAP wizard special attributtes	2017-03-29 19:31:35 +02:00
Roeland Jago Douma	6d8e447895	Merge pull request #4108 from nextcloud/color-variable-rename rename confusing getMailHeaderColor to getColorPrimary, ref #3491	2017-03-29 19:13:36 +02:00
Roeland Jago Douma	636575e3de	Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid Ldap no memberof with memberuid	2017-03-29 19:12:51 +02:00
Morris Jobke	c1030a34a5	Merge pull request #4062 from nextcloud/downstream-26872 Adding dav resource for avatars	2017-03-29 10:30:22 -06:00
Jan-Christoph Borchardt	9a75714c22	rename confusing getMailHeaderColor to getColorPrimary, ref #3491 Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2017-03-29 18:23:23 +02:00
David Toledo	a4b9bd29a9	Add tooltips to LDAP wizard special attributtes Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-03-29 14:38:01 +02:00
Juan Pablo Villafáñez	4622bebded	Include tests for "default" and "none" quotas Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez	3676189e05	Add comments in the updateQuota method to explain the behavior Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez	ebd1a7d4b2	Add new testes to cover more cases Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez	e9b96062e6	Adjust current tests to match the expectations Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez	f9832ff347	Check if the user exists before trying to set the quota Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez	3345a72e7e	Correctly apply quota Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-03-29 13:32:11 +02:00
Juan Pablo Villafáñez	9e2e0c4c30	Convert the group limit to match the same behaviour as the user search Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-03-29 12:49:08 +02:00
Roeland Jago Douma	00839a5ac5	Merge pull request #4066 from nextcloud/always-fix-the-values-live Directly fix invalid values of DTEND and DTSTART	2017-03-29 10:13:10 +02:00
Joas Schilling	a88edce54f	Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p Replace unecessary unescaped prints with print	2017-03-29 10:02:10 +02:00
Morris Jobke	ac7ca1c3a8	Merge pull request #4060 from nextcloud/shared_by_for_own_calendars fix bug with shared_by for own calendars if shared	2017-03-29 00:29:54 -06:00
Nextcloud bot	58513255d2	[tx-robot] updated from transifex	2017-03-29 00:07:41 +00:00
Morris Jobke	9e1fdf4da5	Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebar Better styling of the empty content messages in the sidebar	2017-03-28 17:50:10 -06:00
Lukas Reschke	99675b46e9	Replace unecessary unescaped prints with print There's no need to have those unescaped from what I can see. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-29 00:43:44 +02:00
Roeland Jago Douma	7cc96c2121	Don't output jpeg if we request png Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-29 00:05:04 +02:00
Lukas Reschke	2a77727897	Fix PHPDoc Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-29 00:04:29 +02:00
Roeland Jago Douma	f0850b266e	Fix inspection results Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-03-29 00:04:29 +02:00
Thomas Müller	836271e0fd	Adding AvatarNodeTest Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-29 00:04:29 +02:00
Thomas Müller	3e93f491f2	Adding AvatarHomeTest Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-29 00:04:29 +02:00
Thomas Müller	73007255ce	Return last modification time to allow proper listing in cadaver Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-29 00:04:29 +02:00
Thomas Müller	23aab05bda	Adding dav resource for avatars Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-29 00:04:29 +02:00
Joas Schilling	b91bacf141	Better styling of the empty content messages in the sidebar Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-28 23:26:10 +02:00
Roeland Jago Douma	4821c00ea8	Merge pull request #4004 from nextcloud/backport-27172 Remove SharedCache::getNumericStorageId to let CacheWrapper do it	2017-03-28 21:56:44 +02:00
John Molakvoæ	f88a578f8e	Merge pull request #4082 from nextcloud/fix-menu Fix pop over menu opacity	2017-03-28 09:47:48 +02:00
Nextcloud bot	6309b9ec1d	[tx-robot] updated from transifex	2017-03-28 00:07:53 +00:00
Georg Ehrke	242bb746b9	OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackend Signed-off-by: Georg Ehrke <developer@georgehrke.com>	2017-03-27 19:15:51 +02:00
Georg Ehrke	b887adf386	allow sharees to edit certain calendar properties for themselves Signed-off-by: Georg Ehrke <developer@georgehrke.com>	2017-03-27 17:21:57 +02:00
Marius Blüm	0e058a9a94	Fix LDAP description Signed-off-by: Marius Blüm <marius@lineone.io>	2017-03-27 16:30:29 +02:00
Robin Appelman	ae3016959e	fix shared storage numeric id Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-03-27 14:05:18 +02:00
Nextcloud bot	d9ebc2626f	[tx-robot] updated from transifex	2017-03-27 00:07:55 +00:00
Morris Jobke	e1ad305e0b	Fix pop over menu opacity Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-26 14:09:22 -06:00
Joas Schilling	0564392cb9	Fix the tests Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-26 21:26:45 +02:00
Joas Schilling	e0b040d623	Allow multiple navigation links from info.xml Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-26 21:15:25 +02:00
Joas Schilling	054e161eb5	Manage the right side menu via the navigation manager as well Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-26 19:40:41 +02:00
Joas Schilling	3bd501aad2	Directly fix the values Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-26 13:09:53 +02:00
Joas Schilling	27e3a977aa	Fix unit test Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-26 10:59:59 +02:00
Morris Jobke	2249c77a06	Also remove failure notification if no update is available * error happened and vanished the notification should also vanish even if no update is available Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-26 10:59:58 +02:00
Joas Schilling	3668673d7b	Create a notification when the update server couldn't be reached for some days Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-26 10:59:58 +02:00
Nextcloud bot	0981f9a18a	[tx-robot] updated from transifex	2017-03-26 01:07:03 +00:00
Georg Ehrke	896dd76ab5	fix bug with shared_by for own calendars if shared Signed-off-by: Georg Ehrke <developer@georgehrke.com>	2017-03-25 23:07:09 +01:00
Nextcloud bot	4ea79a5bbe	[tx-robot] updated from transifex	2017-03-25 01:07:45 +00:00
Lukas Reschke	4f73911bab	Merge pull request #4041 from nextcloud/merge-systemtags-js Merge systemtags JS	2017-03-24 21:12:42 +01:00
Lukas Reschke	3623431ac3	Merge pull request #4040 from nextcloud/merge-js-for-versions Merge JS for files_versions	2017-03-24 21:11:58 +01:00
Morris Jobke	84b6b1807f	Merge pull request #4038 from nextcloud/merge-js-for-fileview Merge file view JS files	2017-03-24 13:17:06 -06:00
Lukas Reschke	a9c3692a9a	Merge systemtags JS Shaves off 7 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-24 20:08:27 +01:00
Lukas Reschke	0ed56589cc	Merge JS for files_versions Shaves off 3 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-24 19:57:19 +01:00
Lukas Reschke	bdd71b6081	Merge JS for comments Shaves off 6 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-24 19:49:43 +01:00
Lukas Reschke	b70b138bdb	Merge file view JS files Removes 26 requests on the file list loading Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-03-24 19:42:22 +01:00
Lukas Reschke	2cd79a8d3d	Merge pull request #3988 from nextcloud/jscombiner [PoC] JS Combiner	2017-03-24 19:31:31 +01:00
Vincent Petry	6b9ef15803	Use master key for public links as well	2017-03-24 14:55:42 +01:00
Vincent Petry	305718370a	Add tests for null user	2017-03-24 14:55:33 +01:00
Vincent Petry	43c081bdc9	Fix public link for master key In public link mode there is no session, so the code should use the public key instead.	2017-03-24 14:55:12 +01:00
Bjoern Schiessle	ee014bddbd	fix tests calling getAbsoluteBundlePath() in the constructor makes other tests fail Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-03-24 11:27:01 +01:00
Joas Schilling	33867f331c	Load cert file before syncing addressbooks and contacts Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-03-24 11:06:44 +01:00
Bjoern Schiessle	aa26a3ae74	use right format for avatars Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-03-24 11:06:44 +01:00
Bjoern Schiessle	e637113452	don't add empty values to the vcard Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2017-03-24 11:06:44 +01:00

... 2 3 4 5 6 ...

15959 commits