Daniel Molkentin
|
3016844dd7
|
Merge branch 'master' into rename_client
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
|
2014-12-02 13:37:22 +01:00 |
|
Olivier Goffart
|
1c58b75ac2
|
Merge branch '1.7'
|
2014-11-21 11:08:20 +01:00 |
|
Christian Kamm
|
e3b07f569a
|
FolderWatcherTest: Use Utility::usleep.
|
2014-11-21 08:21:36 +01:00 |
|
Christian Kamm
|
6d09f1b6c0
|
Folder watcher now reports changing paths instead of dirs.
|
2014-11-20 12:51:16 +01:00 |
|
Christian Kamm
|
f275002ebe
|
Merge branch '1.7'
|
2014-11-20 12:41:06 +01:00 |
|
Christian Kamm
|
d4e0941c27
|
Windows filewatcher: switch to ReadDirectoryChangesW.
Based on danimo's #2454 fix for #2455 and related to #2297.
|
2014-11-20 12:36:17 +01:00 |
|
Christian Kamm
|
4d7b8bdb25
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
OWNCLOUD.cmake
test/CMakeLists.txt
test/testfolderwatcher.h
|
2014-11-19 14:45:25 +01:00 |
|
Christian Kamm
|
421a8cc6b7
|
Windows: Make unit tests compile.
|
2014-11-19 14:18:37 +01:00 |
|
Daniel Molkentin
|
1297ac77b9
|
Fix tests
|
2014-11-09 22:37:56 +01:00 |
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|
Klaas Freitag
|
87386ce001
|
Fix testcase.
It failed because the directory where change happened triggered a
notification within the second before, so the event was skipped.
|
2014-05-14 12:49:11 +02:00 |
|
hefee
|
822650719b
|
RemoveADir test should realy test, if it is notified
|
2014-05-11 17:08:30 +02:00 |
|
Klaas Freitag
|
e3723fcfc2
|
Add a new folder watcher implementation for Linux.
|
2014-01-23 13:23:27 +01:00 |
|
Dominik Schmidt
|
351f9aedfb
|
Add testing skeleton
|
2012-10-26 20:24:12 +02:00 |
|
Duncan Mac-Vicar P
|
25315dfdec
|
fix warning
|
2011-04-06 17:03:10 +02:00 |
|
Duncan Mac-Vicar P
|
e6a135273d
|
- introduce a tmp dir class and rm-rf util function
- start a testcase for the folder watcher part
|
2011-03-18 01:14:45 +01:00 |
|