16999 commits

Author	SHA1	Message	Date
Arthur Schiwon	3ba8b337a4	fix unit tests after rebase ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-11-09 11:10:59 +01:00
Arthur Schiwon	8113f26eed	add Sync test ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-11-09 11:10:58 +01:00
Arthur Schiwon	fc6b3902af	adjust tests ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-11-09 11:10:58 +01:00
Arthur Schiwon	59c05d5447	move LDAP user attributes "sync" to background (except for ajax jobs) ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-11-09 11:10:56 +01:00
Arthur Schiwon	ef3cd32916	don't skip updating when ajax is set as background job mode ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-11-09 11:10:04 +01:00
Arthur Schiwon	c6f1af9896	move ldap user sync to background (WIP) ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-11-09 11:09:59 +01:00
Nextcloud bot	723a25a315	[tx-robot] updated from transifex	2017-11-09 09:12:41 +00:00
Morris Jobke	e0aaca1726	Merge pull request #7046 from nextcloud/hide-summary-file-actions-when-selected-file-does-not-match ... Hide summary file actions when a selected file does not match	2017-11-09 09:45:55 +01:00
Morris Jobke	6b3975c23a	Merge pull request #6846 from nextcloud/filelist-confict-path ... still trigger conflict resolution for existing entries when the curre…	2017-11-09 09:33:59 +01:00
Lukas Reschke	2bfa1ce5c3	Merge pull request #5568 from nextcloud/ldap-agent-credentials-safe ... Ldap agent credentials save	2017-11-09 09:26:51 +01:00
Nextcloud bot	aa525d89e8	[tx-robot] updated from transifex	2017-11-09 01:09:13 +00:00
Lukas Reschke	8c915baa34	Merge pull request #6788 from staabm/master ... Prevent XSS in links which open a new browser window	2017-11-08 18:55:35 +01:00
Roeland Jago Douma	497cd7fa4e	Merge pull request #7064 from nextcloud/popover-fix ... Fix popover layout	2017-11-08 12:47:58 +01:00
Nextcloud bot	79c9439c50	[tx-robot] updated from transifex	2017-11-08 01:09:21 +00:00
Lukas Reschke	b754a2e385	Merge pull request #7042 from nextcloud/bugfix/noid/ensure_unique_uid_for_calendar_objects ... ensure uid for calendar objects is unique	2017-11-07 21:55:09 +01:00
John Molakvoæ (skjnldsv)	b44581e15d	Fixed sharing popover and removed unused old code ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-11-07 18:20:59 +01:00
John Molakvoæ (skjnldsv)	bce00d8b3d	Reduce spread of css selector for a.action ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2017-11-07 16:32:20 +01:00
Roeland Jago Douma	f55732a18f	Merge pull request #7075 from nextcloud/remove-unused-variables ... Remove unused variables	2017-11-07 16:18:40 +01:00
Robin Appelman	8eaf1956bb	never show '/' as path for conflicting file names ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-11-07 15:01:56 +01:00
Robin Appelman	7ea06dacb1	still trigger conflict resolution for existing entries when the current entry doesn't need it ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2017-11-07 14:46:29 +01:00
Julius Härtl	00956c00b2	Theming: expose element color though capabilities API ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2017-11-07 12:31:23 +01:00
Nextcloud bot	f9b7109de3	[tx-robot] updated from transifex	2017-11-07 01:08:57 +00:00
Morris Jobke	31c5c2a592	Change @georgehrke's email ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-11-06 20:38:59 +01:00
Morris Jobke	0eebff152a	Update license headers ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-11-06 16:56:19 +01:00
Morris Jobke	5411d60b24	Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure ... Implement plugins infrastructure in User_LDAP	2017-11-06 16:07:31 +01:00
Morris Jobke	6c29ce4e02	Merge pull request #6402 from nextcloud/dav-email-customization ... Enhance calendar invitation emails	2017-11-06 15:14:49 +01:00
Georg Ehrke	4df08f296b	ensure uid for calendar objects is unique ... Signed-off-by: Georg Ehrke <developer@georgehrke.com>	2017-11-06 14:25:08 +01:00
Christoph Wurst	d4f83d505a	Merge pull request #7074 from nextcloud/use-proper-whitespace ... Use proper whitespace	2017-11-06 10:27:09 +01:00
Morris Jobke	5445b1ff17	Remove unused variables ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-11-06 09:43:45 +01:00
Morris Jobke	c9f3b5a311	Use proper whitespace ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-11-06 09:41:25 +01:00
Nextcloud bot	81ac1ec977	[tx-robot] updated from transifex	2017-11-06 01:09:07 +00:00
Nextcloud bot	2730a57580	[tx-robot] updated from transifex	2017-11-05 01:08:56 +00:00
Vinicius Cubas Brand	fa565750d1	User_LDAP plugins: smaller fixes ... Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>	2017-11-03 11:42:59 -02:00
Vinicius Cubas Brand	10ca793452	Plugins infrastructure in User_LDAP ... Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>	2017-11-03 11:41:40 -02:00
Jan-Christoph Borchardt	bd7d0de86f	Add variable for border-radius ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2017-11-03 14:08:21 +01:00
Georg Ehrke	43147aeada	fancify invitation emails ... Signed-off-by: Georg Ehrke <developer@georgehrke.com>	2017-11-03 11:20:03 +01:00
Joas Schilling	1bb048d11f	Correctly use the email templating ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-11-03 11:20:03 +01:00
Joas Schilling	b14b933062	Language depending dates ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-11-03 11:20:03 +01:00
Joas Schilling	cf04093fa6	Fix phpStorm complaints ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-11-03 11:20:03 +01:00
Leon Klingele	c899f35261	DAV: Initial email customization support ... Signed-Off-By: Leon Klingele <leon@struktur.de> Signed-off-by: Georg Ehrke <developer@georgehrke.com>	2017-11-03 11:19:39 +01:00
Jan-Christoph Borchardt	576d31d48d	Merge pull request #7049 from nextcloud/fix-actions-menu ... Fix opening the file actions menu in mobile	2017-11-03 11:11:01 +01:00
Jan-Christoph Borchardt	4ee2d2a1c2	Merge pull request #7048 from nextcloud/flexbox-css ... Vendor prefix for flexbox not needed anymore	2017-11-03 11:10:25 +01:00
Morris Jobke	5e02cedef3	Fix opening the file actions menu in mobile ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-11-03 10:41:32 +01:00
Morris Jobke	9e9e5c2d16	Vendor prefix for flexbox not needed anymore ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-11-03 10:30:42 +01:00
Nextcloud bot	7e1e9430b6	[tx-robot] updated from transifex	2017-11-03 01:09:06 +00:00
John Molakvoæ	3091ddb043	Merge pull request #6652 from nextcloud/sharing-link-menu ... Move sharing page options to menu in top right	2017-11-02 17:41:01 +01:00
Jan-Christoph Borchardt	eebf19e2e6	Fix Scrutinizer issue ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2017-11-02 15:26:37 +01:00
Jan-Christoph Borchardt	4a3893b105	Merge pull request #6094 from nextcloud/sharedby-avatar ... Show avatar instead of username for shared files	2017-11-02 14:51:17 +01:00
Arthur Schiwon	222d99fe96	adjust more js unit tests ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2017-11-02 13:51:08 +01:00
Daniel Calviño Sánchez	a9540fe990	Hide summary file actions when a selected file does not match ... When several files are selected and one of them can not be deleted the "Delete" file action is not shown in the summary. This commit extends that behaviour too to the other file actions in the summary ("Move or copy" and "Download"), so now an action is shown in the summary only if it can be executed on all the currently selected files. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>	2017-11-02 12:47:57 +01:00