chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
12,636 Commits 4 Branches 173 Tags
techpreview-v1
Commit Graph
12636 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jenkins for ownCloud 804c9fbd6f [tx-robot] updated from transifex 2013-10-21 12:01:30 -04:00
Jenkins for ownCloud 2edebdef08 [tx-robot] updated from transifex 2013-10-20 06:49:52 -04:00
Klaas Freitag 0f6ca35e95 Updated changelog for 0.90.4. 2013-10-18 15:11:09 +02:00
Klaas Freitag a1699bbbce Set version to 0.90.4 2013-10-18 14:57:11 +02:00
Daniel Molkentin a91ba0fd48 WIP: Move network tasks from ownCloudInfo into Job classes. 2013-10-18 12:24:29 +02:00
Daniel Molkentin a25d55a265 Add QtJson to 3rdparty, use it in ownCloudInfo 2013-10-18 02:00:19 +02:00
Jenkins for ownCloud c99f75b247 [tx-robot] updated from transifex 2013-10-17 12:48:20 -04:00
Klaas Freitag 0e61036fa5 Build with HBF debug all time. 2013-10-17 16:40:04 +02:00
Olivier Goffart 566a6f761b Make debug info in reconcile a bit more informative 2013-10-17 13:09:04 +02:00
Olivier Goffart 0efbfb10aa Fix MOVE of directory. 
Remove the right entry from the database (i.e: the original file name)
Fetch the etags of the sub entries
 2013-10-17 13:06:39 +02:00
Olivier Goffart cb8006b89f Fix comments of the propagation step. 
Also, don't mark item as removed if the instruction is not REMOVE
 2013-10-17 12:09:44 +02:00
Klaas Freitag 660469cbf5 Do not propagate a move of the Shared folder. 2013-10-17 10:48:31 +02:00
Daniel Molkentin a06e551469 Merge pull request #1103 from Absolight/freebsd-port 
Patches for FreeBSD
 2013-10-16 08:52:46 -07:00
Olivier Goffart 746b86a1dd Save the progress db once a chunk has been upload 
Allow to resume when we cancel the sync
 2013-10-16 16:47:24 +02:00
Olivier Goffart e69ecd3a80 hbf: add a callback when the chunk upload is finished 
Also add an user_data to other callbacks
 2013-10-16 16:46:50 +02:00
Mathieu Arnold 1c594b6a8d FreeBSD doesn't have statvfs64, like MacOS X. 2013-10-16 15:57:59 +02:00
Mathieu Arnold 2b652422b9 Don't call make directly, it can have another name. 2013-10-16 15:57:05 +02:00
Olivier Goffart 313832de8d Put the progress database within the journal 2013-10-16 12:01:14 +02:00
Klaas Freitag 738d868d38 Bump version to 0.90.3 2013-10-16 09:29:24 +02:00
Jenkins for ownCloud 250f281189 [tx-robot] updated from transifex 2013-10-15 23:26:29 -04:00
Olivier Goffart 2c63f7a24d Merge branch '1.4' 
Conflicts:
	VERSION.cmake
	src/mirall/application.cpp
	src/mirall/application.h
	src/mirall/csyncthread.cpp
	src/mirall/folder.cpp
	src/mirall/folder.h
	src/mirall/folderman.cpp
 2013-10-15 17:00:53 +02:00
Olivier Goffart f9ce534687 Merge branch 'dav' into ocsync 
Conflicts:
	src/csync.c
 2013-10-15 16:55:22 +02:00
Olivier Goffart 10fba886dc Do not elide the progress text 
It's size is computed so the text fit, there is no need to alide it.

Fixes #1094
 2013-10-15 14:58:34 +02:00
Olivier Goffart 6601395a6e Do not overwrite the neon error string with the HTTP error 
When the errno is ERRNO_ERROR_STRING it means the error string is a
valid string with the error, and it should not be overwritten with
the HTTP reason_phrase

Fixes https://github.com/owncloud/mirall/issues/1088
 2013-10-15 14:02:17 +02:00
