Commit graph

4848 commits

Author SHA1 Message Date
Klaas Freitag
5482ad1fd3 Remove event buffering from watcher, other refactoring. 2014-01-13 15:28:56 +01:00
Olivier Goffart
924e0e3242 Merge csync inside the mirall repository 2014-01-13 14:43:14 +01:00
Olivier Goffart
bf7ca60bec Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
Klaas Freitag
f9080c59ab Remove FolderWatcher from Folder and move to FolderMan. 2014-01-13 11:30:27 +01:00
Klaas Freitag
a12288ff21 Use folderwatcher based on Qt for Linux. 2014-01-13 11:30:27 +01:00
Jenkins for ownCloud
dcc5a8b02b [tx-robot] updated from transifex 2014-01-13 02:06:59 -05:00
Jenkins for ownCloud
db87f9926a [tx-robot] updated from transifex 2014-01-11 02:06:59 -05:00
Mr. Jenkins
dc076890a7 [tx-robot] updated from transifex 2014-01-11 01:26:12 -05:00
Klaas Freitag
d5b8d24f91 Add NoSymLink tag to the filter specification.
Should finally fix bug #1331
2014-01-10 09:09:22 +01:00
Klaas Freitag
9da06f10f6 Removed unused event interval getter/setter. 2014-01-10 09:09:22 +01:00
Jenkins for ownCloud
3923911368 [tx-robot] updated from transifex 2014-01-10 02:07:01 -05:00
Mr. Jenkins
b24691b0e4 [tx-robot] updated from transifex 2014-01-10 01:26:14 -05:00
Olivier Goffart
ebee52ea8a Merge branch '1.5' 2014-01-09 12:32:08 +01:00
Jenkins for ownCloud
78b1d3c347 [tx-robot] updated from transifex 2014-01-09 02:06:59 -05:00
Mr. Jenkins
bf4f6d78b8 [tx-robot] updated from transifex 2014-01-09 01:26:14 -05:00
Klaas Freitag
e5804b5d12 Use a more Qt'ish folder recursing method, remove unused class.
Added unit test.
2014-01-08 14:36:42 +01:00
Klaas Freitag
e5d43c2b9c Add a utility function to write a random file. 2014-01-08 14:36:42 +01:00
Klaas Freitag
a522cebf0c Add missing switch case. 2014-01-08 14:36:42 +01:00
Olivier Goffart
1bc4089d95 Fix hiding temporary files on windows
tmpFileName is a relative path, and we need an absolute path to
pass to the function that hides the files
2014-01-08 13:33:16 +01:00
Olivier Goffart
d931e0bcc2 Test that permissions are kept
(issue #820)
2014-01-08 13:19:28 +01:00
Olivier Goffart
b7b06a8795 Preserve the permission of the file we download
Related to issue #820
2014-01-08 13:17:35 +01:00
Olivier Goffart
b8090a134d Add test for issue 1329 2014-01-08 12:55:58 +01:00
Olivier Goffart
4006e490f3 Do not write the removed folder on the DB
Should fix #1329
2014-01-08 12:51:42 +01:00
Daniel Molkentin
f37f5ccf69 Display version in Mac OS Bundle again 2014-01-08 11:15:28 +01:00
Jenkins for ownCloud
4e2b2274a4 [tx-robot] updated from transifex 2014-01-08 02:07:00 -05:00
Mr. Jenkins
1d6d915bd2 [tx-robot] updated from transifex 2014-01-08 01:26:12 -05:00
Klaas Freitag
273463daf4 Fix progress for the case that the source file changes during upload.
If the source file changes, the overall transmission size is not longer
correct. Fixed that by pushing the change over the previously calculated
size to csyncthread. Also set the mtime and size in the item object in
propagator to avoid doublicate uploading.
2014-01-07 15:42:21 +01:00
Klaas Freitag
7da84dbe44 Check on timer member is zero. 2014-01-07 10:30:41 +01:00
Jenkins for ownCloud
24644164ca [tx-robot] updated from transifex 2014-01-07 02:07:16 -05:00
Mr. Jenkins
474c63fb8f [tx-robot] updated from transifex 2014-01-07 01:26:31 -05:00
Jenkins for ownCloud
3a1a3f7282 [tx-robot] updated from transifex 2014-01-06 02:07:16 -05:00
Mr. Jenkins
a80ed93e76 [tx-robot] updated from transifex 2014-01-06 01:26:44 -05:00
Mr. Jenkins
91ecbb25f2 [tx-robot] updated from transifex 2014-01-04 01:26:32 -05:00
Mr. Jenkins
4e9198ddc6 [tx-robot] updated from transifex 2014-01-02 01:26:56 -05:00
Olivier Goffart
b022209356 Merge pull request #1323 from scop/master
Don't discard user CXXFLAGS, append to them instead.
2013-12-31 06:47:19 -08:00
Mr. Jenkins
2cc3cbe522 [tx-robot] updated from transifex 2013-12-31 01:26:15 -05:00
Jenkins for ownCloud
c3ecc5b224 [tx-robot] updated from transifex 2013-12-30 02:06:58 -05:00
Ville Skyttä
1c9a4784c7 Don't discard user CXXFLAGS, append to them instead. 2013-12-30 00:30:48 +02:00
Jenkins for ownCloud
9f1d89e330 [tx-robot] updated from transifex 2013-12-29 02:06:59 -05:00
Mr. Jenkins
b7ce760b65 [tx-robot] updated from transifex 2013-12-29 01:26:15 -05:00
Jenkins for ownCloud
27ce6cc6fe [tx-robot] updated from transifex 2013-12-28 02:07:01 -05:00
Mr. Jenkins
134a34183f [tx-robot] updated from transifex 2013-12-28 01:26:13 -05:00
Mr. Jenkins
b0ded64de6 [tx-robot] updated from transifex 2013-12-27 01:26:13 -05:00
Jenkins for ownCloud
9745248c81 [tx-robot] updated from transifex 2013-12-26 02:06:59 -05:00
Mr. Jenkins
fcbfd7fdc4 [tx-robot] updated from transifex 2013-12-26 01:26:14 -05:00
Jenkins for ownCloud
02461f7ff7 [tx-robot] updated from transifex 2013-12-25 02:06:58 -05:00
Jenkins for ownCloud
26c8dbf14c [tx-robot] updated from transifex 2013-12-24 02:06:58 -05:00
Mr. Jenkins
1f6e355b4b [tx-robot] updated from transifex 2013-12-24 01:26:12 -05:00
Mr. Jenkins
c6e0a18a5c [tx-robot] updated from transifex 2013-12-22 01:26:47 -05:00
Daniel Molkentin
c9c56ee55a Merge pull request #1313 from csware/close-button
Close dialog if button was clicked not just pressed
2013-12-21 00:09:11 -08:00