6286 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andy Scherzinger	d2f1d38896	Merge pull request #509 from nextcloud/autoUploadWrongDirectoryCreated ... fix wrong creation of folder during auto upload	2017-01-06 00:10:20 +01:00
AndyScherzinger	09e439c1e4	1.4.1 RC2	2017-01-06 00:03:07 +01:00
tobiasKaminsky	555e885940	fix wrong creation of folder during auto upload	2017-01-05 20:33:40 +01:00
Nextcloud bot	0d8827630f	[tx-robot] updated from transifex	2017-01-05 13:04:30 +00:00
Andy Scherzinger	0ede6c9127	Merge pull request #505 from nextcloud/fixTimSort ... try to fix TimSort, but it was just a plain NPE...	2017-01-04 20:43:11 +01:00
tobiasKaminsky	1219844d58	try to fix TimSort, but it was just a plain NPE...	2017-01-04 20:24:26 +01:00
Tobias Kaminsky	ade4194c6b	Merge pull request #499 from nextcloud/141RC ... 1.4.1 RC1	2017-01-04 19:55:18 +01:00
AndyScherzinger	33d7d10dd7	1.4.1 RC1	2017-01-04 17:03:19 +01:00
Andy Scherzinger	cd135ac0b3	Merge pull request #501 from nextcloud/fix-doc ... fix doc build	2017-01-04 15:06:03 +01:00
Morris Jobke	74edc51434	fix doc build ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-04 14:42:30 +01:00
Morris Jobke	b55fba484c	Merge pull request #500 from nextcloud/davdroid-doc ... Provide a manual for the DAVDroid sync setup	2017-01-04 14:34:26 +01:00
Morris Jobke	941ee77554	adjust text to Andys comment ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-04 14:30:23 +01:00
Morris Jobke	7ab7bf1d0e	Provide a manual for the DAVDroid sync setup ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-01-04 14:03:07 +01:00
Nextcloud bot	37e5ed0cac	[tx-robot] updated from transifex	2017-01-04 12:04:15 +00:00
Andy Scherzinger	c8f1dd1009	Merge pull request #472 from nextcloud/AutoUploadDelayAndCheck ... Auto upload: delay job, check file	2017-01-03 21:18:16 +01:00
tobiasKaminsky	5ab691154e	- delay job execution by minimal 10s ... - on job execution: check if file exists prior to real upload. If file does not exist anymore, just ignore it	2017-01-03 21:06:23 +01:00
Andy Scherzinger	f2331a089f	Merge pull request #469 from nextcloud/autoUploadOnlyFiles ... auto upload: only files, no folders	2017-01-03 21:03:44 +01:00
tobiasKaminsky	bdf8e58d22	auto upload: only files, no folders	2017-01-03 20:45:10 +01:00
Nextcloud bot	acad124e50	[tx-robot] updated from transifex	2017-01-03 17:48:34 +00:00
Andy Scherzinger	6bc2a58863	Merge pull request #485 from nextcloud/autoUploadNoTmpFiles ... ignore files ending with ".tmp"	2017-01-03 17:10:54 +01:00
Nextcloud bot	36265d93b3	[tx-robot] updated from transifex	2017-01-02 01:32:59 +00:00
Nextcloud bot	0261cbf078	[tx-robot] updated from transifex	2017-01-01 01:37:45 +00:00
tobiasKaminsky	3055bcecb3	ignore files ending with ".tmp"	2016-12-31 18:32:20 +01:00
Andy Scherzinger	d718676709	Merge pull request #487 from nextcloud/pendingJobsinUploadView ... Pending jobs in upload view	2016-12-31 17:52:25 +01:00
tobiasKaminsky	2b86d9912e	show pending jobs in upload view ... cancel pending jobs	2016-12-31 17:37:42 +01:00
tobiasKaminsky	96777a7d36	extracted string value ... first try to get uploadStorageManager show job	2016-12-31 17:37:40 +01:00
Andy Scherzinger	2ec0322186	Merge pull request #494 from nextcloud/renameWifiOnly ... rename auto upload "wifi only"	2016-12-31 17:35:54 +01:00
tobiasKaminsky	c26d84eb54	rename auto upload "wifi only"	2016-12-31 17:26:09 +01:00
Andy Scherzinger	08a1beb57f	Merge pull request #479 from nextcloud/fixRemovingFileBug ... fixed removing files #473	2016-12-31 15:48:37 +01:00
tobiasKaminsky	87077067f8	fixed removing files #473	2016-12-31 15:17:52 +01:00
Nextcloud bot	1fddc98026	[tx-robot] updated from transifex	2016-12-31 01:37:40 +00:00
Andy Scherzinger	76c47c37c3	Merge pull request #488 from nextcloud/disableInstantUploadLoggingOnNougat ... disable handling broadcast on Nougat and better	2016-12-30 19:12:19 +01:00
tobiasKaminsky	a116cdf77f	disable handling broadcast on Nougat and better	2016-12-30 19:02:43 +01:00
Andy Scherzinger	c3b6e013d8	Merge pull request #492 from nextcloud/emailShareCrashFix ... proper email sharee handling	2016-12-30 18:53:19 +01:00
AndyScherzinger	ee121056a4	changelog 1.4.1	2016-12-30 18:44:03 +01:00
AndyScherzinger	f79b7ca2c0	resolves: #483 - adding proper email sharee handling	2016-12-30 18:37:31 +01:00
Andy Scherzinger	6f77ef8f4b	Merge pull request #449 from nextcloud/designTweaks ... Minor Usability improvements	2016-12-30 18:33:16 +01:00
AndyScherzinger	5e0a163709	simplify loading screen	2016-12-30 17:52:21 +01:00
AndyScherzinger	3eaeb049a1	fix codacy warnings	2016-12-30 17:43:04 +01:00
AndyScherzinger	4d646d0da3	restore backAsUp arrow in action bar when being in a subfolder (and drawer has been opened/closed) #445	2016-12-30 17:43:04 +01:00
AndyScherzinger	99d630bdf4	empty list tweaks for #445	2016-12-30 17:43:04 +01:00
AndyScherzinger	20010d1d92	#445 - space between avatar and filename corrected	2016-12-30 17:43:03 +01:00
Nextcloud bot	3d8f4ac4c8	[tx-robot] updated from transifex	2016-12-30 14:23:13 +00:00
Nextcloud bot	c517796fb2	[tx-robot] updated from transifex	2016-12-30 01:33:46 +00:00
Nextcloud bot	613e4477f1	[tx-robot] updated from transifex	2016-12-29 01:32:52 +00:00
Nextcloud bot	bfb17b316e	[tx-robot] updated from transifex	2016-12-28 01:32:48 +00:00
Andy Scherzinger	0c94de645b	Merge pull request #327 from zmatsuo/uploadUrlFile ... Add upload URL file feature	2016-12-27 14:03:56 +01:00
AndyScherzinger	b5fea72953	codacy is really picky....	2016-12-21 13:12:56 +01:00
AndyScherzinger	87aeb026b6	shorten interface	2016-12-21 13:04:30 +01:00
AndyScherzinger	75dace2af0	shorten class definition	2016-12-21 13:03:55 +01:00