Olivier Goffart 2479cda8ea Merge remote-tracking branch 'freitag/dav' into dav 2013-10-15 14:00:40 +02:00
Daniel Molkentin 046d955f5c 1.4.2beta1 2013-10-14 20:21:07 +02:00
Klaas Freitag d0d362664b Handle proxy on folder level, not folderman level. 2013-10-14 16:11:52 +02:00
Klaas Freitag f841450dae Do append non empty lines not starting with a hash to ignores. 2013-10-14 16:11:52 +02:00
Klaas Freitag a3927c5c2c Avoid quick flickering up of the ok-icon for the sync prepare state. 
For the SyncPrepare phase now the icon that was displayed before is
kept. If the folder was disabled before, the sync icon is displayed.
 2013-10-14 12:59:08 +02:00
Klaas Freitag 89cfa387cd Remove bogus html formatting tag. 2013-10-14 11:46:02 +02:00
Klaas Freitag fc10400fd5 Also count deleted and renamed files to overall count 2013-10-14 11:42:57 +02:00
Klaas Freitag 3421f1871f Disable inode check for all platforms. (core #4953) 2013-10-14 11:42:43 +02:00
Olivier Goffart 1fccb23442 Don't show desktop notification when the user don't want to 
Fix #1093
 2013-10-14 11:33:47 +02:00
Klaas Freitag bfd50ffcd0 Do not show progress if nothing is transmitted, show number of deletes. 2013-10-14 11:16:17 +02:00
Klaas Freitag 958d712199 Also count deleted and renamed files to overall count 2013-10-14 11:15:44 +02:00
Jenkins for ownCloud d2301c811e [tx-robot] updated from transifex 2013-10-13 19:29:34 -04:00
Klaas Freitag 4f2a171913 Avoid quick flickering up of the ok-icon for the sync prepare state. 
For the SyncPrepare phase now the icon that was displayed before is
kept. If the folder was disabled before, the sync icon is displayed.
 2013-10-11 17:54:26 +02:00
Daniel Molkentin 005d70a73c Proxy support: Reset useSystemConfiguration() in all cases but DefaultProxy 
Fixes #1016
 2013-10-11 14:25:35 +02:00
Klaas Freitag 592291cbcb Fix initialized after warning. 2013-10-11 12:10:47 +02:00
Klaas Freitag 7236bd7dd4 Make problem warnings not appearing in the tray. 
This fixes bug #944: Do not show the warning icon in the tray.
 2013-10-11 12:09:27 +02:00
Klaas Freitag c02d5f41a5 Remove bogus html formatting tag. 2013-10-11 12:09:27 +02:00
Daniel Molkentin 5a7cd815ab Reconnect if network is unavailable after startup 
Fixes: #1080
 2013-10-11 11:43:23 +02:00
Klaas Freitag df3020ee91 Remove resetting of the internal csync error state. 
Resetting this in trivial helper functions leads to the fact that
error conditions happening in functions calling these helpers get
lost which should not happen.
 2013-10-11 10:27:04 +02:00
Klaas Freitag f3755bb708 Remove resetting of the internal csync error state. 
Resetting this in trivial helper functions leads to the fact that
error conditions happening in functions calling these helpers get
lost which should not happen.
 2013-10-11 10:21:59 +02:00
Jenkins for ownCloud 006be43c73 [tx-robot] updated from transifex 2013-10-10 22:18:01 -04:00
Klaas Freitag c34b861332 Disable inode check for all platforms. (core #4953) 2013-10-10 12:22:59 +02:00
Daniel Molkentin c2c01bccfc Fix literal occurances of "ownCloud" in GUI 2013-10-10 11:35:22 +02:00
Daniel Molkentin 2240039442 Fix literal occurances of "ownCloud" in GUI 2013-10-10 11:34:45 +02:00
Klaas Freitag fb4728c7ee Handle sync enable flag correctly in folder scheduling. 
This fixes bug #1083.

Conflicts:
	src/mirall/folder.cpp
 2013-10-10 11:32:56 +02:00
Klaas Freitag f34621578e Use qint64 rather than int64_t. 2013-10-09 14:33:24 +02:00