Daniel Molkentin
02bfb4f005
Amend ChangeLog
2014-02-26 15:08:12 +01:00
Daniel Molkentin
d4dd5afbe7
Revert "Make "Sign Out" forget the cookies"
...
This reverts commit 8607300195 .
This approach is too dangerous for 1.5.2.
2014-02-26 15:05:15 +01:00
Olivier Goffart
8607300195
Make "Sign Out" forget the cookies
...
If we keep the cookies, next time we sign in, the entered password
does not matter as the server still think our session is logged in.
2014-02-26 13:23:52 +01:00
Olivier Goffart
e468ea2d68
Avoid re-entrency in HTTPCredidential::fetch
...
It is likely to re-enter if there is two jobs that asks for a password.
Example:
1. log out
2. restart the application
3. enter a wrong password
4. enter a wrong password again a few times
5. enter the correct password
6. it should must not prompt for the password again.
Because of the re-entrency, it was still prompting for the password several
times after the right password had been entered
2014-02-26 13:10:11 +01:00
Daniel Molkentin
05a1f7b1bb
Another fix for the reconnect-logic
2014-02-26 11:26:50 +01:00
Daniel Molkentin
b8a4a2d2f7
Add ChangeLog
2014-02-25 18:11:04 +01:00
Markus Goetz
c7e70533a0
Shibboleth: Detect also QNAM redirects
...
If a QNAM job (e.g. Quota or ETag job) gets redirected,
we'll invalidate and then prompt to re-fetch the credentials
from the user.
(The keychain credentials will be wrong so they get deleted)
2014-02-25 14:22:55 +01:00
Daniel Molkentin
d4fa06c4e1
Fix potential crash in c_iconv on Mac OS X
2014-02-25 12:48:40 +01:00
Markus Goetz
065690c2ce
Shibboleth: Have proper invalidation if timeout during sync
2014-02-25 09:33:28 +01:00
Olivier Goffart
75cff87316
add missing copyright header
2014-02-24 19:32:41 +01:00
Markus Goetz
b56843ead2
Account: Fix Metatype registratition
2014-02-24 15:31:11 +01:00
Markus Goetz
51b5f3c9b2
Propfind Job: Print redirect URL in log
2014-02-24 15:20:49 +01:00
Daniel Molkentin
7f508c0718
Account needs qRegisterMetaType
2014-02-24 14:56:57 +01:00
Daniel Molkentin
45a7d4ff4c
Fix Wizard when returning from later steps
...
We need to reset the credential type when
returning to the first page from later steps.
Otherwise, unfinished credential instances
and their NAM will try to fetch data, which
will fail with weird symptoms.
2014-02-24 14:56:57 +01:00
Daniel Molkentin
995e8938ad
SSLButton: Fix certificate display
2014-02-24 14:56:56 +01:00
Olivier Goffart
1e43d1fa49
Add missing license headers in tests
...
LGPL for csync tests, GPL for mirall tests
2014-02-24 11:08:58 +01:00
Daniel Molkentin
5c1d612761
Account settings: Set correct state icon right away
2014-02-21 21:02:35 +01:00
Olivier Goffart
f92cf3dee3
ammand last commit
...
We should not close the directory twice in the normal case
2014-02-21 19:09:38 +01:00
Olivier Goffart
a71cb1d3ef
Fix potential crash in case of abort while update:
...
We need to reset ctx->remote.read_from_db BEFORE caling vio_closedir
Otherwise, it may interpret the handle as a 'bdtree' handle instead of
a owncloud handle.
Should fix #1442
2014-02-21 16:57:24 +01:00
Olivier Goffart
cd13144415
Fix adding a file in a Shared readonly directory
...
It should not create a conflict in that case.
Also when editing a file, create a conflict using the normal way,
after downloading the file and checking it is not the same
2014-02-21 10:53:09 +01:00
Daniel Molkentin
67c07c4daa
bump to 1.5.2
2014-02-21 09:56:04 +01:00
Daniel Molkentin
8e7290b450
Fix online state handling
...
Before this commit, parts of mirall were aware of the state, but not all.
Also, the state was not set back to Connected again in all cases. This
commit introduces the following changes:
- Make QuotaInfo a member of Account
- QuotaInfo and Folder (EtagJob) can put the client in disconnected mode
- FolderMan now disables etag-polling when offline
Fixes #1459
Fixes #1441
2014-02-20 23:24:03 +01:00
Daniel Molkentin
b51a722347
Fix German translation for branch
2014-02-20 23:23:46 +01:00
Daniel Molkentin
30d0e2fee8
Remove stray debug
2014-02-20 23:23:46 +01:00
Klaas Freitag
04647b0d61
Handle empty passwords returning from the keychain read procedure.
...
This is needed if the keychain does not have the an QSettings based
fallback any more.
2014-02-20 16:53:38 +01:00
Klaas Freitag
e991bcd112
Do not store the password in the config file. Erase it if it is there.
...
This fixes bug #1458
2014-02-20 14:35:02 +01:00
Klaas Freitag
82afb3b613
If a file in a read only share was edited, restore and create conflict.
...
This fixes bug #1448
2014-02-19 17:21:43 +01:00
Daniel Molkentin
726b41b0c7
Shib: Close browser window after login
2014-02-19 15:34:43 +01:00
Olivier Goffart
e74f0f2854
Better support when user remove or rename the Shared directory
2014-02-19 15:23:36 +01:00
Olivier Goffart
a51f050a08
More fix for moving shared directories
...
Abort a directory job if the first job fails
Also make sure the jobs are in the directory job of their destination paths
2014-02-19 13:08:35 +01:00
Klaas Freitag
e4965ab06b
Mac FS watcher: ignore events from the same process
2014-02-18 16:28:25 +01:00
hefee
1b03dc759b
fixing typo
...
GNU Public License-> GNU General Public License
2014-02-17 22:42:51 +01:00
Daniel Molkentin
d56c913fe4
v1.5.1 ChangeLog
2014-02-13 18:02:52 +01:00
Daniel Molkentin
3234e48cd0
final version
2014-02-13 17:37:49 +01:00
Klaas Freitag
e134ae22ac
Disable explorer.exe integration on WinXP
2014-02-13 17:21:30 +01:00
Klaas Freitag
86e90451fa
Removed not expected whitespace.
2014-02-13 17:21:30 +01:00
Daniel Molkentin
e66757335b
Theme: Update general disclaimer.
2014-02-13 17:04:52 +01:00
Daniel Molkentin
393ac82c6a
Update documentation for 1.5.1
2014-02-13 17:04:51 +01:00
Markus Goetz
372f8b3426
OS X: Document how to disable the auto updater
2014-02-13 14:11:04 +01:00
Markus Goetz
8b9cd432b5
OS X: Read system-wide plist in /Library
...
Needed for http://doc.owncloud.org/desktop/1.5/autoupdate.html#preventing-auto-updates
2014-02-13 12:52:57 +01:00
Daniel Molkentin
1eb6e163de
Add documentation on auto update feature
2014-02-12 21:08:28 +01:00
Daniel Molkentin
1875a93a48
RC2
2014-02-12 18:17:57 +01:00
Daniel Molkentin
fd40a25030
Use the appName (which is the short name) instead of the full length name
...
The full length name is allowed to change (or should be)
2014-02-12 18:06:01 +01:00
Daniel Molkentin
05ae467cd5
Remove debug
2014-02-12 18:05:28 +01:00
Daniel Molkentin
4db7b5f2a7
NSIS: accept /noautoupdate
2014-02-12 17:57:50 +01:00
Daniel Molkentin
958253bb2b
Respect skipUpdate policy from global config files and windows policy.
2014-02-12 17:55:05 +01:00
Daniel Molkentin
bcf73cfc40
SSLButton: Omit arrow on Windows which can't display it
2014-02-12 17:55:05 +01:00
Daniel Molkentin
f79ecfe001
more verbose ssl error logging
2014-02-12 17:54:45 +01:00
Olivier Goffart
a677f97b7f
Fix removing and renaming directories from the Shared directory
2014-02-12 13:44:55 +01:00
Olivier Goffart
1a9a14bdec
Fix problems if a file is moved, and another file is created with the same name
2014-02-12 13:44:32 +01:00
Markus Goetz
153aa31da2
OS X: Workaround Qt5 QNAM bug
...
This made the sign out/sign in handling not work.
(cherry picked from commit 104cf680a6 )
2014-02-12 11:14:43 +01:00
Thomas Müller
0322a44be5
Adding quotes - necessary for themes containing spaces in APPLICATION_NAME
2014-02-11 11:24:10 +01:00
Daniel Molkentin
5a6a8b504c
Mac OS: Build fix
2014-02-06 22:32:17 +01:00
Daniel Molkentin
97345447ab
Updater: Unify Sparkle&non-Sparkle URLs
...
...now that we have the support on the server-side.
2014-02-06 18:56:33 +01:00
Olivier Goffart
bb378902ae
Also force an update of the etag in case of renames
...
Imagine we have a file:
foo/bar/moo
if we do mv 'foo' 'foo2' and that we issue a MOVE on the server
and will update the entry 'foo' in the database with the new etag
If we write the etag of foo but not the etag of the sub item, when
we read from db on the next sync, we will miss them and beleive they
have been removed on the server
2014-02-06 17:56:27 +01:00
Olivier Goffart
8f1494f8f2
Report an error if fetching the etag fails
...
Very important in case of renames, else, if the server did not perform
the rename, we may end up deleting the files
2014-02-06 17:56:27 +01:00
Daniel Molkentin
4ae66b8b20
ShibbolethCredetials: Try to avoid re-auth
...
...by storing the shib cookie in key chain
2014-02-06 13:02:01 +01:00
Daniel Molkentin
ccb45bfea6
Move code from HTTPCredentials to more generic locations
...
This is a preparation to make them usable from the Shibboleth
credentials class.
2014-02-06 13:02:01 +01:00
Daniel Molkentin
bee5940c42
Credentials: Remove unused fetchFromUser methods
2014-02-06 13:02:01 +01:00
Olivier Goffart
ee3df45fd8
remove csync_lock
...
It is not used anymore for a long time
2014-02-05 17:31:34 +01:00
Olivier Goffart
49562ca3b6
Remove unused members
2014-02-05 16:40:56 +01:00
Daniel Molkentin
33ab854922
SslErrorDialog: Ensure to run into a timeout while showing the dialog
2014-02-05 14:18:31 +01:00
Thomas Müller
fdf73fe539
- Replace undeclared variables:
...
- PageReinstall_OLD_MUI_HEADER_TEXT_SUBTITLE
- PageReinstall_OLD_Field_2
- PageReinstall_OLD_Field_3
- REVISION
- README.md updated - calling bin/l10n.sh was missing
This commit includes updated translations from transifex.
2014-02-05 12:01:36 +01:00
Jenkins for ownCloud
3480cb4432
[tx-robot] updated from transifex
2014-02-05 02:07:17 -05:00
Mr. Jenkins
25ee44dd69
[tx-robot] updated from transifex
2014-02-05 01:57:23 -05:00
Markus Goetz
1471e15674
Sparkle: Add more delegate methods
2014-02-04 18:43:49 +01:00
Markus Goetz
034c3ae017
Sparkle: Sample RSS
...
The real thing will be stored on owncloud.com somewhere.
2014-02-04 17:37:01 +01:00
Markus Goetz
e001e70816
Sparkle: Get it working
2014-02-04 17:37:01 +01:00
Olivier Goffart
4ade023b96
Find another way to ignore the csync journal from the file watcher
2014-02-04 16:46:14 +01:00
Klaas Freitag
8711cf07af
Set mirall version to 1.5.1rc1
2014-02-04 16:23:44 +01:00
Klaas Freitag
8e7e2dded8
Bump csync version.
2014-02-04 16:23:44 +01:00
Olivier Goffart
ec266054be
Don't use QFileInfo to get the last modified time.
...
We can use the _modtime, since normaly we just set the the modtime
of the file to this time.
The problem is that Qt does follow symlinks (FILE_FLAG_OPEN_REPARSE_POINT)
And therefore was causing problem with symbolic links.
Fixes #1307
2014-02-04 16:17:58 +01:00
Olivier Goffart
324214d072
fix the 'Sign In' menu entry
2014-02-04 15:06:17 +01:00
Klaas Freitag
ae5c9a29f6
Detect renames and removes in read only Shared directory, restore files.
...
This fixes bug #1386
2014-02-04 15:03:06 +01:00
Klaas Freitag
72a6b00919
Add some usage hints.
2014-02-04 15:03:06 +01:00
Olivier Goffart
e06cfe06fe
FolderWatcher: ignore the csync journal
2014-02-04 14:57:25 +01:00
Daniel Molkentin
086694f284
Fix Qt5: Tests require Xml Module
2014-02-04 13:12:13 +01:00
Olivier Goffart
d2a41342e1
Better error message when the write permission are missing in the local directory
...
Fixes #1394
2014-02-04 11:10:22 +01:00
Markus Goetz
6f960d406e
Qt5: Use same path for config as Qt4
2014-02-04 10:02:28 +01:00
Daniel Molkentin
c19978bdc4
Fix Qt5 jenkins build failure
2014-02-04 08:50:45 +01:00
Daniel Molkentin
924e7d4e39
Mac OS: Make icns generation work when building with Qt 5
2014-02-04 08:50:45 +01:00
Markus Goetz
0c0b3f8580
Update building.rst
2014-02-04 08:40:28 +01:00
Mr. Jenkins
fa7a1b606c
[tx-robot] updated from transifex
2014-02-04 01:25:54 -05:00
Markus Goetz
325360c011
REAMDE: Use 1.5 doc, not 1.2
2014-02-03 20:18:04 +01:00
Markus Goetz
aab621523b
Update building.rst
2014-02-03 20:12:36 +01:00
Markus Goetz
fdc8050e3d
Folder Wizard: Re-evaluate after local folder changed
2014-02-03 18:19:25 +01:00
Markus Goetz
62f5b0ebac
Folder Wizard: Make it more clear that we mean a remote folder
2014-02-03 17:27:54 +01:00
Markus Goetz
11c368f0bc
Sparkle: Fix compilation if not found
2014-02-03 16:31:24 +01:00
Daniel Molkentin
19e7c4f66f
NSISUpdater: Fix logic to invoke updater on non-explicit start
2014-02-03 13:46:20 +01:00
Jenkins for ownCloud
cf7b77e2bf
[tx-robot] updated from transifex
2014-02-03 02:20:25 -05:00
Mr. Jenkins
7fc3c9a7db
[tx-robot] updated from transifex
2014-02-03 01:26:59 -05:00
Daniel Molkentin
44e09892f4
Remove cmake warning
2014-02-02 22:59:08 +01:00
Klaas Freitag
971caca5e8
Implement change of the network throttling during a running sync run.
2014-02-02 12:51:19 +01:00
Klaas Freitag
08d08e1f29
SAFE_FREE added as result to valgrind check.
2014-02-02 12:51:19 +01:00
Jenkins for ownCloud
35f5c1f3a7
[tx-robot] updated from transifex
2014-02-02 02:07:45 -05:00
Mr. Jenkins
7b858d0d45
[tx-robot] updated from transifex
2014-02-02 01:27:00 -05:00
Daniel Molkentin
c2f3cfa4b5
Amendment to last commit
2014-01-31 14:53:20 +01:00
Daniel Molkentin
52971c27cf
Updater: More refinements
2014-01-31 14:49:10 +01:00
Daniel Molkentin
b3683976ca
Updater: Fix corner cases related to failed auto-updates
...
- Don't re-download updates whom's auto-install has clearly failed before
- Don't signal newly available auto-upgrade if it has failed once
- Remove downloaded update after (un)successful auto-update
- Remove as many temporary keys after an (un)successful auto-update
2014-01-31 12:42:00 +01:00
Daniel Molkentin
4c6e0b5c07
SSL Button fixes
...
- Use OU as display name if CN is empty (often true for CA/interm. certs)
- Handle trust anchors in intermediate chain gracefully
2014-01-31 10:35:35 +01:00
Daniel Molkentin
4e0cf7c822
Fix win32 build
2014-01-31 09:35:43 +01:00
Daniel Molkentin
93db6ca6ab
Properly install cmake in OS X app bundle
2014-01-30 22:09:37 +01:00
Daniel Molkentin
528d434c1f
Amendment to last commit
2014-01-30 13:07:32 +01:00
Daniel Molkentin
cfdc6395d8
Find sparkle the first time around
2014-01-30 12:57:33 +01:00
Daniel Molkentin
2f81999d6c
Fix OS X build
2014-01-30 12:16:09 +01:00
Klaas Freitag
225123951d
Make compile under MacOSX
2014-01-30 11:17:14 +01:00
Daniel Molkentin
dfa1dfaa7d
AutoRaise SSLButton
2014-01-30 09:53:00 +01:00
Daniel Molkentin
74db151427
SSLButton: remove superflous extra argument
2014-01-30 09:53:00 +01:00
Jenkins for ownCloud
e38e1be3a7
[tx-robot] updated from transifex
2014-01-30 02:07:17 -05:00
Mr. Jenkins
7ada84f201
[tx-robot] updated from transifex
2014-01-30 01:26:33 -05:00
Daniel Molkentin
cb8131c382
Remove cmake message
2014-01-29 12:16:21 +01:00
Daniel Molkentin
ff569603f5
Updater: More tests
2014-01-29 12:01:35 +01:00
Olivier Goffart
6540f54512
Don't use QDateTime::toTime_t or QDateTime::fromTime_t
...
They only take an uint, and time_t is 64bit.
This breaks when date are before 1970
Fixes #1380
2014-01-29 11:47:13 +01:00
Daniel Molkentin
1aa050bea9
Add Tests, make Updater classes into a static lib
2014-01-29 10:43:21 +01:00
Daniel Molkentin
ca5f96e1bb
Updater: More refactoring towards testability
2014-01-29 10:43:21 +01:00
Jenkins for ownCloud
53554075fa
[tx-robot] updated from transifex
2014-01-29 02:07:21 -05:00
Mr. Jenkins
182d1ac4b0
[tx-robot] updated from transifex
2014-01-29 01:26:41 -05:00
Daniel Molkentin
d361bda922
Fix wording
2014-01-28 16:23:39 +01:00
Daniel Molkentin
62f4e813ee
Settings: Allow opening links in updater label
2014-01-28 16:23:24 +01:00
Daniel Molkentin
505e0e9632
Fix build on Win32
...
regression introduced by ec9efd78
2014-01-28 15:49:19 +01:00
Daniel Molkentin
fa960b522d
Make Updater URL overridable
2014-01-28 15:44:40 +01:00
Olivier Goffart
50aa31d192
winEventFilter does not exist on Qt5
2014-01-28 15:30:58 +01:00
Daniel Molkentin
c8006f1163
Compile fix
2014-01-28 13:42:09 +01:00
Daniel Molkentin
637565cca1
Updater: Don't overwrite unannouned (newer) versions
2014-01-28 13:36:16 +01:00
Daniel Molkentin
a22884d164
Show message if the updater times out
2014-01-28 13:36:16 +01:00
Daniel Molkentin
58fd57fdcd
Make update URL a compile time option
2014-01-28 13:36:16 +01:00
Daniel Molkentin
2bee51c101
Updater: Logic fix
2014-01-28 13:36:16 +01:00
Olivier Goffart
2ed5dd178a
Fix fetching the user name in the wizzard
2014-01-28 13:18:21 +01:00
Olivier Goffart
803cb5d015
fix signal slot connection
2014-01-28 12:45:41 +01:00
Olivier Goffart
e31000d759
Handle the fact that the user might cancel the password dialog
...
Add a new state of the account in which the credidentials are invalid,
but we are still trying to get the user enter his password.
Make sure that fetched() is ALWAYS emitted after we call fetch on the
credidentials, so we can know that the user pressed cancel. In that
case, go in the SignedOut state.
Fixes #1353
2014-01-28 11:49:09 +01:00
Daniel Molkentin
f408593d27
more build fixes
2014-01-28 11:01:05 +01:00
Daniel Molkentin
6d21058ca1
build fixes
2014-01-28 10:34:56 +01:00
Daniel Molkentin
1da94e5e2b
Updater: More refactoring
...
- Renamed GenericUpdater -> OCUpdater
- Make more API Private
- Split up in classes to reduce complexity:
- PassiveUpdateNotifier subclass for Linux
- NSISUpdater for Windows
2014-01-28 10:01:23 +01:00
Jenkins for ownCloud
618833140c
[tx-robot] updated from transifex
2014-01-28 02:28:26 -05:00
Mr. Jenkins
ef574c2134
[tx-robot] updated from transifex
2014-01-28 02:20:47 -05:00
Olivier Goffart
397763ba61
Fix HttpCredentials::invalidateToken to invalidate the password in the config file
2014-01-27 16:57:10 +01:00
Daniel Molkentin
72ae44b8b1
Updater: relaunch Client after update
2014-01-27 13:04:27 +01:00
Daniel Molkentin
a700605c41
NSIS: Make string changes from 77610eb184 persistent
2014-01-27 13:04:27 +01:00
Daniel Molkentin
e2a77f8e73
NSIS: persist e774bbacde
2014-01-27 13:04:27 +01:00
Olivier Goffart
e6be6fc695
Remove dead code
2014-01-27 12:44:46 +01:00
Olivier Goffart
18966bf061
Add missing include
2014-01-27 12:36:52 +01:00
Olivier Goffart
bf95509dbe
Do not include "private" header from "public" header
2014-01-27 12:31:54 +01:00
Olivier Goffart
50b9a7b191
remove unused include from header file
2014-01-27 11:58:50 +01:00
Daniel Molkentin
9b09a2ee32
Merge pull request #1375 from owncloud/l10n-installer-readme
...
L10n installer readme
2014-01-27 02:03:47 -08:00
Thomas Müller
e2c64e4513
Update README.md
2014-01-27 10:59:39 +01:00
Thomas Müller
8f26706466
Readme added on how to work with translations in windows installer.
2014-01-27 10:57:33 +01:00
Jenkins for ownCloud
c327ffe8d8
[tx-robot] updated from transifex
2014-01-27 03:16:58 -05:00
Mr. Jenkins
a90512c825
[tx-robot] updated from transifex
2014-01-27 02:20:52 -05:00
Olivier Goffart
94190b73ff
fix test compilation
2014-01-26 19:05:43 +01:00
Olivier Goffart
2eb9962f4c
Adapt the test to the changes in the exclude list
...
The exclude list was removed from csync in commit
f32d901653
Adapt the test.
2014-01-26 18:58:56 +01:00
Olivier Goffart
5119d5d366
Remove csync_config
...
commit c585c73044 removed the use of it.
So remove this code completely as it is no longer used
2014-01-26 18:39:47 +01:00
Mr. Jenkins
da93038a78
[tx-robot] updated from transifex
2014-01-26 02:14:59 -05:00
Mr. Jenkins
ea5a0ab1bc
[tx-robot] updated from transifex
2014-01-25 01:27:09 -05:00
Olivier Goffart
08c03d19b9
Only one quote should be enough
...
Should fix #1295
2014-01-24 20:28:17 +01:00
Daniel Molkentin
7762e80c60
Bump to 1.5.1
2014-01-24 14:24:54 +01:00
Klaas Freitag
f2fc866cc4
Set the library and bin install path to cmake standard path.
2014-01-24 13:43:05 +01:00
Klaas Freitag
f32d901653
Remove ocsyncs config which is unused in the owncloud client.
2014-01-24 13:43:05 +01:00
Klaas Freitag
c585c73044
Do not load the config file and csync exclude list.
2014-01-24 13:43:05 +01:00
Klaas Freitag
0b680ef90e
Removed the csync documentation as it is not longer used here.
2014-01-24 13:43:05 +01:00
Daniel Molkentin
03b449e081
CPack: revert part of previous commit
2014-01-24 12:27:08 +01:00
Daniel Molkentin
8fd881a176
Remove obsolete CPack Options
2014-01-24 12:03:31 +01:00
Daniel Molkentin
42f5aa072d
Link against Sparkle if available
2014-01-24 11:58:11 +01:00
Daniel Molkentin
86eb68df7f
csync_rename.cc: Remove superflous semicolon
2014-01-24 10:50:33 +01:00
Mr. Jenkins
b8d13e985f
[tx-robot] updated from transifex
2014-01-24 01:27:07 -05:00
Daniel Molkentin
815efb69d7
NSIS: implement /launch for updater
2014-01-23 17:17:13 +01:00
Daniel Molkentin
1d32fb74f9
NSIS: Don't try to log
2014-01-23 16:15:46 +01:00
Klaas Freitag
9c300b83bd
Add FindINotify cmake module.
2014-01-23 16:15:29 +01:00
Klaas Freitag
688d394576
Check for INotify if compiling for Linuxe and friends
2014-01-23 16:05:35 +01:00
Klaas Freitag
04d8c82dbd
Make NEON_WITH_LFS conditional to avoid build warnings.
2014-01-23 16:05:35 +01:00
Daniel Molkentin
f98db9ac9d
NSIS: find DLL from csync copy within cmake
2014-01-23 15:55:55 +01:00
Klaas Freitag
d868df3b9b
Fix windows compilation after having merged in csync.
2014-01-23 15:19:27 +01:00
Klaas Freitag
3d6718315c
Fix Include dirs and add tests.
2014-01-23 13:23:27 +01:00
Klaas Freitag
5841cf4020
Add and remove watches for folders independent from sync dir.
...
Before it was just in case of download.
2014-01-23 13:23:27 +01:00
Klaas Freitag
e9e132c06c
Make use of the new linux folder watcher.
2014-01-23 13:23:27 +01:00
Klaas Freitag
e3723fcfc2
Add a new folder watcher implementation for Linux.
2014-01-23 13:23:27 +01:00
Jenkins for ownCloud
a664dc5f1d
[tx-robot] updated from transifex
2014-01-23 02:07:01 -05:00
Mr. Jenkins
cdc24eb437
[tx-robot] updated from transifex
2014-01-23 01:26:22 -05:00
Daniel Molkentin
484ad28cd6
Merge pull request #1357 from owncloud/nsis_fixes
...
NSIS preparations for upgrade mode
2014-01-22 07:20:53 -08:00
Daniel Molkentin
8485a7fd30
Fix typo
2014-01-22 16:09:22 +01:00
Mr. Jenkins
93a28e7a95
[tx-robot] updated from transifex
2014-01-22 01:26:24 -05:00
Daniel Molkentin
83e628b9f7
Revert "fix test"
...
This reverts commit f35e2efd4e .
2014-01-22 00:00:34 +01:00
Daniel Molkentin
129aef5beb
Revert "Formatting hashes with : seems to be out of fashion"
...
This reverts commit c52e3a0732 .
2014-01-22 00:00:34 +01:00
Daniel Molkentin
f35e2efd4e
fix test
2014-01-21 16:34:52 +01:00
Daniel Molkentin
54c0c4057b
Improve SSL detail display
2014-01-21 15:54:06 +01:00
Daniel Molkentin
c52e3a0732
Formatting hashes with : seems to be out of fashion
2014-01-21 15:25:51 +01:00
Klaas Freitag
699f6a62f8
Do not set sync-state to Prepare in setSyncEnabled().
...
This method is also called if the sync was disabled due to
network problems and such, ie. from the ETag change check.
In that case, we do not want to go to the Prepare state as
we not neccessarily want to have the folder synced now.
This fixes the problem that the folders were resynced way
to often which we had in master for a couple of days now.
2014-01-21 15:25:05 +01:00
Olivier Goffart
61f3b839ab
Fix compilation in Qt5
...
Some Qt SSL function used to return QString now return a QStringList.
By having QStringList(...).join(':') the code will compile both
if the ... is a QString or a QStringList. So the code will still
compile in Qt4.
2014-01-21 15:09:12 +01:00
Olivier Goffart
29590fa00b
Revert "Commented opening of files from the activity view as it does not work."
...
This reverts commit c50b0a995b .
This was only broken on windows and probabyl fixed by commit 23f52bcd
2014-01-21 13:01:05 +01:00
Olivier Goffart
0c33fc6e8a
Do not block while launching the explorer on linux
...
Fixes #1338
2014-01-21 13:01:05 +01:00
Daniel Molkentin
c4c36d641b
Remove garbage include
2014-01-21 12:34:51 +01:00
Klaas Freitag
a1d6cf7d4d
Fix typo in documentation
2014-01-21 12:20:23 +01:00
Klaas Freitag
4d8e65cfd0
Hide useless logging that indicates an error.
2014-01-21 12:10:49 +01:00
Daniel Molkentin
8303c8f909
Mac OS Bundle file: bump copyright year
2014-01-21 11:23:46 +01:00
Daniel Molkentin
2370060ac5
Implement Certificate Information Widget
...
Currently used in status window. Before, there was no way to know
about the current certificate situation.
Fixes #44
2014-01-21 09:21:33 +01:00
Mr. Jenkins
77e09e786e
[tx-robot] updated from transifex
2014-01-21 01:26:23 -05:00
Daniel Molkentin
d4bb0e44cd
Wizard: Gracefully fall back to HTTP if HTTPS connection fails
...
If the connection fails, the user is now being asked if he does
agree to a new attempt via an unencrypted connection. If he complies,
the connection will be reattempted using plain HTTP.
Fixes #1356
2014-01-20 19:46:09 +01:00
Daniel Molkentin
9b9b62d4e3
Wizard: Prepend 'https://' if no scheme is set
...
First part of fix for #1356
2014-01-20 17:53:46 +01:00
Daniel Molkentin
2780dae569
Setup Wizard: Fix http(s) label size
2014-01-20 17:41:57 +01:00
Daniel Molkentin
562513d5a5
Propagator: Don't pass arbitrary strings as formating string
...
Not a security issue since this code was never in any release.
2014-01-20 17:22:29 +01:00
Daniel Molkentin
a2e9353296
Fix copy & paste problem in Ignore List Editor
...
Fixes #1355
2014-01-20 17:08:30 +01:00
Olivier Goffart
7f76fcff5e
Do not account the size of deleted or renamed file in the progress
...
Fixes #1360
2014-01-20 17:00:28 +01:00
Olivier Goffart
0afbb264e0
cleanup mutex usage in CSyncThread
...
The only method which is used from another thread is abort().
So the only thing that needs protection is that function, and the
function which may race with. Which are csync_request_abort which
should not race with csync_resume
2014-01-20 17:00:28 +01:00
Klaas Freitag
05b81bc7d8
rename csync/doc to csync/csync_doc to satisfy cmake.
...
CMake throws a warning if there are two subdirs with the same name.
2014-01-20 16:19:30 +01:00
Klaas Freitag
7bb7b1d73b
Remove wipeAllJournals after rebase mistake.
2014-01-20 16:19:30 +01:00
Klaas Freitag
0eebc0e5be
Add folder to schedule queue in setupFolders method.
...
This fixes bug #1352
2014-01-20 16:19:30 +01:00
Klaas Freitag
a6b0ccfa12
Remove explicit logging.
2014-01-20 16:19:30 +01:00
Klaas Freitag
ce077f97c6
Checks if the folder from map is still defined.
...
I saw a crash were a folder which was deleted was dereferenced later
in the Quota check slot. There the folder pointer returned from folder
map was zero.
2014-01-20 16:19:29 +01:00
Klaas Freitag
c705a6360d
Rather removeFolder than addFolder to watcher (typo fix).
2014-01-20 16:19:29 +01:00
Olivier Goffart
19a19978b7
fix csync BINARYDIR and SOURCEDIR
2014-01-20 16:16:29 +01:00
Olivier Goffart
e7e319e3f5
Fix compilation of the owncloudpropagator test
...
This test does nothing, remove problematic line"
2014-01-20 15:44:43 +01:00
Olivier Goffart
be874e36da
remove unused variable and functions
2014-01-20 15:10:53 +01:00
Olivier Goffart
3a9c485515
Fix crashwhile removing a folder
...
in a QMap, Accessing an entry that does not exists create the null entry
We should not use operator[] if we are not sure the folder indeed exists
2014-01-20 14:59:35 +01:00
Olivier Goffart
4df1d7d893
Remove unused variables
2014-01-20 14:59:23 +01:00
Olivier Goffart
bbf3a64c02
Fix crash.
...
toUtf8() returns a temporary QByteArray wuich is only valid until the
end of the statement (the next ';'). QByteArray::data() returns a
pointer to the QByteArray's data which is only valid if the QByteArray
is valid.
Keeping the char* is therefore wrong.
2014-01-20 14:24:20 +01:00
Olivier Goffart
b93efbaefe
EIO is not necessarily a proxy error.
...
Should change error message such as
"CSync failed to connect through a proxy. 500 Internal Server Error"
To:
"CSync processing step update failed. 500 Internal Server Error"
2014-01-20 13:58:54 +01:00
Olivier Goffart
316aade340
Merge branch 'csync_merge'
...
Conflicts:
src/CMakeLists.txt
2014-01-20 13:27:33 +01:00
Mr. Jenkins
309908687f
[tx-robot] updated from transifex
2014-01-19 01:26:16 -05:00
Jenkins for ownCloud
3f1199fcf3
[tx-robot] updated from transifex
2014-01-18 02:07:00 -05:00
Mr. Jenkins
6f488e1988
[tx-robot] updated from transifex
2014-01-18 01:26:14 -05:00
Daniel Molkentin
28c4cd9caa
NSIS: Cleanup: Use MEMENTO defines where possible
2014-01-18 00:06:58 +01:00
Daniel Molkentin
2a0f28208c
NSIS: Don't install link to Desktop of a link by the same name already exists
...
Unfortunately, we cannot determine the target path for the .lnk file
without pulling in closed source plugins (or write our own), a length
I am not willing to go in the light of MSI.
Fixes #356
2014-01-18 00:01:44 +01:00
Daniel Molkentin
77610eb184
NSIS: Only remove sections that we actually installed
...
We can query the NSIS Memento extension for that.
2014-01-17 23:51:52 +01:00
Daniel Molkentin
4c7ddb769a
NSIS: INSTALL_PATH has never been used
...
Remove it to avoid confusion
2014-01-17 12:11:19 +01:00
Daniel Molkentin
91345d9e25
NSIS: Fix transations in uninstaller
...
Before, we could not show custom strings at all
2014-01-17 12:11:19 +01:00
Jenkins for ownCloud
45ed37025a
[tx-robot] updated from transifex
2014-01-17 02:07:01 -05:00
Mr. Jenkins
cfa2c3acdf
[tx-robot] updated from transifex
2014-01-17 01:26:23 -05:00
Klaas Freitag
45c75f722c
Show an indicator if the url is encrypted or not in connection wizard.
...
Fixes bug #1350
2014-01-16 17:40:46 +01:00
Olivier Goffart
6257ed6605
Make sure that the jobs have the Q_OBJECT macro.
...
so tr() works there
2014-01-16 14:06:17 +01:00
Klaas Freitag
0455d96462
Fix untranslated error messages.
2014-01-16 13:04:57 +01:00
Klaas Freitag
d2e8043a4a
Use ClientProxy that reads the client config in commandline client.
...
Fixes mirall#1347
2014-01-16 12:52:11 +01:00
Klaas Freitag
98689d48f1
Check if configuration actually exists.
...
If not, set System Proxy as default.
2014-01-16 12:52:11 +01:00
Klaas Freitag
ec9efd7894
Make use of the new Proxy handling class.
2014-01-16 12:52:11 +01:00
Klaas Freitag
671100ce5c
Add a class ClientProxy that handles proxy setting for Qt and csync.
2014-01-16 12:52:11 +01:00
Jenkins for ownCloud
843ea13553
[tx-robot] updated from transifex
2014-01-16 02:08:15 -05:00
Mr. Jenkins
8c37e7742a
[tx-robot] updated from transifex
2014-01-16 01:27:36 -05:00
Daniel Molkentin
96633307c0
Move owncloudcmd into Bundle on OS X
...
Fixes #1300
2014-01-15 18:14:37 +01:00
Daniel Molkentin
2009fbc886
Deploy all of Sparkle manually
2014-01-15 17:52:19 +01:00
Daniel Molkentin
4caa038de6
More sparkle fixes
2014-01-15 16:01:35 +01:00
Daniel Molkentin
f5dc2b3127
Compile on OS X
2014-01-15 12:45:43 +01:00
Olivier Goffart
c7227297af
Make it compile with the merge of csync mirall
2014-01-15 12:20:03 +01:00
Daniel Molkentin
a9d2079bc4
Use only global variables in translation
2014-01-15 11:50:54 +01:00
Jenkins for ownCloud
954ebcca2e
[tx-robot] updated from transifex
2014-01-15 05:25:51 -05:00
Daniel Molkentin
dc9f145a24
New Updater for Windows, passive notification on Linux, Sparkle on Mac
2014-01-15 11:09:31 +01:00
Mr. Jenkins
93239cbdca
[tx-robot] updated from transifex
2014-01-15 01:58:37 -05:00
Klaas Freitag
55da857e59
A bit of refactoring, add useful names and set the alias properly.
...
The alias field is now set from the last component of the picked
local dir. Also some tooltips were added.
2014-01-14 17:40:42 +01:00
Klaas Freitag
aba1252e60
Remove inotify from cmake files.
2014-01-14 15:06:06 +01:00
Mr. Jenkins
890c0eb885
[tx-robot] updated from transifex
2014-01-14 01:56:32 -05:00
Klaas Freitag
561f32cede
License header cleanups.
2014-01-13 16:16:19 +01:00
Klaas Freitag
e0d8d93b50
Removed obsolete inotify class of folderwatcher.
2014-01-13 16:07:52 +01:00
Klaas Freitag
3d8505d7f4
Adopt mac folderwatcher to the new folderwatcher.
2014-01-13 16:00:41 +01:00
Klaas Freitag
18171862ac
Unify folderwatcher private constructor.
2014-01-13 15:29:05 +01:00
Klaas Freitag
0e5858b1aa
Add a pathIsIgnored method to the folderwatcher.
2014-01-13 15:29:05 +01:00
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
Jenkins for ownCloud
22bcda65ce
[tx-robot] updated from transifex
2013-12-21 02:07:31 -05:00
Mr. Jenkins
b896f6a434
[tx-robot] updated from transifex
2013-12-21 01:26:54 -05:00
Sven Strickroth
8743be6f11
Close dialog if button was clicked not just pressed
...
Signed-off-by: Sven Strickroth <email@cs-ware.de >
2013-12-21 03:36:43 +01:00
Klaas Freitag
38cc564aed
Show proper sync status in tray, incl. Pause status.
2013-12-20 15:16:52 +01:00
dragotin
8b9a8ebeaf
Merge pull request #1308 from owncloud/fix-installer-fallbacl-en-1.5
...
fixes #1305 - thanks very much @deepdiver1975
2013-12-20 03:11:22 -08:00
Thomas Müller
900397c05e
fixes #1305
...
Installer will fallback to English in case there are no translations available for the current system language
2013-12-20 10:02:30 +01:00
Mr. Jenkins
cd9e3d27c3
[tx-robot] updated from transifex
2013-12-20 01:26:39 -05:00
Klaas Freitag
72b479c1e0
Added proxy support to owncloudcmd.
2013-12-19 16:48:10 +01:00
Klaas Freitag
d17be6f1ff
Do the neon ssl initialization.
...
This fixes bug #1298 and also probably #1297 . More tests needed.
2013-12-19 13:33:31 +01:00
Jenkins for ownCloud
1df295cb32
[tx-robot] updated from transifex
2013-12-19 02:07:19 -05:00
Mr. Jenkins
d3dba72ef9
[tx-robot] updated from transifex
2013-12-19 01:26:30 -05:00
Mr. Jenkins
042044f7c6
[tx-robot] updated from transifex
2013-12-17 16:41:13 -05:00
Daniel Molkentin
a7eddb2985
Merge pull request #1296 from owncloud/add-turkish
...
Adding Turkish translations
2013-12-17 06:34:11 -08:00
Klaas Freitag
c50b0a995b
Commented opening of files from the activity view as it does not work.
...
See https://github.com/owncloud/mirall/issues/1295
2013-12-17 14:16:25 +01:00
Jenkins for ownCloud
45710b7e6f
[tx-robot] updated from transifex
2013-12-17 07:39:56 -05:00
Klaas Freitag
66c0a3b448
Read password from old settings if exist.
2013-12-17 12:56:01 +01:00
Mr. Jenkins
e7651c0a90
[tx-robot] updated from transifex
2013-12-17 05:47:55 -05:00
Klaas Freitag
23f52bcd56
Fix open the explorer code.
2013-12-17 10:16:25 +01:00
Thomas Müller
0fc8a8de18
Adding Turkish translations
...
fixes #1271
2013-12-16 11:13:38 +01:00
Klaas Freitag
68c70ab5b6
Handle return value of asprintf to satisfy picky compiler.
2013-12-16 09:49:44 +01:00
Olivier Goffart
291811e321
Merge pull request #1292 from Pro/master
...
Corrected typo and fixed parent folder detection
2013-12-16 00:35:39 -08:00
Stefan Profanter
a93b9ee33a
Fixed parent folder detection if sibling directory starts with same name
...
Since `cleanPath` removes all the trailing slashes (84bfbd4cb0 :src/corelib/io/qdir.cpp#L2118) the check at line 138 wrongly assumed that
`D:\Test` is a parent folder of `D:\TestFoo`.
2013-12-15 16:22:53 +01:00
Stefan Profanter
b1ba05dda8
Update mirall_de.ts
...
Typo
2013-12-15 15:51:38 +01:00
Jenkins for ownCloud
c311083d7b
[tx-robot] updated from transifex
2013-12-13 15:39:01 -05:00
Daniel Molkentin
bef180a7bc
Remove UTF-8 BOM, confuses old GCCs
2013-12-13 20:27:08 +01:00
Mr. Jenkins
b892a18eef
[tx-robot] updated from transifex
2013-12-13 13:42:47 -05:00
Daniel Molkentin
58035a2f4a
Final version
2013-12-12 18:20:45 +01:00
Daniel Molkentin
99a4de6741
Add ChangeLog
2013-12-12 18:01:03 +01:00
Klaas Freitag
612b099b77
Added changelog, bumped version to 0.91.4
2013-12-12 17:43:10 +01:00
Daniel Molkentin
9010e1015e
Better fix for override urls
2013-12-12 17:17:07 +01:00
Klaas Freitag
9bf15178f9
Fix button states in account widget
2013-12-12 16:38:45 +01:00
Daniel Molkentin
5b2c734fe5
Respect the override URL properly
2013-12-12 16:20:01 +01:00
Klaas Freitag
bc5f7d899a
Save and restore activity view state.
...
Fixes bug #1256
2013-12-12 15:16:43 +01:00
Klaas Freitag
ec77ecfd0f
Show error reason for blacklisted files in sync activity.
2013-12-12 12:21:24 +01:00
Klaas Freitag
09745c7f75
Fix: Allow to retry sync also for fatal err conditions.
...
Otherwise there would not have been a chance to resync for example data
that was Forbidden because of a read only share.
Also removed some commented code.
2013-12-12 11:39:05 +01:00
Daniel Molkentin
9ffb33293c
QuotaInfo: Keep polling quota if a previous request fails
2013-12-12 10:53:51 +01:00
Daniel Molkentin
93d75932ac
NSIS: fix c&p error.
2013-12-12 10:46:37 +01:00
Daniel Molkentin
8491d95ca4
NSIS: English must be enumerated, too
...
Fixes empty strings in installer.
2013-12-12 10:46:13 +01:00
Daniel Molkentin
e774bbacde
NSIS: Can only use global variables in translation strings
...
fixes #1273
2013-12-12 10:44:05 +01:00
Klaas Freitag
131945b14b
Doc fixes about ignore files.
2013-12-11 22:08:24 +01:00
Klaas Freitag
93d250c49b
Add NE_LFS define to config.h.in
2013-12-11 20:52:17 +01:00
Olivier Goffart
f5c46d481c
Tru to get NE_LFS properly
...
The csync and mirall build system are slightly different so this might help
2013-12-11 20:44:46 +01:00
Jenkins for ownCloud
81773e53b1
[tx-robot] updated from transifex
2013-12-11 13:40:28 -05:00
Klaas Freitag
4f7fe64309
Bump version to rc1
2013-12-11 19:01:53 +01:00
Klaas Freitag
b8e7c7f271
Bump version to 0.91.3
2013-12-11 19:00:39 +01:00
Klaas Freitag
4153c0de08
LGPL License header for perl test module.
2013-12-11 18:41:23 +01:00
hefee
7e2dec5228
fixing typo
2013-12-11 18:31:31 +01:00
hefee
2cbdb35aac
Get rid of PATH_MAX, that is not available under FreeBSD.
2013-12-11 18:31:11 +01:00
Mr. Jenkins
342937ccd1
[tx-robot] updated from transifex
2013-12-11 12:30:51 -05:00
hefee
b578558866
compile ocsync for FreeBSD.
2013-12-11 18:30:08 +01:00
Klaas Freitag
aa213eeafb
Do not check for the ETag in case the HTTP request connected.
2013-12-11 13:51:38 +01:00
Daniel Molkentin
76a60e889c
Start timer only after the last quota request was answered
2013-12-11 13:48:31 +01:00
Olivier Goffart
fa195eb1e8
Logger: Initialize all variables
...
To avoid valgrind warnings in owncloudcmd
2013-12-11 13:23:42 +01:00
Klaas Freitag
b68e721f05
Do not error out on ETag if the status klass is != 2.
2013-12-11 12:59:11 +01:00
Klaas Freitag
bbfb2f2a60
Do not force resync if status is SyncResult::Problem.
2013-12-11 12:59:11 +01:00
Olivier Goffart
ba8fa9a403
Do not 'normalize' etag when we read from db
...
Normalize removes the quote and the -gzip.
We assume that the normalized etag is in the DB
This is how it worked in mirall 1.4
We added normalization in case there is a -gzip saved to the database.
But since this was broken in 1.4 anyway, it will just force a
re-download if -gzip was added. (1.4 anyway is broken with such
server and always do redownload all the time)
2013-12-11 12:50:45 +01:00
Olivier Goffart
bf309f83f4
Don't keep the temporary file if the transfer fails because of a wrong etag
...
The downloaded file is corrupted, remove it.
2013-12-11 12:48:11 +01:00
Olivier Goffart
1b4e2becb3
Use csync_normalize_etag everywhere.
...
Technically, we don't need to strip '-gzip' from the etag comming from
the propfind, but it is better to be consistant.
2013-12-11 11:35:55 +01:00
Thomas Müller
f05e998430
Translation SectionGroup Shortcuts
2013-12-10 18:08:07 +01:00
Daniel Molkentin
80d202c630
Fix build on Win32
2013-12-10 17:19:36 +01:00
Olivier Goffart
47308cdc01
define NE_LFS from cmake
2013-12-10 16:20:49 +01:00
Daniel Molkentin
03e9a06c7d
Fix build
2013-12-10 16:07:49 +01:00
Thomas Müller
370cf45357
fixing add button behavior in single folder mode
2013-12-10 15:59:59 +01:00
Thomas Müller
638b62a3ae
prevent crash on 'add folder'
2013-12-10 15:59:59 +01:00
Klaas Freitag
6707e93f31
Add NE_LFS define for correct size of ne_off_t
2013-12-10 15:28:02 +01:00
Olivier Goffart
0360babe02
usleep is not working on windows, use QThread::usleep
...
Shoud fix #1082
2013-12-10 14:03:01 +01:00
Klaas Freitag
a743f804f5
Ignore another sqlite journal tmp name that shows up on win32.
2013-12-10 13:19:57 +01:00
Klaas Freitag
4b42743a2a
Better documentation of file ignore patterns.
2013-12-10 13:19:49 +01:00
Olivier Goffart
b6e4575dea
Do not initialize all the application if another instance is running
...
This fixes a crash becasue we were constructing the systemtray and then
destroying it too early before the systemtray could initilize itself.
(This work around a bug in QSystemTray which crashes if it is destroyed
before it is registered to the X11 server)
2013-12-10 12:48:59 +01:00
Daniel Molkentin
ebfe2c793e
Remove leftover file
2013-12-10 12:20:43 +01:00
Daniel Molkentin
f9ba3bc22d
Merge pull request #1264 from owncloud/l10n-installer-2
...
Multi-lingual installer
2013-12-10 03:10:56 -08:00
Klaas Freitag
bdf36f58a8
Set errno and error message if neon errors in fetch_resource_list.
...
This at least shows proper error messages to the user, as described
in mirall#451
2013-12-10 11:58:55 +01:00
Thomas Müller
13f5d29c3c
No language selection dialog - use Windows GUI langaage, which is default as of today with NSIS
2013-12-10 11:10:48 +01:00
Klaas Freitag
07889528c4
Added changelog for csnyc 0.91.0 .. 0.91.2
2013-12-10 10:47:41 +01:00
Jenkins for ownCloud
082a60e067
[tx-robot] updated from transifex
2013-12-10 04:00:10 -05:00
Thomas Müller
d82a9423d6
adding Turkish translation to installer
2013-12-10 09:59:23 +01:00
Klaas Freitag
ffd09757cb
Remove ignoring pattern for progressdatabase.
2013-12-10 09:25:27 +01:00
Thomas Müller
b41feebcdd
Multi-lingual installer
2013-12-10 00:43:58 +01:00
Daniel Molkentin
9b2f9e3188
Push version to 0.91.2 for oCC 1.5.0 beta4
2013-12-09 21:44:28 +01:00
Daniel Molkentin
2cf7ba91c1
Don't install headers on OS X
2013-12-09 20:39:55 +01:00
hefee
f8478ac27b
Fixing typos
2013-12-09 20:17:56 +01:00
hefee
b092a8cee3
Add deleted Changelog entry for 1.4.2
2013-12-09 20:15:29 +01:00
Olivier Goffart
bb2f221edf
Fix broken slot connection
...
The slot was renamed.
2013-12-09 19:19:49 +01:00
Daniel Molkentin
dd323bc296
Don't invariably set variables that could be also set externally
...
We can't use cached variables here, since at least the suffix
may change at any time, and it needs to take precedence over
any cached content, which cmake doesn't seem to allow for.
2013-12-09 19:03:22 +01:00
Daniel Molkentin
31989d23a6
Adjust Windows and Mac binaries package names
2013-12-09 17:41:41 +01:00
Daniel Molkentin
1291ffaf02
Small adjustments to the last commit
2013-12-09 17:16:42 +01:00
Olivier Goffart
89d1e2d924
When reconfiguring, we need to clear the _currentSyncFolder
...
Else, if we reconfigure when the folder is syncing, it may be impossible to
sync again.
This happens for example when changing the password when the folder is
syncing
2013-12-09 17:16:04 +01:00
Klaas Freitag
857ef33056
Use proper email in license header.
2013-12-09 17:02:17 +01:00
Daniel Molkentin
f5e8efd435
Add build number into versioning scheme
...
This is an enabler to improve update experience
2013-12-09 16:39:13 +01:00
Olivier Goffart
e5edb8e2c7
Fix opening the explorer with a selected file on windows.
...
Should Fix #1249
2013-12-09 16:13:48 +01:00
Klaas Freitag
22608f13ca
Symlink detection for Win32.
...
This fixes https://github.com/owncloud/mirall/issues/1259
2013-12-09 15:19:50 +01:00
Klaas Freitag
f6f513cf45
Better check if the path variable is defined.
2013-12-09 14:08:28 +01:00
Mr. Jenkins
93ac78fd75
[tx-robot] updated from transifex
2013-12-09 06:41:11 -05:00
Olivier Goffart
7300f10f87
Do not recurse into ignored directory
...
Fix mirall issue 1260
2013-12-09 10:34:20 +01:00
Klaas Freitag
5f31d13236
Install headers for owncloudsync
2013-12-08 08:55:18 +01:00
Mr. Jenkins
ae69a24f5c
[tx-robot] updated from transifex
2013-12-07 21:27:41 -05:00
Klaas Freitag
fc986b0ab8
If item is a directory, remove its contents from the database as well.
...
Fixes bug #1257
2013-12-06 16:38:43 +01:00
Klaas Freitag
c5e435f9bd
Let recursive removal also remove the top dir.
2013-12-06 16:37:30 +01:00
Klaas Freitag
599451d250
Unchanged files still count as files.
2013-12-06 16:37:01 +01:00
Klaas Freitag
af78f1996c
Set action string as tooltip
2013-12-06 15:50:14 +01:00
Klaas Freitag
41d5445980
Display rename-target in sync protocol action column.
2013-12-06 15:07:25 +01:00
Klaas Freitag
e5afd8b901
Maintain the file type correctly.
2013-12-06 14:11:51 +01:00
Klaas Freitag
d99f5c5ddb
Set the symlink error message only for links.
2013-12-06 14:06:38 +01:00
Klaas Freitag
6fad20d5fc
Show local MOVE operations only for top level directory instead for all
...
files.
This fixes bug mirall#1240
2013-12-06 12:32:26 +01:00
Mr. Jenkins
7662a60111
[tx-robot] updated from transifex
2013-12-05 21:24:22 -05:00
Daniel Molkentin
dff17ec08e
A different user constitutes a different account
...
Fixes #1231
2013-12-05 19:03:40 +01:00
Daniel Molkentin
df5a72eb38
Resize wizard if advanced options are required
...
Fixes #1130
2013-12-05 17:43:57 +01:00
Olivier Goffart
fa9d9c9909
Maybe we need to destroy the decompress context before the request.
...
Possibly fix the issue #1229
2013-12-05 16:51:39 +01:00
Daniel Molkentin
a0d1dc8807
Avoid horizontal scrollbar
...
...by intproducing more tooltips and set eliding to center elide
You can still force a scrollbar, but it's not there by default
and the center eliding makes pathes more meaningful
Fixes #1213
2013-12-05 16:42:07 +01:00
Klaas Freitag
9e2f6c0258
Close the sync journal if a folder gets removed.
...
This fixes bug #1252
2013-12-05 16:06:46 +01:00
Daniel Molkentin
ee2efbb071
Fix for c3dc84c58f.
...
This resulted in the wizard not coming up the second time around
because it wasn't destructed properly.
Also fix a comment.
2013-12-05 16:00:32 +01:00
Olivier Goffart
000f7d320e
Add test that directories are properly moved
...
Even when they just had been modified or added
2013-12-05 15:34:39 +01:00
Klaas Freitag
8fd921f796
Rather use unit64_t than ino_t which causes trouble on win32.
...
This fixes https://github.com/owncloud/mirall/issues/1239
2013-12-05 12:49:01 +01:00
Mr. Jenkins
8bc532705f
[tx-robot] updated from transifex
2013-12-04 17:05:31 -05:00
Daniel Molkentin
c3dc84c58f
Don't close setup wizard when the initial sync run is started
...
Fixes regression over 1.4.2
2013-12-04 20:26:18 +01:00
Daniel Molkentin
72b0f4e573
Add man page for owncloudcmd
...
Fixes #1234
2013-12-04 20:07:05 +01:00
Klaas Freitag
861de89e9c
Add translatable error messages for individual file errors.
...
The error messages coming out of the csync updater and were
string based before which could not be translated.
2013-12-04 12:19:38 +01:00
Klaas Freitag
553c8d6658
Remove error string from file_status struct and replace by CSYNC_STATUS
...
That way we can translate the error states through miralls i18n
mechanisms.
2013-12-04 12:18:09 +01:00
Klaas Freitag
a6dfc0a83e
Refactoring, pick proper method name.
2013-12-04 11:36:24 +01:00
Klaas Freitag
859f776440
Set proper enable state of blacklist button after the dialog was opened.
...
Also set proper tooltips.
2013-12-04 11:32:46 +01:00
Klaas Freitag
4b7f75059a
Fixed check for SQL command successs.
2013-12-04 10:31:05 +01:00
Klaas Freitag
b3620e320b
Avoid a comparison warning on win32
2013-12-03 17:09:57 +01:00
Klaas Freitag
883576cb95
Fix Win32 move file operation.
2013-12-03 17:07:42 +01:00
Daniel Molkentin
62ec7aa9c5
Add file forgotten in last commit
2013-12-03 16:24:17 +01:00
Daniel Molkentin
99fc570267
Replace Q_OS_WIN32 by Q_OS_WIN
...
Fixes #1238
2013-12-03 16:23:49 +01:00
Olivier Goffart
1f5c4bde14
Fix windows rename of temporary files
2013-12-03 16:10:44 +01:00
Klaas Freitag
138fec678c
Push version to 0.91.1 for oCC 1.5.0 beta2
2013-12-03 14:53:47 +01:00
Klaas Freitag
046d180d2f
Rather count the blacklist items in the database.
...
Use database functions to count the entries rather than trying to
compute it from the progress items the widget got.
2013-12-03 14:48:49 +01:00
Klaas Freitag
278e76b774
Add blackListEntryCount method.
2013-12-03 14:48:49 +01:00
Olivier Goffart
09d850bfaa
When the temporary file is the same size as the file we would download, just keep it
...
Don't download the file if the temporary file is complete.
else, we get error from server: Requested Range not satisfiable
2013-12-03 14:44:04 +01:00
Olivier Goffart
3590db47ac
Reset the db to 0 after closing it.
...
This avoids closing it again and possibly crashing
Maybe the cause of the crash described in
https://github.com/owncloud/mirall/issues/1229
2013-12-03 14:08:18 +01:00
Klaas Freitag
f0a6047ecf
Add a button to acitivity view to clean the blacklist.
2013-12-03 14:04:01 +01:00
Klaas Freitag
e8ffb17b3b
Add a slot to wipe the folder's blacklist.
2013-12-03 14:04:01 +01:00
Klaas Freitag
09d4fa2127
Fixed wording, do not expose the term blacklist to users.
2013-12-03 14:04:01 +01:00
Daniel Molkentin
f521301c51
Add plugins in install_qt4_executable to ensure the lib paths get fixed up
...
Fixes #1228
2013-12-03 13:33:50 +01:00
Olivier Goffart
de5161137f
remove unneeded file
2013-12-03 13:11:41 +01:00
Olivier Goffart
60636cdbd5
inode 0 is invalid: don't try to match it from a DB
...
Otherwise, a new file with an invalid inode is considered like a rename
of another file with an invalid inode
2013-12-03 12:51:18 +01:00
Klaas Freitag
1abfd4ba44
Fixed wording, removed the term "problem".
2013-12-03 12:31:28 +01:00
Klaas Freitag
ecf45856e1
Add missing call to CloseHandle on the win32 platform.
...
This fixes bug mirall#1236 and also mirall#1237
Also some minor cleanups.
2013-12-03 10:08:17 +01:00
Mr. Jenkins
148b22f53d
[tx-robot] updated from transifex
2013-12-02 17:13:40 -05:00
Klaas Freitag
243279aa3f
Use lstat rather than link following stat.
...
This fixes https://github.com/owncloud/core/issues/6146
2013-12-02 16:45:28 +01:00
Thomas Müller
ec075a6d2a
removing libiniparder.dll and libdl.dll from NSNIS installer
2013-12-02 13:20:10 +01:00
Thomas Müller
6923f26597
Adding missing \ on zypper install command
2013-12-02 11:37:06 +01:00
Mr. Jenkins
206c62a171
[tx-robot] updated from transifex
2013-11-29 13:11:24 -05:00
Klaas Freitag
c03b2bbc87
Make unblacklisting depending on Up or Download
...
Compare modtime in case of uploading and ETag in case of downloading
as they are the correct indicators.
2013-11-29 16:16:04 +01:00
Klaas Freitag
2f708c0877
Move checkAccountExists out of gui class.
2013-11-29 16:16:04 +01:00
Olivier Goffart
58eb000163
Make the "details" manu entry work
...
Fix #1214
2013-11-29 11:18:59 +01:00
Olivier Goffart
f5f56e45c0
Fix pausing one of the folder pauses all foder after it while restarting.
2013-11-29 10:57:34 +01:00
Klaas Freitag
4c859d6513
Zero resource struct to avoid crash on win32
2013-11-28 14:48:47 +01:00
Klaas Freitag
a63e9c82a2
Push version to 0.91.0 - beta1 of oCC v. 1.5.0
2013-11-28 11:21:52 +01:00
Klaas Freitag
951ac79a68
Destinguish between rename and move in wording.
2013-11-28 10:58:04 +01:00
Klaas Freitag
ce47adb482
push version to 1.5.0beta1
2013-11-28 10:58:04 +01:00
Olivier Goffart
ef8fe11f5a
Do not write the directory etag in the database in case of soft error
...
Else we won't retry next time as we think nothing has changed.
2013-11-28 10:01:30 +01:00
Olivier Goffart
30db533cea
Stop iterating files when aborting.
2013-11-28 10:01:30 +01:00
Olivier Goffart
99eeaa0db5
no need to set twice the error string
...
done() is already taking care of that
2013-11-28 10:01:30 +01:00
Klaas Freitag
80a01ecff3
Use the activity icon in settings dialog.
2013-11-28 09:47:49 +01:00
Klaas Freitag
5f3ce25ccf
Push version to 1.4.90
2013-11-28 09:44:09 +01:00
Klaas Freitag
0d85810c23
Change tab name in settingsdialog to Activity rather than Status.
2013-11-28 09:44:09 +01:00
Mr. Jenkins
4626ef1ffb
[tx-robot] updated from transifex
2013-11-27 11:20:43 -05:00
Klaas Freitag
23007613a9
Fix progress bar in new propagator.
2013-11-27 16:48:16 +01:00
Daniel Molkentin
0fc51704f5
Enable accessibility on OS X
...
Fixes #736
2013-11-27 15:43:47 +01:00
Daniel Molkentin
46a403eb02
Report connection errors explicitly on explicit sign in attempts
...
Implicit connection attempts fail silently. This is roughly what
users expect from e.g. mail clients.
Fixes #1205 .
2013-11-27 14:15:56 +01:00
Daniel Molkentin
e719e80409
ConnectionValidator: Account::setState no longer takes a bool
...
This makes the client come up with the correct state when the
initial connect fails.
2013-11-27 14:12:30 +01:00
Daniel Molkentin
310278f580
Account: Swap connected and disconnected state
...
Also, avoid full integer enumeration
2013-11-27 14:11:10 +01:00
Klaas Freitag
c22758201f
Don't miss to read the fileid from database.
2013-11-27 13:21:48 +01:00
Klaas Freitag
75aad2b42c
Removed unused variable to fix warning.
2013-11-27 09:32:18 +01:00
Klaas Freitag
b1df4b04fa
Fix type confusion for file type member of stat struct
2013-11-27 09:31:20 +01:00
Klaas Freitag
59072a81f1
Put detailed sync status widget into ButtonGroup for common style.
2013-11-26 14:27:32 +01:00
Klaas Freitag
d55bffb319
Removed not longer needed Info button.
...
The detailed sync status is now in the same dialog in another tab.
2013-11-26 14:15:37 +01:00
Klaas Freitag
232cbc45b5
Simplify progress and error signals again.
...
Now handle everything through the progress signal and let the errors
be progressed in the done slot.
Remove unused code, fix sorting of the list, more efficiency.
This fixes #916
2013-11-26 14:02:11 +01:00
Klaas Freitag
a88d45bff4
Comment some unused code.
2013-11-26 14:02:11 +01:00
Klaas Freitag
090e474d70
Add a couple of missing progress signals.
2013-11-26 14:02:11 +01:00
Klaas Freitag
4f7546768b
Do not blacklist Softerrors.
2013-11-26 14:02:11 +01:00
Klaas Freitag
7a3c086be2
Display a proper error message for missing sync directory on server.
...
this fixes bug mirall#1149
2013-11-26 14:02:11 +01:00
Olivier Goffart
5c8b6ed902
Fix Remove -gzip from etag
...
Remove it from both "foo"-gzip and "foo-gzip"
See issue #1195
2013-11-26 12:10:52 +01:00
Olivier Goffart
87792b59e6
Fix -gzip removal from etag
...
Removes when the etag is both "foo-gzip" or "foo"-gzip
Add to patch for
https://github.com/owncloud/mirall/issues/1195
2013-11-26 11:55:47 +01:00
dragotin
cb6918f3d5
Merge pull request #1203 from pascalBokBok/patch-1
...
Remove spammy "sync starting" notification on every program start.
Thanks!
2013-11-26 02:39:08 -08:00
pascalBokBok
489cc8aa29
Remove spammy "sync starting" notification on every program start.
2013-11-26 10:01:36 +01:00
Mr. Jenkins
d8a8d5da63
[tx-robot] updated from transifex
2013-11-26 03:05:08 -05:00
Daniel Molkentin
0d85dcdd9e
Toggle Settings window when clicking on the icon
...
This restores the old behavior for every DE but OS X and Ubuntu Unity
(which respond to all clicks by opening the menu).
Discussed in #896
2013-11-26 03:15:03 +01:00
Daniel Molkentin
7eddff39e7
Wizard: Allow /index.php or /remote.php/webdav in URLs.
...
We will strip those. Also works on paste.
Fixes #349
2013-11-26 02:32:04 +01:00
Daniel Molkentin
81e47b0896
Folder wizard: sanitize error detection
...
* Wrap text properly
* Format multiple warnings as bullet points
* Use 'Folder' instead of 'Directory' everywhere
* Fix false positives when checking if one directory contains another
* Fix logic errors in target folder warning detection
Fixes #1201
2013-11-26 02:03:00 +01:00
Daniel Molkentin
ef0c7348ad
Account Settings: Fix label
2013-11-26 00:04:50 +01:00
Daniel Molkentin
050bb55f1e
Wizard: Do not start from scratch if the initial folder is non-default
...
Before, the folder was initialized to "ownCloud" in any case,
which lead the wizard to conclude it had to sync everything anew,
because the location moved -- even if the folder location was manually
corrected.
Fixes parts of #1172
2013-11-26 00:04:33 +01:00
Markus Goetz
fa715ce135
Propagator: Open download file as Unbuffered
2013-11-25 19:25:19 +01:00
Markus Goetz
911e0bdd6e
Propagator: Check write errors when downloading
2013-11-25 19:25:19 +01:00
Olivier Goffart
fa0f773fcb
Separate the case of file changing durng upload in the chunk or non chunk case.
...
If the file is changed between chunk, it is easy and we can just retry as the
file has not been changed on the server.
But if the file is changed after it has been updated on the server, we must still
update the database with the etag. (and possibly delete the partial file)
Relates to issue #1002
2013-11-25 19:16:54 +01:00
Olivier Goffart
8ed02302ca
Don't check if the file has changed after the upload is complete.
...
After the upload is complete, the file has been changed in the server and the etag
need to be updated in the db if we don't want to have desatrous conflicts later.
Let mirall know the real status, and expose the function to check weather the file
has changed so mirall can do thing properly
2013-11-25 19:11:19 +01:00
Markus Goetz
ac8296fb94
Propagator: Check E-Tag when resuming
...
Should fix #756
2013-11-25 19:01:04 +01:00
Klaas Freitag
13d755fc4d
Fixed compiler warning.
2013-11-25 18:27:37 +01:00
Klaas Freitag
ada30ae56b
Set file name in error_string if ENOENT error
2013-11-25 18:24:37 +01:00
Daniel Molkentin
f47ce2fea6
Account Settings: Set initial button state correctly
...
Fixes #1185
2013-11-25 17:56:09 +01:00
Klaas Freitag
33ff6b3934
Even if problems occured show the Ok-Icon in the setup dialog.
...
Fixes bug #942 .
2013-11-25 17:49:59 +01:00
Olivier Goffart
ca3d8ab193
Add one case of missing -gzip removal
2013-11-25 17:48:57 +01:00
Daniel Molkentin
d85009a2e9
Account Settings: fix connect error
...
Fixes #1198
2013-11-25 17:34:40 +01:00
Markus Goetz
72d2ac09e3
Propagator: Don't ignore error if no HTTP error code
2013-11-25 16:37:48 +01:00
Olivier Goffart
6b7da798b8
Remove -gzip from Etag
...
Fix #1195
2013-11-25 16:30:13 +01:00
Olivier Goffart
e146de9ea2
Remove -gzip from the etag
...
Both from what comes from the server (https://github.com/owncloud/mirall/issues/1195 )
Or what was in the db if upgrading from old database
2013-11-25 16:19:59 +01:00
Klaas Freitag
2e4043b498
Show proper error message and icon according to error class.
2013-11-25 16:18:07 +01:00
Klaas Freitag
dc29046d61
Add new progressProblem signal and slots.
...
Now the sync problems are handled differently than the sync progress
to ease error message handling and stuff.
2013-11-25 16:18:07 +01:00
Klaas Freitag
0c6dca25c4
Register meta type for SyncProblem
2013-11-25 16:18:07 +01:00
Klaas Freitag
1a3f246c46
Add new Error Types to progress: Soft, Normal, Fatal.
2013-11-25 16:18:07 +01:00
Daniel Molkentin
ad6c42b031
Wizard: let us handle/ignore credential failures
2013-11-25 15:50:19 +01:00
Daniel Molkentin
9ddedf81ac
Cleanup: "Use QMutexLocker"
2013-11-25 15:34:17 +01:00
Daniel Molkentin
685c13dead
Distiguish "Signed out" from "Disconnected"
2013-11-25 15:34:17 +01:00
Daniel Molkentin
c25c7daca7
docs: Add infos about installing the sql plugin and module
...
Fixes #1184
2013-11-25 15:34:17 +01:00
Daniel Molkentin
2a17a2a102
Remove credential-exposing debug output
2013-11-25 15:34:16 +01:00
Daniel Molkentin
4e22fff427
Introduce online/offline state, accessible via GUI
2013-11-25 15:34:16 +01:00
Daniel Molkentin
6165c38289
Fix indentation
2013-11-25 15:34:16 +01:00
Daniel Molkentin
f554cca3d6
Fix initial state of quota info class.
2013-11-25 15:34:16 +01:00
Daniel Molkentin
67132326d2
Prefix tooltips with app name
2013-11-25 15:34:16 +01:00
Daniel Molkentin
ea2b5fb29c
Query credentials when needed. Put the account offline if user aborts.
...
This is only implemented for HTTP auth. Shibboleth still does its own thing.
2013-11-25 15:34:16 +01:00
Daniel Molkentin
0a2861a731
Disable quota polling when default account does not exist or is offline
2013-11-25 15:34:16 +01:00
Olivier Goffart
6f17131e3c
Fix mutex usage in the journal
...
All public function must lock the mutex. And therefore none of the journal
function may call public function because the mutex is already locked.
So have a public commit that lock the mutex, and a private commitInternal
that assume the mutex is locked
2013-11-25 15:11:37 +01:00
Olivier Goffart
ca3885de2a
Fix some SQL error and warning
...
Such as:
Error opening the db: "Driver not loaded Driver not loaded"
or
QSqlDatabasePrivate::removeDatabase: connection '...' is still in use, all queries will cease to wor
We need to clear the QSqlDatabase _db handle before calling removeDatabase.
And we also need to give a different name to different folder database, just to be sure
2013-11-25 15:07:58 +01:00
Daniel Molkentin
5d6700c68d
Merge pull request #1165 from csware/startmenu-according-to-ms-guidelines
...
Startmenu according to ms guidelines
2013-11-25 04:27:43 -08:00
Daniel Molkentin
37d6f6eeab
Build on OS X
2013-11-25 10:54:18 +01:00
Klaas Freitag
fd1552f7a0
Handle SoftError and show blacklisted files.
2013-11-24 22:27:11 +01:00
Klaas Freitag
055a8d7e74
Do not display error messages if user aborts the sync run.
2013-11-24 22:26:50 +01:00
Klaas Freitag
1964e60eb0
Do not show an error message if user aborted. Also CSYNC_STATUS fixes.
2013-11-24 22:21:29 +01:00
Klaas Freitag
11acfde55a
Refresh the Protocol widget when the dialog is raised.
2013-11-24 22:20:43 +01:00
Klaas Freitag
b6eae58a2c
Only set the error code to a generic one if it is still ok.
2013-11-24 22:18:08 +01:00
Klaas Freitag
cc6c5e0db5
Let function csync_get_status return the CSYNC_STATUS
...
In original csync, csync_get_status() returned the status variable from
the context, which indicated in which state the sync run currently is,
which is never used.
What we expected in our mirall code however is the CSYNC_STATUS as
detailed result of a certain operation. Changed the function to reflect
that, even if that is an evil API change.
2013-11-24 22:17:36 +01:00
Mr. Jenkins
3a1c6429ab
[tx-robot] updated from transifex
2013-11-23 23:14:03 -05:00
Klaas Freitag
ecb2444923
Handle changing source file in upload correctly.
...
Delete the file on the server if the source file is new, but
the source did not arrive completely within a timespan.
2013-11-22 19:45:26 +01:00
Klaas Freitag
65bd4be16e
Make sure all queries are initialized on our database object.
...
Since we use a database with the non default name, we need to do that,
otherwise the query is initialized on the default db which is not open
in our case.
2013-11-22 15:37:35 +01:00
Mr. Jenkins
39e48d3d01
[tx-robot] updated from transifex
2013-11-21 20:06:22 -05:00
Klaas Freitag
0327461c25
Remove unneeded dlfcn header.
2013-11-21 14:13:35 +01:00
Mr. Jenkins
c0b3672f32
[tx-robot] updated from transifex
2013-11-21 08:09:18 -05:00
Klaas Freitag
8d2950f66c
Enable the overall file count in progress again.
2013-11-21 11:37:47 +01:00
Klaas Freitag
55e82ee4c1
Made transaction management a bit more transparent. Some fixes.
2013-11-21 11:13:58 +01:00
Klaas Freitag
aa17be40cc
Some database code cleanups.
2013-11-20 18:19:14 +01:00
Klaas Freitag
97c661c909
Cleanups
2013-11-20 14:59:58 +01:00
Klaas Freitag
2767e7084a
Minor cleanups.
2013-11-20 14:27:44 +01:00
Klaas Freitag
5900b1ad25
Add blacklisting for files with error conditions.
2013-11-20 14:27:44 +01:00
Klaas Freitag
20b9ae757d
Add a http status code varialbe to the sync item object.
2013-11-20 14:27:44 +01:00
Klaas Freitag
aff2dd9f44
The IGNORE statement is handled further down the code.
2013-11-20 14:27:44 +01:00
Klaas Freitag
e30c484a7a
Ignore the SIGPIPE signal as that disturbs debugging with Qt Creator.
...
It is questionable why this happens and if this patch really helps,
or if it might have side effects. Input appreciated :)
2013-11-20 14:27:44 +01:00
Klaas Freitag
0f6dd8748f
Fixed some header wording.
2013-11-20 14:27:44 +01:00
Klaas Freitag
a342f63fdf
Changed wording: Replaced Protocol against Status.
2013-11-20 14:27:44 +01:00
Daniel Molkentin
5c4d240c66
Build on mac with Qt 5
...
I still had this patch on disk.
2013-11-19 14:41:40 +01:00
Markus Goetz
e551e92e13
Downloads: Ignore file if no ETag was sent
...
Fixes part of #970
2013-11-19 12:44:25 +01:00
Markus Goetz
b98d97a96d
SyncJournalDb: Fix warnings
...
I got those warnings for the latter sync runs:
11-19 10:58:15:997 QSqlDatabasePrivate::removeDatabase: connection 'qt_sql_default_connection' is still in use, all queries will cease to work.
11-19 10:58:15:997 QSqlDatabasePrivate::addDatabase: duplicate connection name 'qt_sql_default_connection', old connection removed.
2013-11-19 11:28:08 +01:00
Klaas Freitag
f30ac49264
Cached more queries, used safe QSqlQuery pattern
2013-11-18 13:02:09 +01:00
Klaas Freitag
49ba252fff
Database initialize code cleanup.
...
If the QSqlQuery class is called with a query in the constructor, the query
is executed immediately. In fact, we executed each query twice before.
Later on we might want to implement a wrapper clas around the query.
2013-11-18 10:02:33 +01:00
Klaas Freitag
69269f8f75
Use transactions to speed up database access.
2013-11-18 10:02:32 +01:00
Klaas Freitag
e73730cb94
Close database after retrieval of file record count.
...
As the csync updater opens the database itself, it is cleaner to close
the db before and open it again after csync has finished.
Added a close method to the journal class.
2013-11-18 10:02:32 +01:00
Klaas Freitag
098e04c13f
Set PRAGMA synchronous to NORMAL
2013-11-18 10:02:32 +01:00
Klaas Freitag
b0f6628584
Moved implementation of start() to cpp file.
2013-11-18 10:02:32 +01:00
Klaas Freitag
42f6867329
Add some useful logging.
2013-11-18 10:02:32 +01:00
Daniel Molkentin
0a9a3d8f04
Cleanup in folderman
2013-11-18 09:37:09 +01:00
Daniel Molkentin
ec850e83b9
Folders need to be setup before initializing the GUI
...
This fixes the incomplete context menu
2013-11-18 09:37:09 +01:00
Markus Goetz
08665d6ac2
Settings: Don't specify encoding
...
QSettings automatically does escaping. When UTF-8 was set, I
got all kind of problems with the QByteArray for the geometry
and the umlaut in my name for the proxy user.
2013-11-18 09:30:42 +01:00
Klaas Freitag
61f08cdd97
Removed some unneeded code.
2013-11-15 16:22:41 +01:00
Klaas Freitag
a1286cc684
Add Content-Type header to http PUT request.
...
This hopefully fixes bug #1124 as it satisfies the mod_security
settings.
2013-11-15 16:15:26 +01:00
Markus Goetz
4194a078d5
Revert "set utf8 for the central settings file"
...
This reverts commit 6758c89130 .
2013-11-15 15:45:21 +01:00
Daniel Molkentin
6758c89130
set utf8 for the central settings file
2013-11-15 14:43:48 +01:00
Olivier Goffart
c15a1eedd1
Only update the db for ETAG if the etag has changed for directories
2013-11-15 13:53:18 +01:00
Olivier Goffart
79bf778a42
Forward the should_update_etag to the tree visitor
2013-11-15 13:52:41 +01:00
Olivier Goffart
0c689c4cca
Make sure that if two items have the same inodes, they are on the same type.
...
We don't want to rename a file to a directory
2013-11-15 12:32:05 +01:00
Olivier Goffart
dd24950881
Allow t3.pl to pass with owncloud5
...
Which do not have fileid
2013-11-15 12:23:05 +01:00
Klaas Freitag
bf6e1f10ce
Prepare the queries after the database was migrated.
2013-11-15 11:21:27 +01:00
Klaas Freitag
c22f8a47f1
Initialise values properly, avoid warning.
2013-11-15 10:32:13 +01:00
Klaas Freitag
858facb5e0
Use precompiled database statements.
2013-11-15 10:32:13 +01:00
Olivier Goffart
b610dd2754
Revert "Partial revert of "CMake: Remove cmake module""
...
That patch reverted the oposite of what it should have reverted :-)
This reverts commit b22ef9f8fa .
2013-11-15 10:20:12 +01:00
Olivier Goffart
b3972a5ba8
Do not fetch the file id in the propagator with a HEAD
...
Normally, the fileid comes with the PUT or the GET.
If it did not comes with the PUT, it means the server do not support
fileid, we should not query it with a useless HEAD.
Also, in case the fileid changes (which it should not) update anyway
to the new fileid in the db
2013-11-15 10:18:19 +01:00
Klaas Freitag
0993289180
Check the remote file Id of files in moved directories.
2013-11-15 09:36:33 +01:00
Klaas Freitag
32533a18af
Added function to retrieve file ID from remote.
2013-11-15 09:36:33 +01:00
Daniel Molkentin
36e8273da0
fix mac builds
2013-11-14 20:53:56 +01:00
Daniel Molkentin
2f4de3cc48
Build fix
2013-11-14 20:41:23 +01:00
Daniel Molkentin
b22ef9f8fa
Partial revert of "CMake: Remove cmake module"
...
This reverts commit 63188667bb .
2013-11-14 19:34:12 +01:00
Daniel Molkentin
e20f39f040
Another cleanup
2013-11-14 19:31:38 +01:00
Daniel Molkentin
63188667bb
CMake: Remove cmake module
2013-11-14 19:26:09 +01:00
Daniel Molkentin
c2eaf5e627
owncloud is no longer a dl'opened module, but linked into csync
2013-11-14 19:22:22 +01:00
Daniel Molkentin
7ba8983f0a
Change all Network Jobs to use start()
2013-11-14 19:20:19 +01:00
Markus Goetz
088aa6ebdd
Wizard: Default button to Next
2013-11-14 19:13:59 +01:00
Olivier Goffart
8a3e617630
Don't put csync_owncloud in a plugin.
...
It is now statically linked
2013-11-14 18:58:28 +01:00
Olivier Goffart
7e7853f170
Fix t1.pl
...
Previous commit had the wrong regexp
2013-11-14 18:58:28 +01:00
Olivier Goffart
e0fdad93f4
t4.pl'
2013-11-14 18:20:57 +01:00
Olivier Goffart
415b51b2b5
Some more checks in t1.pl
...
Notably that the conflict file actually exists. (There was not even a
conflict before because the filename of the touch was wrong)
2013-11-14 18:03:50 +01:00
Markus Goetz
767ec4ed59
Wizard: Support redirects again
2013-11-14 17:54:38 +01:00
Markus Goetz
b12b8c981d
Wizard: Also reset timeout on forwards
2013-11-14 17:23:56 +01:00
Markus Goetz
b499a62593
Wizard: Timeout handling for CheckServerJob
2013-11-14 17:23:56 +01:00
Markus Goetz
fa0a2764a4
Fix changing URL in wizard
2013-11-14 17:23:56 +01:00
Markus Goetz
a537a98f03
Tray menu: Populate at start
2013-11-14 17:23:56 +01:00
Olivier Goffart
4eb19000a4
Differentiate the RENAME and EVAL_RENAME
...
EVAL_RENAME is set at the update phase and means that this is the destination of
a file that has been renamed.
RENAME is set for the file that need to be renamed.
Before, we knew the difference because of which remote the instruction was
but now we need to make the distinction explicit
2013-11-14 17:08:42 +01:00
Klaas Freitag
bef7c3c48e
Fixes to t3.pl, added some assertions.
2013-11-14 17:06:53 +01:00
Klaas Freitag
e40370f67a
Use printInfo method in t3.pl
2013-11-14 16:10:41 +01:00
Sven Strickroth
ed5b0973dd
Do not create folder for single link
...
Signed-off-by: Sven Strickroth <email@cs-ware.de >
2013-11-14 15:45:14 +01:00
Olivier Goffart
e8e27b61f6
Revert the changes that fetch the file id in the propagator.
...
We don't want to fetch the file id in the propagator.
Revert "Put item member variable to base class."
This reverts commit f7aa2aa348 .
Revert "Add isValidFileId and getFileIdPropget methods."
This reverts commit ccd254abba .
2013-11-14 14:59:03 +01:00
Olivier Goffart
11a131fa90
csync_statedb_query: Allow null fields in the database
...
The fileid defaults to null for old database.
Since commit 4b8f2a287f , we query
the file id to get the etag.
c_strlist_add cannot append null entries, so it would just discard
the md5 instead
2013-11-14 14:41:36 +01:00
Sven Strickroth
336e22233d
Do not create uninstall shortcut in start menu
...
According to Microsoft Design guidelines (http://msdn.microsoft.com/en-us/library/windows/desktop/aa511447.aspx ) no icons for uninstallers should be created.
Signed-off-by: Sven Strickroth <email@cs-ware.de >
2013-11-14 14:40:21 +01:00
Daniel Molkentin
578431c791
Fix building owncloudcmd in case of theming
2013-11-14 14:20:09 +01:00
Olivier Goffart
4d146e87d1
Remove INVALID_FILE_ID and consider empty file id as invalid
2013-11-14 13:43:26 +01:00
Olivier Goffart
b518adc203
Don't read from the db if the file id has changed.
...
File id may change when upgrading to owncloud 6 or when upgrading to mirall 1.5
This also changes the location where we check if we need to read from
the DB. Instead of doing it from csync_ftw, we do it from
_csync_detect_update. In that function we know the etag and the file id.
Which mean we change the flag before the recursive call to csync_ftw instead
of in the begin of the function. Therefore, we need to restore the flag
after calling the function to the previously saved state.
2013-11-14 13:43:26 +01:00
Klaas Freitag
6b0b7d1b90
make t1.pl work again.
2013-11-14 13:07:55 +01:00
Daniel Molkentin
ead0f8d029
Update build docs
2013-11-14 12:36:09 +01:00
Klaas Freitag
f7aa2aa348
Put item member variable to base class.
2013-11-14 11:37:32 +01:00
Klaas Freitag
ccd254abba
Add isValidFileId and getFileIdPropget methods.
2013-11-14 11:37:08 +01:00
Klaas Freitag
4b8f2a287f
Retrieve file_id together with etag from db if read from db.
2013-11-14 11:32:03 +01:00
Klaas Freitag
3cc2593f62
Handle invalid file_id correctly.
2013-11-14 11:31:30 +01:00
Klaas Freitag
c3e154b2e6
Do not overwrite with an invalid file_id.
2013-11-14 11:30:51 +01:00
Daniel Molkentin
56de183155
Merge pull request #1160 from csware/exclude-office-tempfiles
...
Add another Office lock/temporary file pattern
2013-11-13 15:52:37 -08:00
Daniel Molkentin
c8256eea0e
Merge pull request #1162 from csware/startmenu-according-to-ms-guidelines
...
Startmenu according to ms guidelines
2013-11-13 15:52:05 -08:00
Sven Strickroth
b026bb308d
Do not create folder for single link
...
Signed-off-by: Sven Strickroth <email@cs-ware.de >
2013-11-14 00:45:18 +01:00
Sven Strickroth
6bd4d367d4
Do not create uninstall shortcut in start menu
...
According to Microsoft Design guidelines (http://msdn.microsoft.com/en-us/library/windows/desktop/aa511447.aspx ) no icons for uninstallers should be created.
Signed-off-by: Sven Strickroth <email@cs-ware.de >
2013-11-14 00:43:11 +01:00
Sven Strickroth
d401a62fd9
Add another Office lock/temporary file pattern
...
Experienced with Microsoft Office 2010.
Signed-off-by: Sven Strickroth <email@cs-ware.de >
2013-11-14 00:33:11 +01:00
Daniel Molkentin
8f61cc4041
Hint the OS to not show [?] in Wizards and Dialogs
...
Fixes #1156
2013-11-13 20:12:56 +01:00
Daniel Molkentin
21c9fc2d35
Cleanup
2013-11-13 19:11:46 +01:00
Daniel Molkentin
171572e400
Remember paused state throughout application restarts
...
Fixes #823
2013-11-13 18:58:35 +01:00
Klaas Freitag
e9920bd760
Consider an empty fileid as invalid.
2013-11-13 14:57:34 +01:00
Daniel Molkentin
475a4f2676
Windows: ship QtSql lib
2013-11-13 14:32:09 +01:00
Olivier Goffart
908888a44e
Rename 'md5' to 'etag'
...
'md5' always has been the etag. The name md5 for it is misleading.
It is still called "md5" in the database to keep compatibility
2013-11-13 14:29:31 +01:00
Olivier Goffart
52e01b39d6
Adapt to csync 'md5'->'etag' change
2013-11-13 14:28:41 +01:00
Daniel Molkentin
af1dcfd179
Compile fix
2013-11-13 14:24:02 +01:00
Daniel Molkentin
233a6908dd
Partial revert "Compile with Qt5"
...
This reverts commit 878ae56a71 .
2013-11-13 14:19:01 +01:00
Daniel Molkentin
ae83c12f05
Fix compiler warning
2013-11-13 14:19:01 +01:00
Olivier Goffart
3a1b868348
Directory with different etags should still be moved.
2013-11-13 14:04:51 +01:00
Daniel Molkentin
878ae56a71
Compile with Qt5
2013-11-13 14:00:12 +01:00
Daniel Molkentin
2ff4ebc72f
Make user() available throught AbsctractCredentials
2013-11-13 13:59:35 +01:00
Daniel Molkentin
ca79d3b437
Merge remote-tracking branch 'origin/master' into account_refactoring
2013-11-13 13:55:58 +01:00
Klaas Freitag
a65c5b6f38
Install Headers of libhttpbf
2013-11-13 09:47:39 +01:00
Klaas Freitag
3714bb02f7
Put files with special char names to tarball and removed them.
...
Jenkins on rotor.o.o is for some reason not able currently to
work with these file names.
2013-11-11 20:44:31 +01:00
Klaas Freitag
14081a197b
Call ne_sock_init and ne_sock_exit to initialize neons SSL stack.
...
See https://github.com/owncloud/mirall/issues/1115 for more details on
why that is done here now.
2013-11-11 17:47:24 +01:00
Klaas Freitag
9323658b01
Remove ne_sock_init and ne_sock_exit from owncloud module.
...
This change, together with a change in mirall calling the two functions
in folderman, should fix https://github.com/owncloud/mirall/issues/1115
This needs to be verified and maybe reverted!
2013-11-11 17:45:19 +01:00
Daniel Molkentin
9fe2549938
Add user info if the auth backends provides it
2013-11-11 16:57:15 +01:00
Klaas Freitag
e0a50d4bb9
PostSyncCleanup added: Remove superfluous entries from database after
...
sync.
2013-11-11 16:45:40 +01:00
Klaas Freitag
7f10b09a96
Set moved files which are changed to instruction EVAL.
2013-11-11 16:44:21 +01:00
Daniel Molkentin
ad1c1f4130
Remove legacy code
2013-11-11 15:36:49 +01:00
Daniel Molkentin
121b18bf70
QtKeychain is not a hard dependency
2013-11-11 15:36:29 +01:00
Daniel Molkentin
22ed29a30b
Remove obsolete credentialstore class
2013-11-11 15:24:07 +01:00
Daniel Molkentin
64b59f8679
Don't use integration directory
2013-11-11 15:22:51 +01:00
Daniel Molkentin
406ed5a0c0
Make new folder wizard work again
2013-11-11 15:20:07 +01:00
Daniel Molkentin
d5081f4328
Fix logic
2013-11-11 14:02:54 +01:00
Daniel Molkentin
95d7afb0d0
cleanups
2013-11-11 10:57:33 +01:00
Klaas Freitag
2b2987d962
Make sure to rebuild the recent changes menu.
2013-11-11 10:06:14 +01:00
Klaas Freitag
2eb77445be
Add rename actions to progress dispatching.
...
With that fix rename operations are shown as such in the progress
window and in bubble help etc.
2013-11-08 16:21:59 +01:00
Daniel Molkentin
12b1b38351
Fix connect
2013-11-08 14:02:13 +01:00
Daniel Molkentin
b0abb6362a
Don't set the content header length
...
This breaks POSTS and is not needed in QNAM, since QNAM
does this itself internally.
2013-11-08 14:01:56 +01:00
Klaas Freitag
a458ffd472
Add missing return in error case.
2013-11-08 12:56:54 +01:00
Klaas Freitag
2875d08c16
Record the rename path also for remote renaming.
2013-11-08 11:17:43 +01:00
Klaas Freitag
4ebed84d33
New test: Move a dir remotely, but remove the local one.
2013-11-08 10:18:30 +01:00
Klaas Freitag
586cfa2aac
Detect a NEW in the other tree, generate conflict condition.
2013-11-08 10:09:43 +01:00
Daniel Molkentin
60b6f520e7
Make Shibboleth browser aware of Accounts
...
Needed for SSL error handling. It's also more consistent.
2013-11-07 18:47:38 +01:00
Daniel Molkentin
8d0d5b4077
Make redirects work
2013-11-07 18:46:57 +01:00
Daniel Molkentin
5c9a6afb82
Fix crash when opening settings without a valid account
2013-11-07 18:46:28 +01:00
Klaas Freitag
40e2e5891f
Added more tests and info printing.
2013-11-07 16:57:51 +01:00
Klaas Freitag
07e8681181
Added printInfo convenience method.
2013-11-07 16:57:06 +01:00
Klaas Freitag
162acc1cc2
Fix conflict file handling, create a proper conflict file name.
...
Before this fix, the conflict file name was set in the file name
variable which lead to the problem that the subsequent rename of
the temp file to the final final filename was moving the temp file on
the conflict file. No final file was there.
2013-11-07 16:53:22 +01:00
Daniel Molkentin
64ef43d918
Fix the key used for storing the password
2013-11-07 15:59:58 +01:00
Daniel Molkentin
33c3d2a7d0
Wizard: Initialize account credentials.
...
Required to be able to readily retrieve the user name later on
2013-11-07 15:24:49 +01:00
Daniel Molkentin
1238ab4f69
fix broken connect() statement
2013-11-07 12:50:55 +01:00
Daniel Molkentin
a42ff5a07c
Show floating point prec. in account settings, too
2013-11-07 12:50:39 +01:00
Daniel Molkentin
aa4b6bd4ea
Readd "online" notion as a state in account.
...
This gets updated by the ConnectionValidator. Not sure if that's
the best choice, but it mimmicks the old behavior the closest.
2013-11-07 12:22:17 +01:00
Daniel Molkentin
478ba9c5ef
Fix approved SSL certificates being forgotten
2013-11-07 12:04:45 +01:00
Klaas Freitag
c58e9d17a8
Again minor doc changes.
2013-11-07 10:29:27 +01:00
Klaas Freitag
41ccbc0334
Minor docu change.
2013-11-07 10:28:14 +01:00
Daniel Molkentin
bd46ad56fc
Add new quotainfo class
2013-11-07 10:14:38 +01:00
Daniel Molkentin
bde5e86c50
Reformatting fixes
2013-11-07 10:14:25 +01:00
Daniel Molkentin
ec0f01fd7c
Ensure an SSL Error Handler is always available
2013-11-07 10:14:12 +01:00
Klaas Freitag
a6c4a9ac74
Test added: move a directory with a changed file in it.
2013-11-06 16:15:31 +01:00
Klaas Freitag
cac7595afd
make createLocalFile to work with absolute path.
2013-11-06 16:14:21 +01:00
Klaas Freitag
97f5bd840e
Add a function to calculate the MD5 sum of a file.
2013-11-06 16:13:39 +01:00
Klaas Freitag
fe4c1cc35a
Remove straycat code from mirall.
2013-11-06 14:20:44 +01:00
Klaas Freitag
cd823524b6
Enable dummy backend again to satisfy tests.
2013-11-06 14:12:31 +01:00
Klaas Freitag
84fa340085
Honor NDEBUG define in test.
2013-11-06 13:42:25 +01:00
Klaas Freitag
d080f7f7a7
Remove stray cat handling.
2013-11-06 13:28:38 +01:00
Klaas Freitag
ee69176a6b
Revert "Add straycat handling functions."
...
This reverts commit 171669c3a4 .
This needs to be implemented in a different way.
2013-11-06 13:21:45 +01:00
Klaas Freitag
fc33b5a8ab
Fix treewalk test, clean test condition.
2013-11-06 13:13:44 +01:00
Klaas Freitag
bae3d2fc1b
Fixed assertLocalAndRemoteDir arguments.
2013-11-06 11:31:51 +01:00
Klaas Freitag
eb33879906
Fix some requirement mentions in the INSTALL file.
2013-11-06 11:29:57 +01:00
Klaas Freitag
63069e4739
New test script for remote renames.
2013-11-06 11:29:57 +01:00
Klaas Freitag
862fffae39
Add more test data.
2013-11-06 11:29:57 +01:00
Klaas Freitag
60c56644ef
Changes for more convenient test environment.
2013-11-06 11:29:57 +01:00
Klaas Freitag
95cc4c310b
Read all data incl. file_id in get_stat_by_inode.
2013-11-06 11:29:56 +01:00
Klaas Freitag
171669c3a4
Add straycat handling functions.
2013-11-06 11:29:56 +01:00
Klaas Freitag
3fb7429f60
Cleanup renaming and record straycats to remove them from journal.
2013-11-06 11:29:56 +01:00
Klaas Freitag
de3963ac75
Set file_id correctly for renamed files.
2013-11-06 11:29:56 +01:00
Klaas Freitag
b6152c19d6
Adjust generic build documentation to the current state.
2013-11-06 11:13:55 +01:00
Daniel Molkentin
800abbf8b7
Make http credentials work
2013-11-05 18:16:00 +01:00
Daniel Molkentin
3af622d535
Make quota display work
2013-11-05 18:15:47 +01:00
Klaas Freitag
ee4cbf52dc
Remove straycats collected in the reconcile phase from journal.
2013-11-05 17:53:01 +01:00
Klaas Freitag
5cd2be058d
Fix local rename.
2013-11-05 17:50:09 +01:00
Klaas Freitag
3a21edca2b
Keep originalFile member as QString rather than C string.
...
This avoids encoding problems with interesting file names.
2013-11-05 17:48:51 +01:00
Klaas Freitag
c6a926842a
Fix recursivley flag misinterpretation.
2013-11-05 17:47:51 +01:00
Daniel Molkentin
440b5164ad
Build fix
2013-11-04 16:41:59 +01:00
Daniel Molkentin
cc5f17a7d2
Merge remote-tracking branch 'origin/master' into account_refactoring
...
Conflicts:
src/mirall/accountsettings.cpp
src/mirall/folder.cpp
2013-11-04 16:38:55 +01:00
Daniel Molkentin
85d5b82811
- Make saving/restoring accounts work.
...
- Prepare for fetching quota
2013-11-04 16:36:23 +01:00
Klaas Freitag
7b99d02875
Change order of the local assert of directories.
2013-11-04 14:55:17 +01:00
Olivier Goffart
f0a1ac4346
Fix syncing folder with nothing in it
...
Do the start after connecting, as the finish may be imediate if there
is nothing to do.
2013-10-31 12:11:56 +01:00
Olivier Goffart
bdc39f9cc2
Allow folder that are prefix of another
2013-10-31 11:41:56 +01:00
Olivier Goffart
d3ae2f42a7
Reset the proxy module property at every sync
...
This is required for the fix for #713
Since the module properties are shared in global variables shared by
every folders, removing another folder may clean the proxy settings.
So we need to restore them at every sync
2013-10-31 11:39:43 +01:00
Olivier Goffart
1a6a6758d3
We need to restore the read_from_db flag AFTER closedir
...
Else, we might dispatch to the wrong close call (the one from owncloud
instead of the one from the db, resulting in a memory leak
2013-10-31 11:38:00 +01:00
Olivier Goffart
f5391def6b
Don't cleanup in owncloud's vio_module_shutdown
...
All the cleanup is done in owncloud_commit which should
necessarily be called.
Should fix https://github.com/owncloud/mirall/issues/713
The problem was that csync_destroy was called on another csync
instance in another thread, resulting in a crash
Yes, there is still a problem with the proxy settings.
2013-10-31 11:38:00 +01:00
Olivier Goffart
0a99aa5fc7
Don't forget to close the database.
...
The code was removed when the code to write the database was removed.
But we still need to close the database
2013-10-31 11:14:21 +01:00
Olivier Goffart
df39ab0b2f
Don't leak the system tray
2013-10-31 10:52:19 +01:00
Olivier Goffart
28833ee5ac
Fix crash when removing folder while syncing.
...
We need to set _thread to 0 after destoying it
2013-10-31 10:51:45 +01:00
Olivier Goffart
c9cfa16929
Fix memory leak by properly cleaning memory in csync_commit
...
Restore two lines that were losts in the big merge from csync master
(b5ed352aa3 )
2013-10-31 10:05:15 +01:00
Olivier Goffart
8c4ecb4fba
Only use etag to know if we should use the db or not
...
Null file id might just mean the server don't support file id.
So use the database even if fileid is null
2013-10-31 10:02:20 +01:00
Klaas Freitag
c66a1d1895
Removed unused code from LocalRename
2013-10-30 18:14:33 +01:00
Klaas Freitag
cdee0dc1cf
Added a PropagateLocalRename job to do local renames.
2013-10-30 17:37:34 +01:00
Klaas Freitag
a43c5fcfe8
Fix header name according to changes on server master.
2013-10-30 17:37:34 +01:00
Klaas Freitag
0b5f1e6dd2
Make tests compile without propagate code.
2013-10-30 17:35:25 +01:00
Klaas Freitag
17d5e67d96
Handle remote renames better.
2013-10-30 17:34:40 +01:00
Klaas Freitag
4412ec38e4
Properly check if the file type has changed.
2013-10-30 17:34:40 +01:00
Klaas Freitag
70b6a5a8b1
Adjust header name to latest server implementation.
2013-10-30 17:34:40 +01:00
Olivier Goffart
5c67f39476
Ignore error 404 on DELETE
...
This may happen if we have stale entries in the database
2013-10-30 17:33:06 +01:00
Olivier Goffart
fb47657b1f
Make F6 in the account config sync the selected folder, for debugging purposes
...
Issue #409
2013-10-30 16:58:08 +01:00
Olivier Goffart
76d46af4b7
Revert "Implement a sync now button"
...
Actually, after discussion with the team, we decided this button is a bad idea
This reverts commit b56fcd8ebd .
2013-10-30 16:48:28 +01:00
Daniel Molkentin
86af2848dd
Merge remote-tracking branch 'origin/master' into account_refactoring
...
Conflicts:
src/mirall/accountsettings.cpp
2013-10-30 16:37:49 +01:00
Daniel Molkentin
4ca310b63b
Remove ownCloudInfo for good
2013-10-30 16:33:15 +01:00
Daniel Molkentin
59bc1d8966
Credential Store is no longer static
...
It now belongs to HttpCredentials
2013-10-30 16:32:34 +01:00
Daniel Molkentin
14c2ff44f3
More porting to Account class
...
- Finish port of owncloud setup wizard to Account
- Deprive MirallConfigFile of the customHandle
2013-10-30 16:31:47 +01:00
Olivier Goffart
b56fcd8ebd
Implement a sync now button
...
The button is in the account config, next to the "pause/resume" button
Fixes #409
2013-10-30 16:27:00 +01:00
Olivier Goffart
e38d6d974b
Replace _Button* with _button
...
Identifiers starting with underscore and uppercase are reserved in C++.
2013-10-30 15:52:30 +01:00
Olivier Goffart
9500c5ffab
Do not change the instruction anymore when we finish an item
...
The status is in the status. Keep the original instruction so the
UI knows what to display for eath item
2013-10-30 10:46:05 +01:00
Olivier Goffart
b079cedbf5
Use the status instead of the instruction for finished items
2013-10-30 10:44:41 +01:00
Olivier Goffart
a70e51f690
Fix t1.pl since the argument of owncloudcmd have changed
2013-10-29 13:47:08 +01:00
Olivier Goffart
f707dc1a8b
remove propagate function from csync_owncloud
2013-10-29 13:47:08 +01:00
Olivier Goffart
ae2b2c8cf8
Remove the other modules than owncloud
...
Only owncloud is supported now
2013-10-29 13:23:28 +01:00
Olivier Goffart
176daa7d96
Remove the propagate step.
...
Since the writing of the database has been removed, the propagate
step might as well be removed as it is performed by mirall.
2013-10-29 13:17:44 +01:00
Olivier Goffart
6e088e28f5
Adjust the mtime in case of fake conflicts
...
"Fake conflicts" happen when the etag changes on the server, and the
mtime changes on the client, but the actual file is still exactly
the same. We correctly detect them as false conflict and we do not
generate the conflict file for them.
But we should also update the local mtime to the server mtime so future
sync don't get confused.
2013-10-29 12:23:51 +01:00
Olivier Goffart
a11ecad41a
Mark false conflict as UPDATED so we save their entry in the database
2013-10-29 12:14:51 +01:00
Olivier Goffart
01e2743bae
Always download the conflicted files.
...
Conflicts have a direction==NONE. And they need to be downloaded, not uploaded
2013-10-29 12:13:30 +01:00
Olivier Goffart
75ffa787a6
emit the EndDownload progress at the right place.
...
It was put in rename instead of download
2013-10-29 12:13:30 +01:00
Olivier Goffart
4ad9f34807
Save the UPDATED files in the database
...
Those are files that were detected as "resolved conflict".
They should have been a conflict because they both were new, or both
had their local mtime or remote etag modified, but the size and mtime
is the same on the server. This typically happen when the database is removed.
Nothing will be done for those file, but we still need to update the database.
2013-10-29 12:13:30 +01:00
Daniel Molkentin
a91799a11c
Make the setup wizard compile again
...
- introduces more jobs
- needs more cleaning up
2013-10-28 20:01:59 +01:00
Daniel Molkentin
44fd03c058
Merge pull request #1125 from iAndre89/patch-1
...
Update mingw32-cross-nsis-plugin-processes and mingw32-cross-nsis-plugin...
2013-10-28 09:20:09 -07:00
Andrea Sosso
083e75998f
Update mingw32-cross-nsis-plugin-processes and mingw32-cross-nsis-plugin-uac
2013-10-28 17:17:10 +01:00
Olivier Goffart
adc47948a5
Add a comment explaining OwncloudPropagator::start
2013-10-28 17:00:27 +01:00
Olivier Goffart
6e886e28e9
Merge branch 'propagator-job'
...
Conflicts:
src/mirall/owncloudpropagator.cpp
2013-10-28 16:26:25 +01:00
Klaas Freitag
e63fc184a5
Options parsing added.
2013-10-28 16:07:13 +01:00
Olivier Goffart
84a40dcb59
Refactor the new propagator in jobs
...
This makes the code (IMHO) more easy to understand, and will allow
even more easy parallelism
2013-10-28 15:58:35 +01:00
Olivier Goffart
8e90782107
Make owncloudcmd display the debug output
2013-10-28 15:45:37 +01:00
Klaas Freitag
68ba99b7f0
Fixed fileID parsing and improved logging.
2013-10-28 15:28:34 +01:00
Klaas Freitag
b305c60e11
Make the logging a bit easier to read and more useful.
2013-10-28 14:35:31 +01:00
Klaas Freitag
f196fb582a
Check for empty file Id before querying.
2013-10-28 14:34:30 +01:00
Klaas Freitag
554e35b8e5
Disabled tests to make them succeed again. Needs rework.
2013-10-25 14:43:04 +02:00
Klaas Freitag
2fefc428a8
Write file Id to journal table.
...
Since this requires a change of existing sync journals, database migration
code was added.
2013-10-25 13:31:00 +02:00
Klaas Freitag
17220f2604
Query file Id from server if unknown.
2013-10-25 13:31:00 +02:00
Klaas Freitag
7a68961b25
Add handling for the file_id data to the sync items.
2013-10-25 13:31:00 +02:00
Klaas Freitag
84b07b3798
First attempt to implement server side move.
2013-10-25 13:25:07 +02:00
Klaas Freitag
352f513109
Read the file Id from the HTTP reply on PUTs.
2013-10-25 13:17:37 +02:00
Klaas Freitag
578a41f766
In case the file id is not in the db, do not get data from db.
...
If the file_id is not yet in the database it is not ok to read the file
tree data from the db.
2013-10-25 13:16:34 +02:00
Klaas Freitag
8b4b89ecad
Copy the file id.
2013-10-25 13:15:25 +02:00
Klaas Freitag
7e9490545b
Add a function to query the journal by the file_id.
2013-10-25 13:14:25 +02:00
Klaas Freitag
b0509fe368
Add the file ID to the TREEWALK struct.
2013-10-25 13:13:39 +02:00
Klaas Freitag
4440acdb1d
Add fileId data support to csync.
...
That stores a life time lasting unique Id for every file which
is maintained by the server. It is used on the client to detect
server side moves.
2013-10-25 13:12:59 +02:00
Daniel Molkentin
aa2baa45fb
Cleanups, ownership for ssl error handler
2013-10-24 12:55:26 +02:00
Daniel Molkentin
eda5feb82c
Bring back proper ssl handling
2013-10-24 00:29:08 +02:00
Klaas Freitag
5a26221a6b
Make test cases compile, still to fix.
2013-10-23 17:51:56 +02:00
Klaas Freitag
a52fd99a95
Removed database writing code.
...
All this is now done in the Qt based propagator class.
2013-10-23 17:51:16 +02:00
Klaas Freitag
0bba93e8b5
Rename vio function get_file_id to get_etag.
...
Since we introduce a file id now that has another semantics than the etag
the name would be very misleading.
2013-10-23 15:02:13 +02:00
Klaas Freitag
e01bc20898
Remove not so useful DAV_STRTOL define.
2013-10-23 14:50:41 +02:00
Daniel Molkentin
d2b445c80c
Basic port, misses wizard
2013-10-23 14:48:53 +02:00
Klaas Freitag
e7b94e437e
Merge remote-tracking branch 'freitag/dav' into ocsync
2013-10-23 14:37:12 +02:00
hefee
b4621e22e6
Merge pull request #1114 from owncloud/freebsd-inotify
...
Need inotify on FreeBSD for libsync
2013-10-23 02:36:12 -07:00
hefee
38679f79b5
Need inotify on FreeBSD for libsync
2013-10-23 01:24:27 +02:00
hefee
a927caf2b0
Fixing Utility::platform for all platforms
2013-10-23 00:59:29 +02:00
Klaas Freitag
74c6426075
Fix call to atoll, just pass the buffer
2013-10-22 17:58:18 +02:00
Klaas Freitag
e16560249c
Use atoll to convert inode from db query results.
2013-10-22 17:49:49 +02:00
Daniel Molkentin
29c846a764
WIP: Dissolve owncloudinfo class
2013-10-21 21:42:52 +02:00
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
Klaas Freitag
5e50b1f1fd
Add some progress meassuring logging.
2013-10-09 14:33:09 +02:00
Klaas Freitag
3c95d342ee
Handle sync enable flag correctly in folder scheduling.
...
This fixes bug #1083 .
2013-10-09 14:27:28 +02:00
Klaas Freitag
53ac5427a8
Integrate progress dialog into settings dialog.
2013-10-09 14:27:28 +02:00
Klaas Freitag
1ed8afba09
Minor changes.
2013-10-09 14:27:28 +02:00
Klaas Freitag
ef81a8a2ad
Use qint64 rather than int64_t.
2013-10-08 15:41:15 +02:00
Klaas Freitag
fa9d1614e7
Add some progress meassuring logging.
2013-10-08 14:07:46 +02:00
Jenkins for ownCloud
fe46b588af
[tx-robot] updated from transifex
2013-10-07 11:14:31 -04:00
Klaas Freitag
a7d298a441
Fix c99 warning.
2013-10-07 12:59:35 +02:00
Jenkins for ownCloud
290de7c430
[tx-robot] updated from transifex
2013-10-05 10:12:16 -04:00
Olivier Goffart
05fbfb520f
Protect the sync database by a mutex since it is used by the thread
2013-10-04 21:05:46 +02:00
Daniel Molkentin
805e1330ad
Compile with MinGW
2013-10-04 20:29:42 +02:00
Olivier Goffart
7c6fcf688c
Fix the fact that some success was reported as error
2013-10-04 15:55:59 +02:00
Olivier Goffart
127055dd70
Refactor a bit the error reporting from the propagator
...
Add different classes of error failures.
Fatal error means the sync should be stopped.
SoftErrors are not to be displayed to the user.
We still need to make a classification of the errors.
2013-10-04 15:55:59 +02:00
Markus Goetz
f4929e849e
CsyncThread: Activate recursive PROPFIND
2013-10-04 15:42:40 +02:00
Markus Goetz
617949f2e1
Recursive PROPFIND: Change and improve
...
It is disabled by default, but can be enabled by the library
user on demand. We suggest to enable it for the first sync
and when the local DB is small enough.
It only gets used for the first PROPFIND. In case the server
supports the Depth 'infinity', we keep the cache. In case
the server does not support it (= reports only 1 level)
we will still use the result by converting it to the legacy
PROPFIND cache.
2013-10-04 13:23:10 +02:00
Mackie Messer
ba9ac03b0b
Put plugins in PlugIns, not Plugins on Mac
...
Requires 770539f0a5 on csync
2013-10-04 13:01:46 +02:00
Mackie Messer
0257f7e169
Add sqlite plugin for OS X
2013-10-04 13:01:46 +02:00
Daniel Molkentin
763cb43e46
Add qsqlite plugin on Windows
2013-10-04 12:45:17 +02:00
Daniel Molkentin
770539f0a5
Look in PlugIns, not Plugins on Mac (consistent with Qt)
2013-10-04 12:42:08 +02:00
Olivier Goffart
8ed2588cdf
Fix build with Qt5
2013-10-03 23:14:10 +02:00
Olivier Goffart
d8d2d36638
Fix SQL Query
2013-10-03 23:00:47 +02:00
Olivier Goffart
afc13e70b9
fix Qt5 test compilation
2013-10-03 22:51:40 +02:00
Olivier Goffart
baa9ba089c
Save the database after each operation.
2013-10-03 22:41:12 +02:00
Olivier Goffart
3495b822a5
TMP
2013-10-03 20:01:07 +02:00
Daniel Molkentin
be88d425fc
Fix connecting to the mysql db
2013-10-03 19:52:09 +02:00
Klaas Freitag
94a06cec5b
WIP on the journal database.
2013-10-03 18:52:02 +02:00
Olivier Goffart
9b31ef0ca8
Do not write to the db if we did not do csync_propagate
2013-10-03 18:37:13 +02:00
Klaas Freitag
4008f6b309
Fix file status enum names.
2013-10-03 17:55:32 +02:00
Klaas Freitag
daac6886a0
Added method setFileRecord to update sync journal
2013-10-03 17:48:14 +02:00
Daniel Molkentin
e304dfd5b9
Add socketapi
...
Slightly amended by: Daniel Molkentin <danimo@owncloud.com >
2013-10-03 17:05:01 +02:00
Dominik Schmidt
d0af48c417
Add KDE tmp files to .gitignore
2013-10-03 17:05:00 +02:00
Klaas Freitag
2e3aabf99b
Read header without prefix path now that it's in 3rdparty.
2013-10-03 16:47:48 +02:00
Klaas Freitag
59bf8740a0
Add c_jhash.h header from csync to 3rdparty.
2013-10-03 16:41:23 +02:00
Olivier Goffart
21cd57228e
Fix build with Qt5
...
Missing SQL module
2013-10-03 16:29:47 +02:00
Klaas Freitag
4501c64e61
Do not include whole header of csync_exclude.
2013-10-03 16:22:31 +02:00
Klaas Freitag
273105e78b
Handle new case SyncAbortRequested.
2013-10-03 16:21:54 +02:00
Klaas Freitag
2707116350
Minor fixes for file_status
2013-10-03 16:12:50 +02:00
Klaas Freitag
c7d30bae98
Handle new sync result enum.
2013-10-03 15:32:44 +02:00
Klaas Freitag
be328581a7
Implemented sync status function for overlay icons.
2013-10-03 15:29:10 +02:00
Klaas Freitag
c32bc27b3e
Add sync journal database class that opens the csync db to read from it.
2013-10-03 15:29:10 +02:00
Klaas Freitag
0fef88a9b9
Some comments added.
2013-10-03 15:29:10 +02:00
Klaas Freitag
3e0fc56495
Dont show the [i] icon in the tray, see bug #942
2013-10-03 15:29:10 +02:00
Olivier Goffart
7ea3fc1533
Fix compilation of the test
2013-10-03 14:45:00 +02:00
Olivier Goffart
396ec4f888
Fix race condition in the logger.
...
Logs can come from multiple thread, we need to keep the _logstream
protected by a mutex
2013-10-03 14:37:13 +02:00
Olivier Goffart
79ea7c3eed
Abort the sync asynchroniously
...
Don't block the GUI when clicking on pause
Mirall issue #968
2013-10-03 14:36:32 +02:00
Olivier Goffart
b18810f381
Implement abort with the new propagator
...
abort was implemented in csync after the new propagator was written,
so it was not working with the new propagator
2013-10-03 14:35:56 +02:00
Jenkins for ownCloud
51d9cf099c
[tx-robot] updated from transifex
2013-10-03 08:09:15 -04:00
Olivier Goffart
be6e208328
Merge branch 'dav' into ocsync
...
Conflicts:
src/csync_update.c
2013-10-03 12:08:51 +02:00
Daniel Molkentin
339ed20abc
Utility::showInFileManager(): Substitute valid desktop file parameters
2013-10-03 12:05:00 +02:00
Olivier Goffart
b24f894a32
Set the start_id while aborting. This allow to resume from this block
2013-10-03 11:58:28 +02:00
Klaas Freitag
44ed577992
List results for all folders, not only one.
2013-10-03 11:36:18 +02:00
Klaas Freitag
f6685accc3
Use subdirs for more xdg dirs to go through
2013-10-02 19:23:06 +02:00
Klaas Freitag
2c2e79c13d
Consider the folder of items to delete from info window.
2013-10-02 19:23:06 +02:00
Daniel Molkentin
81961068a2
Utility: Move OS specific implementations into separate files
2013-10-02 19:15:56 +02:00
Daniel Molkentin
4e91a6450c
Change the recent changes menu and file item dialog behavior
...
Recent Changes:
- "No items synced recently"
- Add separator to the details section
- Make items clickable (will open file location in file manager)
- If a file was deleted, disable it
File Item Dialog:
- Make items clickable (will open file location in file manager)
This is implemented via a new method Utility::showInFileManager(QString),
which goes through great lengths to use use the right file manager on all
OSes/WMs/DEs, and make sure it selects the file in question if possible.
This needs good testing, though.
Fixes #1044
2013-10-02 18:17:48 +02:00
Daniel Molkentin
3dc2547bb5
WIP
2013-10-02 18:16:32 +02:00
Olivier Goffart
fb54cc8597
Fix the test.
...
conflictcopy is no longer in the default config file
2013-10-02 16:05:24 +02:00
Olivier Goffart
47f299f0ee
Send the last known etag to the server in a If-Match header
...
That way we avoid race conditions in case the file changed between the
update and the reconcile
2013-10-02 15:57:49 +02:00
Olivier Goffart
d135aab86c
clear the etag in every cases, not only when we upload files
2013-10-02 15:57:49 +02:00
Olivier Goffart
e2a2b882bb
Remove the unused errorDetails
...
It was not displayed to the user. Only use errorString instead.
Also report neon error to the user
2013-10-02 15:57:49 +02:00
Klaas Freitag
d8309a64cb
Even more cleanup.
2013-10-02 15:55:15 +02:00
Olivier Goffart
77b3780ab2
Do not put the conflict_copies in the ocsync config file.
...
Because owncloud sets it too true programmaticaly, and we don't
want to overwrite it with the config
2013-10-02 15:33:48 +02:00
Olivier Goffart
b29a31d36a
httpbf: add a 'previous_etag' entry in that is sent in If-Match header
2013-10-02 15:33:48 +02:00
Klaas Freitag
55722099fa
More refactoring: Logger and Logbrowser out of application class.
2013-10-02 15:29:24 +02:00
Jenkins for ownCloud
48abe62151
[tx-robot] updated from transifex
2013-10-02 09:08:33 -04:00
Klaas Freitag
fb582d8b3d
Fix macos test cases.
2013-10-02 12:33:10 +02:00
Klaas Freitag
dbe63727a3
Quote regexp to hopefully not confuse cmake 2.6
2013-10-02 09:15:17 +02:00
Klaas Freitag
3e27afadd5
Use a cross platform capable mkdir mask
2013-10-02 08:51:11 +02:00
Klaas Freitag
e7c72fc60c
Keep an out pointer on the beginning of the buffer.
...
For some reason the iconv function changes the pointer to the buffer but
for the return one ptr has to be kept at the start of the buf.
2013-10-02 08:48:58 +02:00
Klaas Freitag
da1245bcd8
Check if there really is a file to delete before doing unlink.
...
The (not succeeding) call to unlink might change errno which disturbs
the test code.
2013-10-02 08:47:55 +02:00
Klaas Freitag
2149814428
Fix/enhance user information about problems on startup.
...
Pass the error conditions to the gui class.
2013-10-01 18:25:43 +02:00
Klaas Freitag
6a73fd984c
Added missing cmake modules for cmake 2.6
2013-10-01 16:09:59 +02:00
Klaas Freitag
ea1c951006
Refactoring: Moved all GUI related computing out of application class.
...
Created ownCloudGui class to contain all gui related stuff.
2013-10-01 13:58:01 +02:00
Klaas Freitag
4a96f9a5c9
Add Mirall namespace.
2013-10-01 13:58:01 +02:00
Klaas Freitag
fcc4151810
Fix sequence of directories in help text.
2013-10-01 13:58:01 +02:00
Klaas Freitag
82cd79c004
Add unify defines to header.
2013-10-01 13:58:00 +02:00
Klaas Freitag
74983af3b4
Make evaluateSync public, review pls.
2013-10-01 13:58:00 +02:00
Klaas Freitag
f5bcb11fe9
Add connected server to error message.
2013-10-01 13:58:00 +02:00
Klaas Freitag
f6f1c638a5
Allow Constructor to be public, for synclibrary
2013-10-01 13:58:00 +02:00
Klaas Freitag
ef9f0edd61
Ignore all csync journal files right at beginning.
2013-10-01 13:18:36 +02:00
Klaas Freitag
0c2f9177d1
For silently ignored files return immediately.
2013-10-01 13:18:06 +02:00
Daniel Molkentin
e250672e4a
CMake: libhttplib -> httplib
2013-09-30 23:16:04 +02:00
Jenkins for ownCloud
13093f5de3
[tx-robot] updated from transifex
2013-09-30 09:04:25 -04:00
Daniel Molkentin
9b62104f30
Add Folder column to Details sync protocol
...
Also fixes padding
Fixes #1037
2013-09-30 14:12:59 +02:00
Daniel Molkentin
df36ebf308
Merge branch '1.4'
...
Conflicts:
VERSION.cmake
2013-09-30 13:34:10 +02:00
Jenkins for ownCloud
0d0c6a15fb
[tx-robot] updated from transifex
2013-09-28 23:02:52 -04:00
Daniel Molkentin
86e42a9cf0
Fix possible endless loop in inotify
...
Fixes #1041
2013-09-27 20:10:12 +02:00
Jenkins for ownCloud
b4911cc5ce
[tx-robot] updated from transifex
2013-09-26 23:55:07 -04:00
Klaas Freitag
bae3838513
Nicer name for HTTP header for mtime.
2013-09-26 15:07:06 +02:00
Klaas Freitag
f3acf2447c
Remove duplicated code from merge.
2013-09-26 15:03:35 +02:00
Klaas Freitag
3e31d86596
Add missing trailing semicolon as nagged by rpmlint.
2013-09-26 11:13:19 +02:00
Klaas Freitag
8f1e318cde
Set version to 0.90.2
2013-09-26 10:30:36 +02:00
Klaas Freitag
532bc450fb
Added changelog entry.
2013-09-26 10:30:03 +02:00
Klaas Freitag
ab007e2bb2
Set version to 1.4.1
2013-09-26 10:29:14 +02:00
Klaas Freitag
de9dcbd231
Transmit the new mtime of the file with the PUT request.
...
If the server supports it already, we can save another request by
sending the mtime as a header value in the PUT request and check the
servers reply for a acknoledge header.
2013-09-25 14:26:13 +02:00
Klaas Freitag
8d14286bd3
Merge dav and transmit the mtime with the PUT request
2013-09-25 14:23:04 +02:00
Klaas Freitag
f1b4a7a0ae
Disable comparison of local inode values for the win32 platform.
...
Bug owncloud/mirall#779 reports about continous upload of files
even though nothing has changed. Logfiles show the fact that the
inode on windows is not reliable for this. Disabled as a result
to fix bug #779 .
2013-09-25 11:39:06 +02:00
Klaas Freitag
33d55c0757
Remove unused commented code.
2013-09-25 11:34:50 +02:00
Jenkins for ownCloud
00fff7f793
[tx-robot] updated from transifex
2013-09-24 11:58:13 -04:00
Klaas Freitag
5cf13dfa32
Make logging work again.
2013-09-24 15:56:03 +02:00
Klaas Freitag
27b9a5aed9
Merge branch '1.4', brings in the changes we did for 1.4.1
2013-09-24 14:18:25 +02:00
Klaas Freitag
c45d55b94b
Create a rc2.
2013-09-24 12:45:45 +02:00
Klaas Freitag
7048bd8cc9
Handle app icon names properly.
2013-09-24 12:19:29 +02:00
Klaas Freitag
cae6ca987f
Revert "Fix application shortname for proper icon"
...
We must not change the app short name for ownCloud. Too dangerous as it
is used all over.
This reverts commit 65171cfb3a .
2013-09-24 11:48:19 +02:00
Klaas Freitag
65171cfb3a
Fix application shortname for proper icon
2013-09-23 18:23:21 +02:00
Klaas Freitag
740f0091f2
Updated version to 0.90.1
2013-09-23 16:37:31 +02:00
Klaas Freitag
ed636ffc9c
Added Changelog entries.
2013-09-23 16:37:18 +02:00
Klaas Freitag
7ec636aeb6
Added changelog entries.
2013-09-23 16:36:49 +02:00
Klaas Freitag
c96980a57d
Set version to 1.4.1rc1
2013-09-23 16:36:36 +02:00
Klaas Freitag
0959ceeff2
Disable delete of folder object temparily.
2013-09-23 15:10:42 +02:00
Klaas Freitag
1988c9d8c4
Do complete sync if network was disconnected.
...
This fixes owncloud/mirall#1007
2013-09-23 15:10:42 +02:00
Klaas Freitag
1eaa1e47fe
Be more careful with items in model when deleting rows.
2013-09-23 15:10:42 +02:00
Klaas Freitag
31923b314e
Removed left over stuff from refactoring.
2013-09-23 15:10:42 +02:00
Klaas Freitag
ee840b62e5
Fix syncEnable in folder and folderman.
2013-09-23 15:10:42 +02:00
Jenkins for ownCloud
4de99d2540
[tx-robot] updated from transifex
2013-09-22 11:52:39 -04:00
Daniel Molkentin
363efaa408
Theming build fix: Icons need shortname
2013-09-20 23:09:41 +02:00
Jenkins for ownCloud
5b60522e5e
[tx-robot] updated from transifex
2013-09-20 09:44:46 -04:00
Daniel Molkentin
b0beeea95f
More fixes related to object destruction on exit
...
- _logBrowser is not delete on close, call deleteLater
- move writing geometry out of dtor.
- _folderWizard was unused, remove it and all related noops
Hopefully solves #945
2013-09-20 14:18:28 +02:00
Daniel Molkentin
d0a4650d69
Settings: calculate sidebar width dynamically
...
Fixes #1020
2013-09-20 10:40:22 +02:00
Daniel Molkentin
ec5a84cf01
Pop up config wizard if no server url is configured.
...
Fixes #1018 .
2013-09-19 17:24:22 +02:00
Daniel Molkentin
a057eb8590
Fix focus issue during setup wizard
2013-09-19 14:52:41 +02:00
Klaas Freitag
0e17b00675
Added a new error code HBF_TRANSFER_NOT_ACKED.
...
If the server does not acknowledge the transfer with sending back an
ETag after the last missing chunk was uploaded, this is an error
which is now reported by this new error type.
2013-09-19 12:52:54 +02:00
Klaas Freitag
740a275836
Cleaned and added some debugging output.
2013-09-19 12:52:11 +02:00
Klaas Freitag
125a63bf8d
More descriptive error message.
2013-09-19 12:50:44 +02:00
Klaas Freitag
b4f14e086d
Added a new error code HBF_TRANSFER_NOT_ACKED.
...
If the server does not acknowledge the transfer with sending back an
ETag after the last missing chunk was uploaded, this is an error
which is now reported by this new error type.
2013-09-19 12:40:17 +02:00
Klaas Freitag
6d8cef3bb6
Cleaned and added some debugging output.
2013-09-19 12:38:20 +02:00
Daniel Molkentin
6a8753b119
Start only one wizard, delete it when done
2013-09-19 12:11:46 +02:00
Jenkins for ownCloud
b334c82fdd
[tx-robot] updated from transifex
2013-09-18 10:45:45 -04:00
Daniel Molkentin
23fab90a31
_tray is a QPointer, not a QScopedPointer
2013-09-18 16:41:37 +02:00
Daniel Molkentin
d657a679ba
Fix for previous commit
2013-09-18 16:28:01 +02:00
Klaas Freitag
219ce5fc4c
Make compile on win32 without fnmatch
2013-09-18 16:17:58 +02:00
Klaas Freitag
2ec1bcfc29
Make compile on win32 without fnmatch.
2013-09-18 16:15:08 +02:00
Daniel Molkentin
8fdf9cac6b
Try to be more graceful during shutdown
...
- Do not delete _tray, use deleteLater() via QScropedPointer
- force closing any dialoges that might want to write their
geometry in aboutToQuit(), before the actual destruction
of the sync thread, etc starts.
This tries to fix #945
2013-09-18 15:42:35 +02:00
Daniel Molkentin
525d12f5a2
Make "Sync started" message optional
...
Fixes #934
2013-09-18 14:14:42 +02:00
Daniel Molkentin
15d247a708
Ui::SslErrorDialog belongs within the Mirall namespace
2013-09-18 14:06:23 +02:00
Klaas Freitag
373746c296
Fix crash in case of NE_TIMEOUT happened.
...
Fixes https://github.com/owncloud/mirall/issues/1010
In case of NE_TIMEOUT the request is repeated for three times. In this
case, the hooks weren't correctly unhooked which caused a crash.
2013-09-18 12:58:17 +02:00
Klaas Freitag
525278450a
Fix crash in case of NE_TIMEOUT happened.
...
Fixes https://github.com/owncloud/mirall/issues/1010
In case of NE_TIMEOUT the request is repeated for three times. In this
case, the hooks weren't correctly unhooked which caused a crash.
2013-09-18 12:57:15 +02:00
Daniel Molkentin
91e527dc2a
Fix csync_version.h creation for cmake 2.6
2013-09-17 22:38:19 +02:00
Daniel Molkentin
82d31095f2
Fix csync_version.h creation for cmake 2.6
2013-09-17 22:37:59 +02:00
Jenkins for ownCloud
9ed4aa4111
[tx-robot] updated from transifex
2013-09-16 10:34:17 -04:00
Klaas Freitag
de074804eb
Detect empty etags coming from server side.
2013-09-16 16:15:15 +02:00
Klaas Freitag
c54a3ab7cc
Added missing parenthesis.
2013-09-16 14:16:14 +02:00
Daniel Molkentin
a1d0b85277
Add copyright header to syncfileitem.h
...
Fixes #993
2013-09-15 22:49:24 +02:00
Daniel Molkentin
5e5a77b040
Fix parameter order
2013-09-15 22:48:12 +02:00
Daniel Molkentin
e420ae6942
Folder Wizard: Fix various issues
...
- Use data role for pathes
- call root dir "ownCloud"
- don't connect() multiple times
- ensure chars like # or ? in path are interpreted as part of the url path segment
Should fix #992
2013-09-15 22:47:35 +02:00
Daniel Molkentin
0be7c0273e
Replace forgotton 22px app icon version which was still s/w
2013-09-15 00:48:06 +02:00
Jenkins for ownCloud
41b1b53c76
[tx-robot] updated from transifex
2013-09-13 20:47:28 -04:00
Thomas Müller
60ef5535c6
fixing testOctetsToString
...
(cherry picked from commit 78c8f13645 )
2013-09-13 20:14:53 +02:00
Thomas Müller
e38d0807c9
moving back to 1024 as divider for kB, MB, GB & TB
...
(cherry picked from commit c87c456ae0 )
2013-09-13 20:14:47 +02:00
Daniel Molkentin
864b7cd41e
Merge pull request #998 from owncloud/fixing-mb-1.4
...
Fixing mb 1.4
2013-09-13 11:11:43 -07:00
Thomas Müller
78c8f13645
fixing testOctetsToString
2013-09-13 17:30:53 +02:00
Thomas Müller
c87c456ae0
moving back to 1024 as divider for kB, MB, GB & TB
2013-09-13 15:00:49 +02:00
hefee
94d9b8fb39
Don't ship doc/scripts/README.rst via sphinx
2013-09-13 02:26:21 +02:00
Daniel Molkentin
7045a6c239
Merge pull request #996 from owncloud/dont-ship-doc_scripts
...
Don't ship doc/scripts/README.rst via sphinx
2013-09-12 17:25:39 -07:00
hefee
2b1602872c
Don't ship doc/scripts/README.rst via sphinx
2013-09-13 01:26:02 +02:00
Klaas Freitag
e09cb0c068
Move the check on the progressdb to the correct place, no crash anymore.
2013-09-12 15:37:10 +02:00
Klaas Freitag
62f4d118ea
Use new interface to csync_excluded.
2013-09-12 15:30:47 +02:00
Klaas Freitag
302f81b1d2
Adjusted tests for csync_excluded.
2013-09-12 15:30:13 +02:00
Klaas Freitag
1c87314b88
Fix a typo.
2013-09-12 15:30:04 +02:00
Klaas Freitag
ba1184f5ab
Make csync_excluded function work gitignore like.
2013-09-12 15:29:52 +02:00
Daniel Molkentin
30d8290d1c
Replace every occurrence of csync with ocsync in the documentation.
...
Patch by Sandro Knauß <buggs@sandroknauss.de >
Fixes Mirall issue #991
Conflicts:
doc/ocsync.1.txt
2013-09-12 15:29:37 +02:00
Daniel Molkentin
d4da443b12
Fixing spelling error 'transferred'
...
Lintian complains about the wrong spelling for transferred
Patch by Sandro Knauß <bugs@sandroknauss.de >
Fixes Mirall issue #990
2013-09-12 15:28:41 +02:00
Klaas Freitag
1f8aee8a4f
Adjusted tests for csync_excluded.
2013-09-12 14:47:17 +02:00
Klaas Freitag
526d23583a
Use new interface to csync_excluded.
2013-09-12 14:47:17 +02:00
Klaas Freitag
20821e6ffd
Fix a typo.
2013-09-12 14:47:17 +02:00
Klaas Freitag
d31f11fe88
Make csync_excluded function work gitignore like.
2013-09-12 14:47:17 +02:00
Daniel Molkentin
dbad6d641e
Replace every occurrence of csync with ocsync in the documentation.
...
Patch by Sandro Knauß <buggs@sandroknauss.de >
Fixes Mirall issue #991
2013-09-12 13:32:17 +02:00
Daniel Molkentin
c33e21a8c6
Fixing spelling error 'transferred'
...
Lintian complains about the wrong spelling for transferred
Patch by Sandro Knauß <bugs@sandroknauss.de >
Fixes Mirall issue #990
2013-09-12 13:32:14 +02:00
Daniel Molkentin
b488ad12c2
Do not build org and com theming when building from tar ball
...
Fixes #989
2013-09-12 12:56:24 +02:00
Daniel Molkentin
2dad027001
Do not build org and com theming when building from tar ball
...
Fixes #989
2013-09-12 12:55:12 +02:00
Daniel Molkentin
f97bb240d7
Setting thread priority is only possible after calling start()
2013-09-11 15:52:07 +02:00
Daniel Molkentin
574e029254
Setting thread priority is only possible after calling start()
2013-09-11 15:51:06 +02:00
Jenkins for ownCloud
91759c4a27
[tx-robot] updated from transifex
2013-09-11 06:40:51 -04:00
Klaas Freitag
ce5934461e
Do not en- or disable the watcher in setSyncEnabled.
...
The watcher is handled through the start and stop sync hooks in the
folder class. Even if the the folder is disabled and the watcher
fires, the folder does not schedule because it checks first if the
folder is enabled.
2013-09-11 12:33:07 +02:00
Klaas Freitag
80332fb6ab
Do not en- or disable the watcher in setSyncEnabled.
...
The watcher is handled through the start and stop sync hooks in the
folder class. Even if the the folder is disabled and the watcher
fires, the folder does not schedule because it checks first if the
folder is enabled.
2013-09-11 12:30:29 +02:00
Klaas Freitag
287ec2f3df
Enable and disable syncing also in the folder objects.
2013-09-11 10:50:03 +02:00
Klaas Freitag
eb5824f713
Handle startup network errors correctly.
2013-09-11 10:49:45 +02:00
Klaas Freitag
eded901f69
Minor code cleanups-
2013-09-11 10:49:10 +02:00
Klaas Freitag
d22dc6e6af
Exclude the progress database.
2013-09-11 10:43:05 +02:00
Klaas Freitag
6f637e40d8
Enable and disable syncing also in the folder objects.
2013-09-11 10:32:09 +02:00
Klaas Freitag
ec06663dee
Handle startup network errors correctly.
2013-09-11 10:32:09 +02:00
Klaas Freitag
3c5c432e1d
Minor code cleanups-
2013-09-11 10:32:09 +02:00
Olivier Goffart
927f7549d4
Revert "Compile (find httpbf)"
...
This reverts commit 2d2e843804 .
Turns out i had an old build of csync
2013-09-11 09:00:27 +02:00
Olivier Goffart
177114f8d9
Initialize the size of the SyncItem
2013-09-11 08:49:09 +02:00
Olivier Goffart
6bfdfd1af0
Fix progress with new propagator
2013-09-11 08:42:29 +02:00
Olivier Goffart
2d2e843804
Compile (find httpbf)
2013-09-11 08:11:03 +02:00
Daniel Molkentin
fd30df82cb
Folder Wizard: More sanity checks
...
Check if a server folder or its parent
is already part of a sync and refuse
to create a sync in this case.
Avoids "recursive syncing"
Fixes #962
2013-09-10 23:38:00 +02:00
Daniel Molkentin
55f2fcb4c6
Folder Wizard: More sanity checks
...
Check if a server folder or its parent
is already part of a sync and refuse
to create a sync in this case.
Avoids "recursive syncing"
Fixes #962
2013-09-10 23:37:52 +02:00
Daniel Molkentin
d8888432c3
Send basic auth in utf8.
...
Implies circumventing QAuthenticator and handling
authentication manually again.
Fixes #941
2013-09-10 23:04:10 +02:00
Daniel Molkentin
59425741b6
Send basic auth in utf8.
...
Implies circumventing QAuthenticator and handling
authentication manually again.
Fixes #941
2013-09-10 23:03:52 +02:00
Daniel Molkentin
3577ba2981
Fix httpbf/neon linkage
2013-09-10 19:50:44 +02:00
Daniel Molkentin
93fdbcd371
reversed decision: httpbf stays statically linked
2013-09-10 19:47:18 +02:00
Jenkins for ownCloud
d4477b0d65
[tx-robot] updated from transifex
2013-09-10 09:42:18 -04:00
Daniel Molkentin
48b4c57d92
Use shared version of libhttpbf, package it on win
2013-09-10 14:45:08 +02:00
Daniel Molkentin
6a2631631c
Make httpbf a shared lib
...
remove the lib suffix along the way
2013-09-10 14:41:42 +02:00
Klaas Freitag
9cb3af801a
Fixes for win32 after upstream merge.
2013-09-10 12:59:29 +02:00
morriswinkler
51712fea53
Update building.rst
...
eider fix it or add the note here
2013-09-10 12:15:16 +02:00
Daniel Molkentin
f597f99198
Wait up to 30 secs before complaining about missing systray
...
Conflicts:
src/mirall/utility.cpp
Fixes #949
2013-09-10 11:40:02 +02:00
Daniel Molkentin
00d09763af
Fix compile error
2013-09-10 11:37:52 +02:00
Daniel Molkentin
5639572ef3
Wait up to 30 secs before complaining about missing systray
2013-09-10 11:37:52 +02:00
Daniel Molkentin
1e7716abb4
Merge pull request #964 from morriswinkler/patch-1
...
Update building.rst
2013-09-10 02:28:03 -07:00
morriswinkler
751181d14f
Update building.rst
...
eider fix it or add the note here
2013-09-09 19:09:08 +02:00
Olivier Goffart
013b87f9c5
ignore the progress database
2013-09-09 15:18:28 +02:00
Olivier Goffart
6da2f6bbaa
Qt5: QSettings is no longer case insensitive
2013-09-09 14:00:13 +02:00
Olivier Goffart
198cb43ad6
Qt5: Q_WS_* macro were deprecated, replace by QT_OS_*
...
in particular, QT_WS_X11 is no longer defined
2013-09-09 13:31:39 +02:00
Jenkins for ownCloud
db648a0268
[tx-robot] updated from transifex
2013-09-08 20:37:37 -04:00
Jenkins for ownCloud
7cea2225de
[tx-robot] updated from transifex
2013-09-07 04:38:12 -04:00
Daniel Molkentin
51a7cbeb55
kill warning
2013-09-05 20:15:55 +02:00
Daniel Molkentin
171a9e1575
fix Qt 5 build on Mac/Win
2013-09-05 19:53:39 +02:00
Daniel Molkentin
1a10663c2b
csync_vio: fix defines
2013-09-05 19:50:20 +02:00
Klaas Freitag
76deabe4df
Use List to handle errors and display multiline.
2013-09-05 19:28:23 +02:00
Klaas Freitag
74ec37f3c7
Use List to handle errors and display multiline.
2013-09-05 19:25:59 +02:00
Daniel Molkentin
9c1a4fa68e
gcc/clang OS X does not know about __thread
...
This needs a proper implementation
2013-09-05 19:03:14 +02:00
Daniel Molkentin
6b9950a9a0
Qt5: DBUS is only needed for FDO
2013-09-05 18:41:49 +02:00
Daniel Molkentin
c6ed7dc586
Tests: Find test lib in Qt5
2013-09-05 18:06:00 +02:00
Daniel Molkentin
35ac6610c7
Compile with Qt5 on Linux
2013-09-05 17:13:31 +02:00
Jenkins for ownCloud
121efd8ff1
[tx-robot] updated from transifex
2013-09-05 07:30:27 -04:00
Daniel Molkentin
23d8f01012
Fix locating translations on linux
2013-09-05 11:08:00 +02:00
Daniel Molkentin
05178f0fbf
Fix locating translations on linux
2013-09-05 11:06:40 +02:00
Daniel Molkentin
573aaec9fd
Fix propagator test
2013-09-04 17:29:19 +02:00
Klaas Freitag
8fe102662d
Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync.
...
Conflicts:
src/mirall/csyncthread.cpp
2013-09-04 16:33:06 +02:00
Olivier Goffart
83cdece0b4
Merge remote-tracking branch 'owncloud/ocsync' into ocsync
2013-09-04 15:53:47 +02:00
Klaas Freitag
4cc1ef3624
Merge remote-tracking branch 'freitag/dav' into ocsync
...
Conflicts:
src/csync_propagate.c
src/csync_statedb.c
2013-09-04 15:51:38 +02:00
Klaas Freitag
b676ffe208
Some more info about the exclude matching.
2013-09-04 15:17:43 +02:00
Daniel Molkentin
625b21152e
Merge branch 'qt5'
2013-09-04 15:01:21 +02:00
Daniel Molkentin
385759f3c9
bump version
2013-09-04 15:00:53 +02:00
Daniel Molkentin
12b9b87c61
Update 0.90.0 changelog
2013-09-04 11:15:42 +02:00
Daniel Molkentin
9ce09713b6
1.4.0 final
2013-09-04 11:09:12 +02:00
Daniel Molkentin
0e1858ef2f
0.90.0 for final release with mirall 1.4
2013-09-03 16:44:46 +02:00
Klaas Freitag
d65b9aa404
Fixed exclude test.
2013-09-03 15:15:14 +02:00
Klaas Freitag
4fa6faf608
Hide quota and display explanation if no quota info is available.
2013-09-03 14:25:28 +02:00
Klaas Freitag
a24ae13d9c
Added logging to quota info result slot.
2013-09-03 14:25:28 +02:00
Daniel Molkentin
64dd0d1b45
Consistent look for top-labels
2013-09-03 14:24:34 +02:00
Daniel Molkentin
da63b1223c
Doc: more polishing
...
- add description of syncing limitations
- update out-of-date comments
Fixes #788
2013-09-03 12:35:40 +02:00
Jenkins for ownCloud
36f32c2aef
[tx-robot] updated from transifex
2013-09-03 06:30:41 -04:00
Klaas Freitag
8b224e2c0a
Don't warn about a finished sqlite3 query.
2013-09-03 11:47:19 +02:00
Daniel Molkentin
063acadc3b
Doc: new interface chapter
2013-09-02 19:28:06 +02:00
Klaas Freitag
81c720c05b
Remove dots from the end of error messages.
2013-09-02 17:37:16 +02:00
Klaas Freitag
edcdcb945a
Show the reason why a file was ignored.
2013-09-02 17:25:23 +02:00
Klaas Freitag
ce554eb44a
Let csync exclude report the exclude reason.
2013-09-02 17:23:17 +02:00
Daniel Molkentin
5df6430bb2
Doc: Do not enforce theme when building without submodules
2013-09-02 15:55:03 +02:00
Daniel Molkentin
9a0096d07c
Docs: Allow to build with org and com branding
2013-09-02 14:01:15 +02:00
Jenkins for ownCloud
25d33d6057
[tx-robot] updated from transifex
2013-09-01 12:30:19 -04:00
Daniel Molkentin
ab4c6247c7
Fix display of "Monochrome icon" setting
...
The logic was inverse, and there was a typo in the string. Oh my...
2013-08-31 14:14:24 +02:00
Jenkins for ownCloud
1b69dbb38b
[tx-robot] updated from transifex
2013-08-30 09:22:37 -04:00
Daniel Molkentin
bfdd488b00
Tests: make tests run in parallel
2013-08-29 14:50:55 +02:00
Daniel Molkentin
54c8809bf4
Tests: Fix indentation
2013-08-29 14:50:18 +02:00
Daniel Molkentin
0873665bec
Tests: Move all comparisons from QVERIFY to QCOMPARE
2013-08-29 14:48:40 +02:00
Olivier Goffart
02b3033ca3
Use the same convention as on the server to format strings
...
* use power of 10 SI units
* use "B" instead of "bytes"
* use at least 2 significant digit, but no more than one digit after
the period
2013-08-29 12:06:41 +02:00
Olivier Goffart
a27c8ad90c
Fix crash in case of error
...
the QObject::parent() is 0
2013-08-28 21:26:42 +02:00
Olivier Goffart
bf6d0a521c
Compile with Qt5
2013-08-28 20:58:22 +02:00
Olivier Goffart
336bbb2403
Compile with Qt4
2013-08-28 20:14:40 +02:00
Daniel Molkentin
73da086964
Initial changes to also build on Qt5, doesn't compile yet
2013-08-28 17:03:31 +02:00
Daniel Molkentin
58f4f3623f
Startup: Unity has no proper Systray implementation
...
...so it can't respond to isSysTrayAvailable()
2013-08-28 15:51:00 +02:00
Daniel Molkentin
18a58f73de
Startup: Unity has no proper Systray implementation
...
...so it can't respond to isSysTrayAvailable()
2013-08-28 15:45:52 +02:00
Daniel Molkentin
d1451a3c90
Mac: Use hdiutil attach instead of open during signing
2013-08-28 12:53:34 +02:00
Jenkins for ownCloud
0bef47b2f3
[tx-robot] updated from transifex
2013-08-28 05:24:20 -04:00
Jenkins for ownCloud
ccc05d6658
[tx-robot] updated from transifex
2013-08-27 10:23:30 -04:00
Olivier Goffart
c15de69156
Reconfigure the proxy when needed
2013-08-27 10:02:59 +02:00
Thomas Müller
8bfb44fd28
Inverting the logic to set the prefix for SYSCONF_INSTALL_DIR
2013-08-26 22:42:17 +02:00
Daniel Molkentin
79d3b84fad
Reintroduce workaround for /etc in root if files go to /usr
2013-08-26 21:59:52 +02:00
Daniel Molkentin
b97701586e
Properly install icons
2013-08-26 21:18:56 +02:00
Daniel Molkentin
b120345fe7
Icon file needs to use app_executable as well
2013-08-26 20:54:10 +02:00
Daniel Molkentin
ec5c65a530
install correct file
2013-08-26 20:35:56 +02:00
Daniel Molkentin
77e7a1fa8d
Fix casing in settings dialog
2013-08-26 20:22:24 +02:00
Daniel Molkentin
f6d45b68ef
More clear error messages
2013-08-26 20:20:10 +02:00
Daniel Molkentin
24d76a0d75
desktop file == executable
2013-08-26 20:20:10 +02:00
Olivier Goffart
c3326efe94
Do not sort the entries in the syc protocol dialog alphabetically
...
The entries should be sorted chronogically. But now the QTreeWidget can
only sort them alphabetically by the time, which is not what we want.
Disalbe the sorting, and always insert the elements in the reverse
order.
Fix #890
2013-08-26 17:27:44 +02:00
Daniel Molkentin
c0e056bb84
Only show help if a URL is provided
2013-08-26 14:27:39 +02:00
Jenkins for ownCloud
8a7df36701
[tx-robot] updated from transifex
2013-08-25 18:19:18 -04:00
Jenkins for ownCloud
39ec6b1bb2
[tx-robot] updated from transifex
2013-08-23 19:15:56 -04:00
Daniel Molkentin
30b2406533
Fix windows packaging
2013-08-23 15:37:24 +02:00
Daniel Molkentin
bff9b3843f
0.83.0
2013-08-23 14:35:45 +02:00
Daniel Molkentin
076d5dda0e
RC1
2013-08-23 14:35:15 +02:00
Olivier Goffart
e78eab46ff
Fix saving the geometry of the log browser
2013-08-23 12:41:29 +02:00
Olivier Goffart
19a08f8d5e
Make remember the size of the settings dialog
...
Before, we saved the geometry in the closeEvent which is only called if
the user press the [x] in the title bar. But it is not called when the
user accept the dialog (by pressing the close button or the enter key)
So save the geometry in the destructor of the dialog instead.
One also must call delete from the Application destructor because it was
leaking
2013-08-23 12:25:16 +02:00
Olivier Goffart
c6319117fd
Better default size for the setting dialog
2013-08-23 11:59:49 +02:00
Olivier Goffart
4c10ed4ada
Remove some entries from the default exclude list.
...
If the user really want to have those entries excluded it can add them
manually.
But one cannot change the default so if user want the .bak files synced,
he would not be able to do it
2013-08-23 11:17:02 +02:00
Daniel Molkentin
b0ab3ca80b
Theme: Add documentation after recent changes
2013-08-23 10:36:09 +02:00
Daniel Molkentin
9f89a2fe76
More adjustments around the application name
...
- libname is now derived from binary name (which is lowercase)
- remove superflouos reimplementation of appName() in owncloud theme
- APPLICATION_SHORTNAME is now optional (and if not set, equals
APPLICATION_NAME
2013-08-23 10:30:03 +02:00
Daniel Molkentin
e386bfb550
fix x-compilation
2013-08-23 00:36:05 +02:00
Jenkins for ownCloud
0189a3f1bd
[tx-robot] updated from transifex
2013-08-22 10:35:38 -04:00
Olivier Goffart
d3a333e03c
Fix the 'copy button' in the protocol log
...
Fix #863
Also added more padding for the filename because it might be big, and in
case it's not enough, always add at least a space.
2013-08-22 16:20:04 +02:00
Olivier Goffart
04d3e282fb
Stop the poll timer when the folder is disabled
...
No need to request etag every 30 second for disabled folder.
When the folder is re-enabled, the Timer is actived again after the sync
2013-08-22 12:35:28 +02:00
Olivier Goffart
4be5f970d5
Default to no limit upload
...
We don't want to make the transfer slow by default
2013-08-22 12:26:34 +02:00
Daniel Molkentin
31ceff181e
Amendment to last commit
2013-08-22 09:51:35 +02:00
Daniel Molkentin
42abf4101c
Honor cmake's install prefix
...
since the entire ting is so incredibly broken in cmake,
use the approach taken by csync (which emulates the
approach of autotools), to get the directories right.
This mandates changes in the theme, which need discussion
(APPLICATION_SHORTNAME must now equal appName(), and
APPLICATION_NAME should equal appGuiName()).
2013-08-22 09:40:25 +02:00
Daniel Molkentin
f09cae74fb
Merge pull request #897 from onnozweers/patch-1
...
Adding "Type=Application" to desktop file (to fix autostart in Ubuntu)
2013-08-21 16:50:25 -07:00
onnozweers
13a6393ec5
Adding "Type=Application" to desktop file (to fix autostart in Ubuntu)
2013-08-21 22:11:02 +02:00
Olivier Goffart
ef1a47a5a2
Save the database with the new propagator
2013-08-21 15:42:03 +02:00
Olivier Goffart
3c2bb1e2bc
Compile after the merge
2013-08-21 15:29:04 +02:00
Olivier Goffart
3a57eb1b54
Add the size in the TREE_WALK_FILE structur
2013-08-21 13:24:49 +02:00
Olivier Goffart
79c1514a2b
Chenge the headers to LGPL for the file that were added in the dav branch
...
The LGPL changes was not merged for the new files
2013-08-21 13:23:52 +02:00
Olivier Goffart
24af9f38f4
Merge branch 'csync_lgpl' into propagator-ng
...
Conflicts:
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/folder.cpp
src/mirall/progressdispatcher.h
src/mirall/syncfileitem.h
2013-08-21 13:19:02 +02:00
Jenkins for ownCloud
ace57f9dd4
[tx-robot] updated from transifex
2013-08-21 07:10:45 -04:00
Olivier Goffart
9527b9f4d2
Compile fix
...
That file was removed
2013-08-21 12:59:22 +02:00
Daniel Molkentin
e5117a98c9
Quota bar: Reduce border width to 1px per request
...
As requested by Jan
2013-08-21 11:34:49 +02:00
Daniel Molkentin
c1f7af7e6f
Write desktop file manually, add gnome startup property
...
Fixes #893
2013-08-21 11:09:56 +02:00
Olivier Goffart
b4c116e2a2
Add the new directories comming from the sync in the watcher
2013-08-21 00:45:36 +02:00
Klaas Freitag
98efab83a1
Compile against ocsync based on csync 0.50
2013-08-20 13:26:03 +02:00
Jenkins for ownCloud
a19a960b5e
[tx-robot] updated from transifex
2013-08-19 14:08:05 -04:00
Klaas Freitag
6d259f80e0
Remove file.
2013-08-19 17:01:33 +02:00
Klaas Freitag
0afbbeb8dc
Log the new module capabilities.
2013-08-19 17:01:21 +02:00
Klaas Freitag
4dbee1015f
Some minor compile fixes.
2013-08-19 17:00:56 +02:00
Olivier Goffart
29d2094626
Hide password in the account settings
...
Fix #811
2013-08-19 13:42:01 +02:00
Klaas Freitag
c3b82e6818
Fix sequence for recently changed items.
2013-08-19 13:06:48 +02:00
Olivier Goffart
1a7c89326b
Fix crash when finishing the wizard
...
As shown on this backtrace:
=13334== Invalid read of size 8
QCoreApplication::postEvent(QObject*,QEvent*, int)
Mirall::ownCloudInfo::slotReplyFinished()
[...]
==13334== Address 0x1afb91d8 is 8 bytes inside a block of size 16 free'd
operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
QNetworkAccessManager::~QNetworkAccessManager()
Mirall::MirallAccessManager::~MirallAccessManager()
[...]
Mirall::ownCloudInfo::setNetworkAccessManager(QNetworkAccessManager*)
Mirall::ownCloudInfo::setCustomConfigHandle(QString const&)
Mirall::OwncloudSetupWizard::slotAssistantFinished(int)
[...]
Mirall::OwncloudWizard::basicSetupFinished(int)
Mirall::OwncloudWizard::slotCurrentPageChanged(int)
[...]
QWizard::currentIdChanged(int) (in
Mirall::OwncloudWizard::successfulStep()
Mirall::OwncloudSetupWizard::finalizeSetup(bool)
Mirall::OwncloudSetupWizard::slotAuthCheckReply(QString const&,
[...]
Mirall::ownCloudInfo::ownCloudDirExists(QString const&, QNetworkReply*)
Mirall::ownCloudInfo::slotReplyFinished()
The QNetworkManager was destroyed in a slot connected to a signal emited
by slotReplyFinished, but we did not finish with the QNetworkReply yet.
Fix the crash by using QueuedConnection so the QNetworkAccessManager is
not destroyed before slotReplyFinished has completed.
2013-08-19 12:43:52 +02:00
Daniel Molkentin
3a1f04ac2d
Allow folders with characters that need percent-encoding
...
Fixes #191
2013-08-18 20:24:24 +02:00
Olivier Goffart
835813a86f
Fix the tests after merge
2013-08-18 20:13:27 +02:00
Daniel Molkentin
2c8e95a0f4
Be more specific when disconnecting the signal
...
Fixes a crash, amends be48cb646c
2013-08-18 19:41:01 +02:00
Klaas Freitag
a9d94ef732
Show error message in status dialog in error case.
2013-08-18 19:27:20 +02:00
Klaas Freitag
2756d17873
Fix/add missing status strings to theme.
2013-08-18 19:20:25 +02:00
Olivier Goffart
b4efcf1627
Compile the tests after merge
...
(Still not passing)
2013-08-18 19:11:36 +02:00
Olivier Goffart
56d5359f5b
Fix compilation after merge
...
Still untetested
2013-08-18 18:55:32 +02:00
Klaas Freitag
e0d121d370
More minor cleanups.
2013-08-18 18:18:05 +02:00
Klaas Freitag
a5de9994ec
Set a proper error message on in-between-changes.
2013-08-18 18:18:05 +02:00
Olivier Goffart
d098a12321
leak fix
2013-08-18 18:18:05 +02:00
Klaas Freitag
34d7f84fc2
Minor cleanup.
2013-08-18 17:59:03 +02:00
Daniel Molkentin
6cda2f0c24
Do not report removable ignored files
2013-08-18 17:52:45 +02:00
Olivier Goffart
4e04a2ccb0
Addapt to new error codes
2013-08-18 17:29:23 +02:00
Markus Goetz
b923554935
Revert "DB: Don't use metadata_tmp table"
...
Let's not do this in the release branch
This reverts commit 79f72a1211 .
2013-08-18 17:13:19 +02:00
Markus Goetz
6474780d80
Revert "DB: More easy IO mode"
...
This reverts commit ea6caed5a3 .
2013-08-18 17:12:59 +02:00
Markus Goetz
79f72a1211
DB: Don't use metadata_tmp table
...
Not sure why this was ever needed
2013-08-18 17:05:04 +02:00
Daniel Molkentin
cea9b389bf
Account Settings: Use native highlight color
2013-08-18 17:00:37 +02:00
Olivier Goffart
ec8adf2bd7
Fix compilation of src/std after merge
2013-08-18 16:51:02 +02:00
Olivier Goffart
2afdc9d095
Adapt to new multybyte api after merge
...
(Search and replace)
2013-08-18 16:43:46 +02:00
Olivier Goffart
9f5388544a
Fix cmake after merge
...
iniparser dependency is gone.
2013-08-18 16:29:35 +02:00
Olivier Goffart
b5ed352aa3
Merge remote-tracking branch 'origin/master' into ocsync
...
Only confluct resolution, do not compile or works
Conflicts:
CMakeLists.txt
CPackConfig.cmake
ConfigureChecks.cmake
client/csync_client.c
cmake/Modules/DefineCompilerFlags.cmake
cmake/Modules/DefineInstallationPaths.cmake
cmake/Modules/FindIconv.cmake
cmake/Modules/FindIniparser.cmake
cmake/Modules/FindNeon.cmake
config.h.cmake
config/CMakeLists.txt
config/ocsync.conf
doc/CMakeLists.txt
modules/csync_owncloud.c
modules/csync_sftp2.c
src/CMakeLists.txt
src/csync.c
src/csync.h
src/csync_config.c
src/csync_exclude.c
src/csync_lock.c
src/csync_macros.h
src/csync_misc.c
src/csync_misc.h
src/csync_private.h
src/csync_propagate.c
src/csync_statedb.c
src/csync_statedb.h
src/csync_update.c
src/csync_util.c
src/csync_util.h
src/std/c_dir.c
src/std/c_file.c
src/std/c_private.h
src/std/c_string.c
src/std/c_string.h
src/std/c_time.c
src/vio/csync_vio.c
src/vio/csync_vio.h
src/vio/csync_vio_file_stat.h
src/vio/csync_vio_local.c
src/vio/csync_vio_method.h
tests/CMakeLists.txt
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_treewalk.c
tests/csync_tests/check_csync_update.c
tests/ownCloud/HTTP/DAV.pm
tests/ownCloud/ownCloud/Test.pm
tests/std_tests/check_std_c_str.c
tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Markus Goetz
ea6caed5a3
DB: More easy IO mode
...
We move the DB anyway at the end, no need to be so harsh
2013-08-18 16:10:30 +02:00
Daniel Molkentin
71b1e881d8
Setup Wizard: Only label button "Connect" where suitable
2013-08-18 15:23:52 +02:00
Daniel Molkentin
7ba47e9d44
Code formatting fixes
2013-08-18 15:23:52 +02:00
Daniel Molkentin
be48cb646c
Setup wizard: Start sync when displaying result page
2013-08-18 15:23:52 +02:00
Klaas Freitag
47eb5ff1d9
Do not keep the log if the log window is not visible.
2013-08-18 13:28:40 +02:00
Klaas Freitag
b608f5a670
Progressbar and quota bar tweaking.
2013-08-17 22:56:02 +02:00
Klaas Freitag
e81dc34c4e
Add a tooltip in the sync protocol list.
2013-08-17 17:57:33 +02:00
Klaas Freitag
1603e627a3
Remove superflous conflict case.
2013-08-17 17:57:33 +02:00
Klaas Freitag
bf978b3e0f
Handle Progress as a namespace rather than a class.
2013-08-17 17:57:33 +02:00
Klaas Freitag
0fdaf33288
Use correct translation call from QCoreApplication.
2013-08-17 17:57:33 +02:00
Klaas Freitag
367c4153c1
Show a bubble if the quota was exceeded.
2013-08-17 17:57:33 +02:00
Klaas Freitag
395c673a24
Fix the quota bar for quotas larger 100%.
2013-08-17 17:57:32 +02:00
Olivier Goffart
22de23c651
Fix the 'no limit' upload setting
...
Fix issue #879
2013-08-17 16:11:45 +02:00
Olivier Goffart
23926d2461
small leak
2013-08-16 20:18:35 +02:00
Olivier Goffart
c03f31b6ba
put the 'Account' item first
2013-08-16 15:09:54 +02:00
Olivier Goffart
a1060a8538
fixup the layout of the account settings
2013-08-16 15:03:38 +02:00
Daniel Molkentin
24251bc223
Add "Keyword" to the desktop template
...
Fixes #876
2013-08-16 12:29:11 +02:00
Olivier Goffart
868f8029a2
Close the database file in all cases.
...
If the database was empty, we forgot to close the file descriptor,
making it impssible to remove the database and replace it with the real
one
2013-08-16 12:23:26 +02:00
Jenkins for ownCloud
f78749d2cd
[tx-robot] updated from transifex
2013-08-15 16:57:02 -04:00
Olivier Goffart
14219a1ea5
Log error of sqlite3_close
2013-08-15 18:39:26 +02:00
Daniel Molkentin
1663c84db7
Return an error if rename fails on win32.
...
Amends 9ea39dbaa9 .
2013-08-15 18:06:27 +02:00
Klaas Freitag
9ea39dbaa9
win32: Retry renaming in case of access denied.
2013-08-15 17:40:30 +02:00
Klaas Freitag
d3ec897fee
Bump version to 0.82.0
2013-08-15 17:39:00 +02:00
Daniel Molkentin
0995377d39
1.4.0 beta2
2013-08-15 17:32:46 +02:00
Daniel Molkentin
b9228e64ff
Make Folder Reset an expert option (F5)
...
This feature should not be required, but might be helpful
in the debugging process.
2013-08-15 17:00:07 +02:00
Olivier Goffart
c4084de716
Remove the 'Remove Account' button
...
It is not doing anything right now, and we have no plans to implement it
in a short future
Fix Issue #866
2013-08-15 16:42:08 +02:00
Olivier Goffart
3c667918e7
Fix Reconfiguration keeps sync folder definition
...
Issue #875
2013-08-15 16:35:03 +02:00
Olivier Goffart
e55745cbcf
Remove connection from unexisting signal to unexisting slot
2013-08-15 16:16:22 +02:00
Daniel Molkentin
e01ce20431
Wizard: Do not use FormLayout for URL line edit
...
Looks ugly on Mac
Fixes #870
2013-08-15 15:58:20 +02:00
Olivier Goffart
dce8cb83d9
Do not forget the config on the second page of the wizzard
...
Fixes mirral issue #874 where certificate was not stored on the first
page
2013-08-15 15:45:16 +02:00
Olivier Goffart
8dc956c55b
Put all the debug in the log window
...
Don't emit debug before we installed the hook and created he log window
Also no debug if we use --help
2013-08-15 15:45:16 +02:00
Olivier Goffart
38a5ff42e0
show the errno in the debug when renaming the db fails
2013-08-15 13:51:57 +02:00
Daniel Molkentin
6c77921a32
Admendment of last commit
2013-08-15 13:09:20 +02:00
Daniel Molkentin
55e4748f06
allow relative directories for --confdir
2013-08-15 13:01:05 +02:00
Daniel Molkentin
5ff9e02517
Implement --logfile - (log to stdout)
2013-08-15 12:24:52 +02:00
Daniel Molkentin
7f7ebc36f5
Fix showing help when app is running
2013-08-15 12:24:52 +02:00
Klaas Freitag
0e5bfc03ce
Removed label on request of Jan.
2013-08-15 12:17:01 +02:00
Klaas Freitag
b309d333a6
Minor wording and margin fixes.
2013-08-15 11:30:48 +02:00
Daniel Molkentin
ee439382ed
Logger: always log to log widget
2013-08-15 10:56:16 +02:00
Klaas Freitag
192212c682
Handle quota exceeding as error.
2013-08-15 08:15:43 +02:00
Klaas Freitag
148bdfdcd6
Some minor cleanups.
2013-08-15 08:15:43 +02:00
hefee
066c0ba189
Make building documantation parallelable.
...
sphinx will fail in a race condition, if every sphinx target
uses the same CACHE dir:
Exception occurred:
File "/usr/lib/pymodules/python2.7/sphinx/cmdline.py", line 189, in main
app.build(force_all, filenames)
File "/usr/lib/pymodules/python2.7/sphinx/application.py", line 204, in build
self.builder.build_update()
File "/usr/lib/pymodules/python2.7/sphinx/builders/__init__.py", line 196, in build_update
'out of date' % len(to_build))
File "/usr/lib/pymodules/python2.7/sphinx/builders/__init__.py", line 238, in build
self.env.topickle(path.join(self.doctreedir, ENV_PICKLE_FILENAME))
File "/usr/lib/pymodules/python2.7/sphinx/environment.py", line 351, in topickle
movefile(filename + '.tmp', filename)
File "/usr/lib/pymodules/python2.7/sphinx/util/osutil.py", line 104, in movefile
os.rename(source, dest)
OSError: [Errno 2] No such file or directory
2013-08-15 02:36:44 +02:00
Olivier Goffart
e4128cd5d8
progress with new propagator
2013-08-14 19:59:16 +02:00
Daniel Molkentin
9651f1cddf
Folder Wizard: Decode percent encoding
2013-08-14 19:24:02 +02:00
Daniel Molkentin
5feb9b0806
folderwizard: layout fixes
2013-08-14 19:24:02 +02:00
Klaas Freitag
274da3ad0b
std: Fix uninitialized rc that polutes return value.
2013-08-14 19:03:36 +02:00
Klaas Freitag
44b9ee19e7
Flatten the itemprogressdialog and show a flat list.
2013-08-14 18:24:06 +02:00
Klaas Freitag
cc16d19bc4
Removed unused defines.
2013-08-14 18:24:06 +02:00
Klaas Freitag
b96c2de2b7
Cleaned folder class, removed a couple of signals and helper classes.
2013-08-14 18:24:06 +02:00
Klaas Freitag
f882b80708
Fix wording to more consolidated style, Jan request.
2013-08-14 18:24:06 +02:00
Daniel Molkentin
4d7c014b23
Resize dialog
2013-08-14 17:47:10 +02:00
Daniel Molkentin
1f274699e5
Pressing F12 in Settings now open the log browser
2013-08-14 17:46:58 +02:00
Daniel Molkentin
697e355f07
Hide mono icon options if the resource has no mono icons
2013-08-14 16:35:42 +02:00
Olivier Goffart
f8e6326880
Default to not cancel
...
So that the owncloudcmd client is not blocked
2013-08-14 15:44:30 +02:00
Olivier Goffart
67c5f513aa
Fix compilation after merge
2013-08-14 15:36:34 +02:00
Olivier Goffart
0589bfc51b
Merge branch 'master' into propagator-ng
...
This just fix the conflict.
Do not compile or work yet
Conflicts:
src/CMakeLists.txt
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/owncloudfolder.cpp
src/mirall/syncfileitem.h
test/CMakeLists.txt
2013-08-14 15:19:21 +02:00
Olivier Goffart
04f32bd397
Revert "TMP threaded"
...
This reverts commit 5bb4c3be43 .
2013-08-14 14:59:32 +02:00
Olivier Goffart
e89bdfc422
Make the Pause button stop the sync
2013-08-14 14:57:56 +02:00
Olivier Goffart
c2cc9e62a7
Fix the brandwith limit
...
The unit in mirall are in kbytes/s, but csync expect byte/s
2013-08-14 14:57:56 +02:00
Daniel Molkentin
1f2ae0d061
Folder Wizard UI clean up
...
Input from Jan
2013-08-14 14:01:33 +02:00
Olivier Goffart
91a39588c6
re-enable the sync if the syncing was disabled because the connection is down at startup
2013-08-14 12:59:56 +02:00
Olivier Goffart
a642f86d5b
Detect connection failure from the polling
2013-08-14 12:34:03 +02:00
Olivier Goffart
00cf290574
reduce a bit the log output
2013-08-14 12:34:03 +02:00
Daniel Molkentin
b59952b539
Wrap custom message label
2013-08-14 11:58:03 +02:00
Daniel Molkentin
88b4ff9809
Wording changes proposed by Jan
2013-08-14 11:57:19 +02:00
Daniel Molkentin
ddd0965a82
Fix include after class rename
2013-08-14 11:11:47 +02:00
Klaas Freitag
0a9491ff46
Improved timestamp formatting in item sync progress dialog.
2013-08-14 08:04:46 +02:00
Klaas Freitag
32b44e3d87
Removed unused dialog class.
2013-08-14 08:04:46 +02:00
Klaas Freitag
268004b4ff
Get correct action kind from progress Dispatcher in case of Context
...
kind.
2013-08-14 08:04:46 +02:00
Daniel Molkentin
6c0f6ae62e
Make copy action copy all fields again
...
Fixes #863
2013-08-13 15:39:28 +02:00
Jenkins for ownCloud
094f2bb540
[tx-robot] updated from transifex
2013-08-13 08:12:11 -04:00
Daniel Molkentin
f4da7f1fb0
Merge pull request #857 from Arakmar/hiddenFix
...
Don't add empty entries in hidden files editor with an empty string or when cancel is clicked
2013-08-13 03:43:02 -07:00
Yoann Laissus
b058185d3b
Don't add empty entries in hidden files editor with an empty string
...
or when cancel is clicked
2013-08-12 13:10:16 +02:00
Jenkins for ownCloud
eecb981736
[tx-robot] updated from transifex
2013-08-11 07:07:58 -04:00
Daniel Molkentin
46b870e260
Revert "run tests verbosely"
...
This reverts commit ff2d59d32f .
2013-08-09 14:45:49 +02:00
Olivier Goffart
1ffab7337d
add the temporary downloaded files to the exclude list
2013-08-09 14:10:21 +02:00
Olivier Goffart
82fb8c49cf
Do not clear the pending event in the polling anymore
...
This is useless, and can even cause problems now since polling only do
a sync when the server has actually changed
2013-08-09 14:10:21 +02:00
Daniel Molkentin
ff2d59d32f
run tests verbosely
2013-08-09 13:27:05 +02:00
Daniel Molkentin
0ced165b3e
Add tests for Utility namespace
2013-08-09 13:09:41 +02:00
Daniel Molkentin
d3378c131a
Fix formatting for 1 byte size in octetsToString()
2013-08-09 13:02:24 +02:00
Jenkins for ownCloud
0300a85295
[tx-robot] updated from transifex
2013-08-09 07:01:08 -04:00
Daniel Molkentin
60a116f3e0
Add tests for Utility namespace
2013-08-09 12:56:43 +02:00
Daniel Molkentin
ff4d2d488f
Add cancel button to wizard on Mac
...
Fixes #848
2013-08-09 01:08:46 +02:00
Daniel Molkentin
b0852b4cf5
No ... for entires that do not spawn a dialog
2013-08-08 20:27:16 +02:00
Daniel Molkentin
c047b4d4de
Seems autowrapping doesn't work everywhere. Enforce it
2013-08-08 17:52:09 +02:00
Daniel Molkentin
f054ca3f72
Disable Werror by default, set CSYNC_STRICT=ON to disable
2013-08-08 16:19:44 +02:00
Olivier Goffart
6655da9d24
Fix warning
2013-08-08 16:03:57 +02:00
Klaas Freitag
74b7d441c8
Bump version to 0.81.0
2013-08-08 16:00:20 +02:00
Daniel Molkentin
cc6abfc366
ChangeLog: 1.4.0beta1
2013-08-08 15:51:48 +02:00
Daniel Molkentin
4e3d4c3153
Credits: Add Jan
2013-08-08 15:51:36 +02:00
Klaas Freitag
1df602be26
Updated changelog for 0.81.0
2013-08-08 15:51:30 +02:00
Daniel Molkentin
c323041040
NSIS: install libjpeg for qjpeg4.dll
2013-08-08 15:39:34 +02:00
Daniel Molkentin
95d600c5f1
Fix proxy documentation, explain bandwidth limiter
2013-08-08 14:54:52 +02:00
Olivier Goffart
52a47fbc67
Force a sync run after 5 minutes
2013-08-08 14:32:14 +02:00
Klaas Freitag
4e7c069c1f
Some adds to the architecture documentation.
2013-08-08 14:19:13 +02:00
Klaas Freitag
f89ffa513a
Bump version to 1.4.0beta1
2013-08-08 13:08:23 +02:00
Daniel Molkentin
0086916b4d
Retain all old settings when running the setup wizard
...
Fixes #825
Fixes #759
2013-08-08 13:04:05 +02:00
Klaas Freitag
df5ef6fe67
Added new information icon.
2013-08-08 11:16:28 +02:00
Klaas Freitag
c9e51dcfc1
Display properly elided text in progress.
2013-08-08 11:16:28 +02:00
Daniel Molkentin
c05adfd817
Open Top-Level-Dialogs modal, not semi-modal
2013-08-08 10:36:09 +02:00
Daniel Molkentin
d75f807c01
Send OC-Total-Length
...
As per https://github.com/owncloud/core/issues/4343
2013-08-08 00:48:48 +02:00
Daniel Molkentin
055410e38f
Setup proxy connection before every sync
2013-08-08 00:46:23 +02:00
Daniel Molkentin
6163de378e
Merge pull request #840 from owncloud/network-icon
...
Proper network icon for the nice new settings dialog.
2013-08-07 13:27:00 -07:00
Jan-Christoph Borchardt
22938cd697
Proper network icon for the nice new settings dialog.
2013-08-07 21:04:27 +02:00
Klaas Freitag
2d3272182b
Add correct cast to 64 bit type.
2013-08-07 16:58:46 +02:00
Daniel Molkentin
444946ae79
Fix update test
2013-08-07 16:58:29 +02:00
Daniel Molkentin
6a6bfd1c89
Use proper compiler switch
2013-08-07 16:58:09 +02:00
Daniel Molkentin
a493f81ec2
Windows Installer: Add jpeg,gif,ico image formats
2013-08-07 16:24:10 +02:00
Klaas Freitag
26c0bbd0eb
open test db in test correctly.
2013-08-07 15:39:30 +02:00
Krzesimir Nowak
87cb2a7114
Set busy cursor when doing page loading in browser.
2013-08-07 15:05:42 +02:00
Krzesimir Nowak
a875b46a80
Add cookie handling for Shibboleth credentials.
...
Which cookies are going to be stored are determined only when setting
up or modifying an account. Cookie handling allow us to avoid choosing
Identity Provider everytime when browser page appears.
2013-08-07 15:03:13 +02:00
Krzesimir Nowak
704ba791fd
Fail the sync if we close the browser without passing proper credentials.
2013-08-07 15:03:13 +02:00
Daniel Molkentin
c24d6bd71c
Notify user if there is a problem with the inotify watcher
2013-08-07 15:00:10 +02:00
Daniel Molkentin
9b319cf189
Significantly simply logging
2013-08-07 15:00:10 +02:00
Klaas Freitag
1a9eb19f0d
Fix even more compile warnings.
2013-08-07 14:51:31 +02:00
Klaas Freitag
1943cc60b6
Added missing switch cases to calm compiler warnings.
2013-08-07 14:46:57 +02:00
Jenkins for ownCloud
761c05c358
[tx-robot] updated from transifex
2013-08-07 08:01:30 -04:00
Daniel Molkentin
b08c1ada02
-Wno-long-long required due to Qt headers
2013-08-07 13:19:21 +02:00
Daniel Molkentin
dab17e381c
Merge pull request #836 from krnowak/warnings
...
Add -Wall -Wextra -Wpedantic (or -pedantic) warnings by default.
2013-08-07 04:08:26 -07:00
Krzesimir Nowak
114f66f297
Add -Wall -Wextra -Wpedantic (or -pedantic) warnings by default.
...
This also introduces a MIRALL_FATAL_WARNINGS to enable a -Werror for
GNU compilers and clang.
MSVC compilers are yet to be handled.
2013-08-07 12:54:34 +02:00
Klaas Freitag
0191fa43e0
Fix tests after statedb_open had moved.
2013-08-07 12:43:32 +02:00
Daniel Molkentin
f8878833de
Fix compiler warning
2013-08-07 12:18:44 +02:00
Klaas Freitag
364d4340fd
Show a more informative problem message in progress.
2013-08-07 12:15:28 +02:00
Klaas Freitag
76ee4cb3ba
Add symlinks to the file tree with instruction IGNORE
2013-08-07 12:14:29 +02:00
Klaas Freitag
6226a6ee8f
Enable delete messages for progress display.
2013-08-07 10:28:34 +02:00
Daniel Molkentin
c49edeb09d
Fix regression in FolderWizard over 1.3
...
Now it's possible to also pick subdirectory
of in arbitrary depths again
2013-08-06 21:50:22 +02:00
Klaas Freitag
7e794cd94f
Tell the progress dialog about a new sync result object.
2013-08-06 18:07:59 +02:00
Klaas Freitag
933a62de01
Add recent action entries in correct sequence to menu.
2013-08-06 18:07:31 +02:00
Klaas Freitag
23f8e3b4f8
Allow Delete notification.
2013-08-06 18:06:54 +02:00
Klaas Freitag
3502edf71b
More detailed strings for the progress kind.
2013-08-06 18:06:39 +02:00
Klaas Freitag
4d8a371e43
Display information from SyncResult.
2013-08-06 18:06:05 +02:00
Klaas Freitag
01fd3242c4
Add folder alias to sync result structure.
2013-08-06 18:04:42 +02:00
Klaas Freitag
9c289334e9
Handle notifications for deletes.
2013-08-06 18:04:08 +02:00
Klaas Freitag
7b22972630
Add excluded files to the tree with IGNORE instruction
2013-08-06 18:01:34 +02:00
Klaas Freitag
d88a5e1b11
Rename progress init function to reasonable name.
2013-08-06 15:42:02 +02:00
Krzesimir Nowak
002142539b
Remove most of the dead code in Shibboleth setup page.
...
The effect of most of the code wasn't even visible after making a
browser an independent window.
2013-08-06 14:56:26 +02:00
Krzesimir Nowak
e1d1c10fad
Fix workflow in wizard.
...
Pressing back in third window should show us browser again. Closing
browser window should show us server setup window again.
2013-08-06 14:35:11 +02:00
Klaas Freitag
d585742609
Log if the Etag in the journal is empty.
2013-08-06 12:12:53 +02:00
Klaas Freitag
d910a3af8b
Notify sync start and end always.
2013-08-06 12:12:52 +02:00
Olivier Goffart
6ad2920809
Load the statedb in csync_update rather than in csync_init.
...
This also allow to reduce duplicate code in csync_commit, and ease the
error reporting of csync_commit
csync_commit is supposed to be done after the previous sync, it is
better to open the statedb before the sync
2013-08-06 12:12:52 +02:00
Klaas Freitag
a42d942a35
Finalize progress before error handling.
2013-08-06 12:12:52 +02:00
Klaas Freitag
721443feea
deliver file size with the progress callback in propagate.
2013-08-06 12:12:52 +02:00
Klaas Freitag
ba73405613
Defines for progress start- and end delete.
2013-08-06 12:12:52 +02:00
Klaas Freitag
c89a55984b
Emit start- and end delete progress.
2013-08-06 12:12:52 +02:00
Krzesimir Nowak
577bc546d8
Handle SSL problems also for Shibboleth servers.
2013-08-06 11:56:27 +02:00
Daniel Molkentin
85a832fb7c
NSIS: Add WebKit dll
2013-08-05 23:25:14 +02:00
Daniel Molkentin
045a3f17ba
_USE_GNU -> _GNU_SOURCE
2013-08-05 21:11:14 +02:00
Olivier Goffart
a9f23a8331
Get the etag of all subfolder for the root directory
...
The root directory etag is not updated when the files change.
That's why we need to check the etag of all its sub items
2013-08-05 20:13:39 +02:00
Olivier Goffart
5d24599546
Fetch the etag of the folder to see if it has changed before syncing
...
Notice that this does not work for the toplevel directory yet, as
owncloud does not change the etag of the root folder
2013-08-05 20:13:39 +02:00
Olivier Goffart
07d9d3770b
Refactor: move the pollTimer to the folder
2013-08-05 20:13:39 +02:00
Daniel Molkentin
c9ddb12b5a
Build after merge
2013-08-05 20:14:22 +02:00
Daniel Molkentin
0932ee6051
Merge branch 'shibboleth'
...
Conflicts:
src/CMakeLists.txt
src/mirall/application.h
2013-08-05 19:54:06 +02:00
Daniel Molkentin
ee1b8465a3
Revert "Temporarily log HTTP traffic done by MirallAccessManager."
...
This reverts commit 5930ca8ac7 .
2013-08-05 19:47:48 +02:00
Daniel Molkentin
26bd164168
Safer implementation for substitution of WebDav URL
...
- Use of RegEx is dangerous with folder names
containing e.g. '(' or ')'.
- Didn't work in my case at all.
2013-08-05 19:45:24 +02:00
Krzesimir Nowak
3979d002bd
Add an owncloud-specific redirect callback.
2013-08-05 19:21:38 +02:00
Krzesimir Nowak
00e819bd92
Make sure we don't append several copies of cookies for syncing.
...
Also, make sure we don't append old Shibboleth ones as well.
2013-08-05 18:39:26 +02:00
Krzesimir Nowak
740d33b378
Revert "Go back if browser in wizard is destroyed before getting a cookie."
...
This reverts commit da370c8b36 .
2013-08-05 17:57:32 +02:00
Krzesimir Nowak
f0b284eda7
Refresh Shibboleth cookie if it gets outdated during sync.
2013-08-05 17:42:03 +02:00
Krzesimir Nowak
da370c8b36
Go back if browser in wizard is destroyed before getting a cookie.
2013-08-05 17:29:11 +02:00
Olivier Goffart
203b9c7f6b
leak fix
2013-08-05 16:49:18 +02:00
Daniel Molkentin
7932ec3cc1
IgnoreListEditor: slightly better text
2013-08-05 16:26:17 +02:00
Daniel Molkentin
3f15e02881
Add support for deletable ignores in IgnoreListEditor.
2013-08-05 16:13:26 +02:00
Olivier Goffart
6fb5c04bde
Finish danimo's patch that refactor the scheduler
...
Wait a full poll interval after the end of the sync
2013-08-05 15:15:15 +02:00
Olivier Goffart
578bcc3522
Remove scheduler logic from folderman and moved it in folderman
...
Also fetch and parse the etag when doing a PROPFIND to get the quota
(Patch from danimo)
2013-08-05 15:15:15 +02:00
Daniel Molkentin
99dea76fd1
Fix path display in folder wizard
...
The new implementation did not work correctly when owncloud is installed
in a subdirectory.
2013-08-05 14:28:05 +02:00
Jenkins for ownCloud
b680540adf
[tx-robot] updated from transifex
2013-08-05 06:54:39 -04:00
Klaas Freitag
67f57a443c
Disable unknown csync flags for now.
2013-08-05 12:30:24 +02:00
Klaas Freitag
2b3b4f9daf
Start setup wizard if no config exists on startup.
2013-08-05 12:19:53 +02:00
Klaas Freitag
ba01a697e6
Renamed test case to get rid of stinking name.
2013-08-05 09:39:06 +02:00
Klaas Freitag
16d81db117
Show deletes in progress.
2013-08-05 09:39:06 +02:00
Jenkins for ownCloud
4ce92f1a98
[tx-robot] updated from transifex
2013-08-04 01:26:52 -04:00
Jenkins for ownCloud
21c63637bd
[tx-robot] updated from transifex
2013-08-03 01:27:06 -04:00
Klaas Freitag
18f764e4d5
Fix a typo.
2013-08-02 21:55:09 +02:00
Daniel Molkentin
575874bcbe
asprintf is GNU specific
...
Unless we have a replacement, use _USE_GNU
2013-08-02 15:20:03 +02:00
Daniel Molkentin
8c9799cede
Ignore false-positive compiler warnings
2013-08-02 15:19:41 +02:00
Krzesimir Nowak
5930ca8ac7
Temporarily log HTTP traffic done by MirallAccessManager.
...
To be reverted later.
2013-08-02 14:30:15 +02:00
Klaas Freitag
49be4a3be2
Propagate soft errors into SyncResult, icon fixes.
2013-08-02 14:22:01 +02:00
dragotin
1e50620f53
Merge pull request #822 from RealRancor/master
...
Updated options with missing cl switches - thanks a lot :)
2013-08-02 03:19:24 -07:00
Klaas Freitag
5e82dc1841
Some more refinements on item progress
2013-08-02 12:16:21 +02:00
RealRancor
33d76962a7
Updated options with missing cl switches
2013-08-02 11:59:57 +02:00
Daniel Molkentin
54b8f4d89b
transfer parameter is unused, mute
2013-08-02 11:35:03 +02:00
Klaas Freitag
6ce1c17ee1
Give application class control over itemprogressdialog
2013-08-02 11:33:45 +02:00
Jenkins for ownCloud
8d9b4d3669
[tx-robot] updated from transifex
2013-08-02 01:27:17 -04:00
Krzesimir Nowak
fb79b8a7f8
Omit the server setup page in wizard if URL is overriden by theme.
2013-08-01 19:17:41 +02:00
Krzesimir Nowak
b0236eaa24
Fix folder item being inactive.
2013-08-01 19:11:05 +02:00
Daniel Molkentin
19bbff708e
Improve FolderWizard
2013-08-01 18:22:13 +02:00
Andreas Schneider
4a87a1ee35
tests: Package testfiles as xz archive.
2013-08-01 17:08:19 +02:00
Andreas Schneider
de1df9a6d9
Update ChangeLog.
2013-08-01 17:04:09 +02:00
Klaas Freitag
1399ea13cc
Fixed rounding of size display.
2013-08-01 16:58:36 +02:00
Klaas Freitag
a25d9fd3b4
Added itemprogressdialog class to show the sync progress and problems.
2013-08-01 16:58:36 +02:00
Krzesimir Nowak
72d51e4667
Show browser as independent window instead of putting it into dialog.
...
When browser is shown, dialog is hidden. It reappears after we are
done with logging in.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
f6e3838eb2
Create a QNetworkAccessManager subclass which sets proper user agent and use it.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
c1fdecae2d
Fix misc warnings.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
4104db65bb
Remove unused method.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
36cb827406
Print correct subtitles when modifying account details.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
69a4558fe4
Actually use the remoteFolder sent by signal.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
928eae419f
Hide resolution widget in advanced setup page if nothing has changed.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
50edac8ee8
Split setup page into server and advanced parts.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
945951cda5
Fix indentation.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
fa95a638af
Fill username in HTTP credentials setup page.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
3b6aeb1fc8
Make browser inside Shibboleth wizard page a bit larger.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
6543a01418
Fix warnings emitted by clang.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
9724e52f1b
Fix warnings.
...
Should be now compilable when run with -Wall -Wextra -Wpedantic
-Werror.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
9413a30a08
Fix build when using QtKeyChain.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
6a9a2559d2
Fix shibboleth syncing after client restart.
...
We needed to notify shibboleth-specific QNAM about new cookie and then
stop cramming that cookie into request via setHeader, but rather put
it to cookie jar and let Qt handle the cookie insertion into requests.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
78b6f4df01
Move the creds/ and wizard/ directories one level higher.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
b7e88aa2ef
Fix copyright headers.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
224fd21612
Fix displaying URL in account settings.
...
I deleted too much code there last time.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
a6bf33c501
Make "Connect" button inactive until we get a Shibboleth cookie.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
306a9421fb
Avoid a crash when disposing Shibboleth browser.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
d5885daf0f
Move credential related files to creds directory.
...
CredentialStore is now only used for HTTP credentials, so it was moved
into http directory under creds.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
52b3f7105d
Remove unused stuff.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
7f6dc291c0
Create HTTP credentials object for config without type value.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
eacb849353
Fix credentials handling in csync.
...
CSync module's properties can be set only after it was initialized, so
we split the sync context vfunc into two: the one ran before
initialization and the one ran before sync beginning.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
367bc401ee
Add Shibboleth credentials implementation.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
92af3ea725
Add and use credentials abstraction. Implement HTTP and dummy credentials.
...
To achieve that MirallConfigFile now exports several general
settings-related methods for subclasses (here: for HttpConfigFile), so
it does not have to contain any code targeted for specific
credentials.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
582ce4cfa0
Cleanup setup wizard. Split setup page into two.
...
First page is for giving server URL and advanced setup and second page
is for giving credentials. Second page will differ based on
authentication type supported by ownCloud server. For now only HTTP
credentials are supported.
2013-08-01 16:53:43 +02:00
Klaas Freitag
c321c3dea0
MacOSX: Add a mac specific header to avoid a build warning.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-08-01 16:48:58 +02:00
Klaas Freitag
ed4877c27c
Use strerror_r outside of log functions to avoid warnings.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-08-01 16:48:44 +02:00
Klaas Freitag
702e987505
vio: Fix compile error if WITH_UNIT_TESTING is not defined.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-08-01 16:48:19 +02:00
Klaas Freitag
fafc9bc11a
tests: Moved all ownCloud testfiles into tarball.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-08-01 16:47:56 +02:00
Klaas Freitag
f103e4203d
Set csync version to 0.50.0
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-08-01 16:46:59 +02:00
Thomas Müller
43ae3dfce5
no zh, but zh_CN
2013-08-01 15:32:45 +02:00
Daniel Molkentin
ce851a7a8b
Use wildcards for translations, so they are always up-to-date
2013-08-01 15:28:06 +02:00
Jenkins for ownCloud
b5b7589b41
[tx-robot] updated from transifex
2013-08-01 08:51:42 -04:00
Daniel Molkentin
b638341c14
Merge pull request #821 from owncloud/ts-cleanup
...
Translation cleanup
2013-08-01 05:38:50 -07:00
Thomas Müller
7274417f84
explicit selection and mapping of maguages
2013-08-01 14:06:17 +02:00
Daniel Molkentin
1967226c71
fix networksettings.ui _again_
2013-08-01 13:48:42 +02:00
Thomas Müller
227ea8ed24
kill existing
2013-08-01 13:23:21 +02:00
Olivier Goffart
6766f41bf5
Add a hook in httpbf to do the logging
2013-08-01 13:13:05 +02:00
Olivier Goffart
3cc41db0bd
Fix warning with clang
...
/usr/include/features.h:330:4: error: _FORTIFY_SOURCE requires compiling
with optimization (-O) [-Werror,-W#warnings]
# warning _FORTIFY_SOURCE requires compiling with optimization (-O)
2013-08-01 13:13:05 +02:00
Andreas Schneider
354ef5e771
client: Fix strtol error check.
2013-08-01 10:37:02 +02:00
Klaas Freitag
38403f3343
Fix compile warning.
2013-08-01 09:59:48 +02:00
Klaas Freitag
59a133fe03
Fix logging for cross platform.
2013-08-01 09:41:17 +02:00
Klaas Freitag
0524613a57
Removed end up- and download notification, done in propagate.
2013-08-01 09:30:13 +02:00
Jenkins for ownCloud
e705db8339
[tx-robot] updated from transifex
2013-08-01 01:26:44 -04:00
Klaas Freitag
344ea661c9
Add more logging to chunking routines.
2013-07-31 16:26:28 +02:00
Daniel Molkentin
d9b34121ae
Fix OS X build with -Werror
2013-07-31 14:50:44 +02:00
Daniel Molkentin
8d99364d63
Eliminate all warnings
...
- use proper casts
- use aproproate types
- offer to build with -Werror
- make printf attribute hinting gnu format style
- remove unused helper methods
- begin to use inttyes.h macros where suitable
- move var declarations to the beginning of the method
- properly use _FILE_OFFSET_BITS
- silence variables unused depending on the define
2013-07-31 13:12:10 +02:00
Daniel Molkentin
be65f78174
Fix win32 installer
2013-07-31 08:35:13 +02:00
Daniel Molkentin
fd6a17f3e6
Add journal and temp journal to ignore file
...
csync ignores them anyway, but inotify and other
watchers don't.
2013-07-31 08:35:13 +02:00
Jenkins for ownCloud
0353d7b6a6
[tx-robot] updated from transifex
2013-07-31 01:26:54 -04:00
Klaas Freitag
a64724be0e
More sophisticated progress, add Recent Changes Menu to tray.
...
ProgressDispatcher now stores a queue of events as well as sync
problems, better known as soft errors. The tray menu displays a
sub menu with 5 recent changes and adds a more... button that
shows a warning icon if soft errors had happend.
More to implement.
2013-07-30 22:24:48 +02:00
Klaas Freitag
a0d9d41455
Use const reference parameters for custom struct parameters.
2013-07-30 22:24:48 +02:00
Klaas Freitag
84e8ab5b71
Make progress aware of errors, first step.
2013-07-30 22:24:48 +02:00
Daniel Molkentin
228641763b
Fix compilation on w32
2013-07-30 18:17:50 +02:00
Olivier Goffart
4f5bfbdb78
Use int64_t instead of off_t
...
off_t is 64 or 32 bit depending on the architecture and the defines for
large file support. It is better to always use int64_t which is always
64 bits
2013-07-30 16:33:19 +02:00
Markus Goetz
f5bbb12434
Crash hotfix, need to dig down actual cause
2013-07-30 15:49:57 +02:00
Jenkins for ownCloud
a07d2cddd2
[tx-robot] updated from transifex
2013-07-30 07:57:21 -04:00
Andreas Schneider
7247eed4ac
exclude: Try another fix for NULL termination.
...
Hopefully Coverity understand this better.
CID: #996807
2013-07-30 10:42:15 +02:00
Andreas Schneider
b3bf209ca0
std: Fix stat timing problems.
...
CID: #1032801
2013-07-30 10:38:32 +02:00
Andreas Schneider
5e0cd2276c
owncloud: Fix #ifdef mess.
2013-07-30 09:50:14 +02:00
Andreas Schneider
4ad8826f8a
config: Fix a memory leak.
2013-07-30 09:42:14 +02:00
Klaas Freitag
c86e2ed2cf
Added some points to the Changelog.
2013-07-30 09:32:10 +02:00
Klaas Freitag
fed0eefde3
client: Add better implementation of atoi for numeric arguments.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-30 09:31:14 +02:00
Klaas Freitag
6ef2b25bff
owncloud: Fix compile warnings if NDEBUG is not defined.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-30 09:23:22 +02:00
Klaas Freitag
2fcfe883eb
Proper error reporting for HBF PUT fails.
2013-07-30 08:56:53 +02:00
Klaas Freitag
d53a3f2f98
Only log when really something was transmitted.
2013-07-29 15:27:22 +02:00
Olivier Goffart
acc0b53916
Added a comment in the exclude list config file
2013-07-29 15:04:00 +02:00
Olivier Goffart
af7e36422e
Add ignore files that need cleanup
...
Add the possibility to ignore files but specify they should be deleted
if the directory is deleted.
2013-07-29 15:03:25 +02:00
Olivier Goffart
45c98bad19
fix crash
2013-07-29 15:03:05 +02:00
Klaas Freitag
1e1df5d94d
ownCloud: Add a log entry when chunk is uploaded.
2013-07-29 14:27:01 +02:00
Andreas Schneider
d80da2a088
LICENSE: Change license of libcsync from GPL to LGPL.
...
All contributors have agreed to change the license of libcsync to LGPL.
2013-07-29 14:04:37 +02:00
Andreas Schneider
b6f9fdb96e
cmake: Remove iniparser dependency.
...
BUG: https://open.cryptomilk.org/issues/5
2013-07-29 09:56:38 +02:00
Andreas Schneider
314664a1fd
csync: Use new config parser.
2013-07-29 09:56:19 +02:00
Andreas Schneider
acf3dc6aff
config: Implement a new config parser.
2013-07-28 23:16:04 +02:00
Daniel Molkentin
f1878640c8
Linux: install all available icon sizes
2013-07-27 13:06:38 +02:00
Klaas Freitag
edf8147561
Small cleanups.
2013-07-26 15:10:03 +02:00
Klaas Freitag
3a9ab3a86f
Consolidated progress displaying to a single slot from csync.
2013-07-26 13:44:38 +02:00
Klaas Freitag
2cc5bbe187
ownCloud: Some fixes to promote the correct progress.
2013-07-26 13:43:02 +02:00
Klaas Freitag
6aa7a62ee0
client: Check if optarg is different from NULL before dereferencing.
...
CID 968159
2013-07-25 17:46:55 +02:00
Klaas Freitag
35461db4e9
std: Do size compare based on fstat after opening the files.
...
CID: #996804
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-25 17:46:46 +02:00
Klaas Freitag
8f912ca0c5
Adopt to new progress API in csync, WIP
2013-07-25 16:28:45 +02:00
Andreas Schneider
5d34417e76
exclude: Make sure the buffer is null terminated.
...
CID: #996807
2013-07-25 15:47:16 +02:00
Klaas Freitag
0a15f0e7ad
New progress API: Consolidate to one progress Callback having all info.
...
Before there were two callbacks, one for the individual file and one for
for the overall progress. Now its more easy and clean.
2013-07-25 15:36:46 +02:00
Olivier Goffart
a827056d28
Fix upload limit
2013-07-25 11:21:02 +02:00
Klaas Freitag
6c90989584
Make progress display more robust.
2013-07-25 11:00:19 +02:00
Olivier Goffart
f06fead44f
fix test
2013-07-25 10:55:57 +02:00
Daniel Molkentin
08acf5e9aa
Network Settings: Reword entries, fix uic warnings
2013-07-25 10:41:44 +02:00
Andreas Schneider
45cfcfc383
cmake: Pass _FORTIFY_SOURCE only to the precompiler.
2013-07-25 10:00:41 +02:00
Andreas Schneider
29a0c4ac35
tests: Update valgrind suppressions file.
2013-07-25 09:53:24 +02:00
Andreas Schneider
b3ae26c6d2
tests: Load the sftp module for vio testing.
...
This has no memory leaks unlike smbclient.
2013-07-25 09:52:58 +02:00
Andreas Schneider
d454a261ce
owncloud: Fix a build warning.
2013-07-25 08:39:46 +02:00
Andreas Schneider
dbd242442f
update: Make sure ulen is initialized.
2013-07-25 08:36:23 +02:00
Daniel Molkentin
bca295183b
Make use of bandwidth limiting, split general/network settings.
...
Fixes #14
2013-07-24 19:53:20 +02:00
Olivier Goffart
3d1994747a
Also allow to specify a % of bandwidth for the limit
2013-07-24 18:17:59 +02:00
Olivier Goffart
6109b22aa6
Implement bandwidth limitation
2013-07-24 18:17:54 +02:00
Markus Goetz
a400a2e0bb
OS X: Fix window messup
2013-07-24 17:06:35 +02:00
Klaas Freitag
452b0e96ec
vio: Fix compile warning if compiled without testing.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-24 16:35:43 +02:00
Klaas Freitag
03685bd15b
owncloud: Fix compile warnings if NDEBUG is not defined.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-24 16:34:51 +02:00
Klaas Freitag
9c09c1f1cb
owncloud: Removed malicious logging.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-24 16:33:19 +02:00
Klaas Freitag
570566d1de
tests: Use correct setup method for ftw check.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-24 16:07:12 +02:00
Andreas Schneider
c00e401306
update: Make sure we don't have an invalid path pointer.
2013-07-24 16:01:00 +02:00
Andreas Schneider
7d1a61d68d
cmake: Set nightly start time to UTC.
2013-07-24 16:01:00 +02:00
Daniel Molkentin
8c15839753
Remove all >= Qt 4.7 ifdefs
2013-07-24 15:34:37 +02:00
Klaas Freitag
810024f4c9
Reworked progress display for more performance.
...
Moved most of the logic to the dialog class to be able to only update
the GUI if there are really changes rather than doing it whenever a
change happens.
2013-07-24 14:40:47 +02:00
Klaas Freitag
de7bcca5fe
Fixed signal and slot parameter list for progress.
2013-07-24 14:40:47 +02:00
Klaas Freitag
6552a48639
Make compactFormatDouble a bit smarter.
2013-07-24 14:40:47 +02:00
Daniel Molkentin
aee0f0c882
make addFolderDefintion easier to read
2013-07-24 14:27:57 +02:00
Daniel Molkentin
e353193fbb
FolderMan: Remove dead code
2013-07-24 14:23:32 +02:00
Daniel Molkentin
fb547e9100
Fix/compactify comments in folderman.h
2013-07-24 14:16:52 +02:00
Markus Goetz
44289c8781
OS X: Fix compile
2013-07-24 14:08:16 +02:00
Daniel Molkentin
d4a5ab252d
Drop Compat with Qt 4.6
...
We now require Qt 4.7 due to QNAM
2013-07-24 13:59:03 +02:00
Olivier Goffart
09e30509d1
Propertly report the error from the server while uploading
2013-07-23 17:40:44 +02:00
Olivier Goffart
75682f981d
Add a threshold to httpbf before splitting the files
2013-07-23 17:31:31 +02:00
Klaas Freitag
8e1c8a3ea8
client: Fix a build warning of used userdata parameter.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 17:31:11 +02:00
Olivier Goffart
7a8b07443f
Fix cases where the file has been replaced by another with the same mtime
...
IL issue 169
2013-07-23 16:03:50 +02:00
Daniel Molkentin
a3b3c28694
CSyncThread: Fix unreachable code
2013-07-23 14:34:06 +02:00
Klaas Freitag
976c41a3b8
Beautified ProgressDispatcher
2013-07-23 13:32:33 +02:00
Daniel Molkentin
da087292fd
First version of progress in the context menu
2013-07-23 13:19:17 +02:00
Klaas Freitag
274f59f93b
Reworked progress again following mirall bug #137
2013-07-23 12:23:29 +02:00
Klaas Freitag
85d810d2cf
Rename signal from folderProgress to itemProgress.
2013-07-23 12:23:20 +02:00
Klaas Freitag
f47e8c4506
cmake: Disable cmake iconv check on win32.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:59:29 +02:00
Klaas Freitag
ab6ac22582
std: Cleanup utf8_from and to_locale function, added mem checks.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:57:37 +02:00
Klaas Freitag
fe706dc8f9
cmake: Check for existing header file in neon cmake module.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:52:49 +02:00
Klaas Freitag
db6b5131cc
propagate: Base overall progress data on both trees rather than one.
...
The overall sum of files to transmit has to be calculated over both
trees. Therefore a utility function was written which is called from
the csync_propagate_files main function.
Moreover, the current file number counter in overall progress now ranges
from 1..n rather than 0..n-1.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:52:27 +02:00
Klaas Freitag
05a62bb41f
csync: Add userdata parameter to the overall progress callback.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:45:17 +02:00
Klaas Freitag
0c3becfdb6
cmake: Fix make install on win32 platform.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:41:41 +02:00
Klaas Freitag
ba2963b388
tests: Use multibyte safe function.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:40:09 +02:00
Klaas Freitag
4f45381920
owncloud: Also pass user from commandline.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:39:14 +02:00
Klaas Freitag
939b262766
smb: Handle username given on command line correctly.
...
Only ask for password if username is specified.
BUG: https://open.cryptomilk.org/issues/13
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:36:43 +02:00
Klaas Freitag
a390444666
tests: Removed unused test file.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:34:47 +02:00
Klaas Freitag
7417d6a830
tests: Modularize ownCloud's integration test script.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:33:32 +02:00
Klaas Freitag
2143959f03
vio: Do not dereference again, it's already the method_handle.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:33:09 +02:00
Klaas Freitag
9d1e020970
owncloud: Use correct namespace for fixing modification times.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:32:22 +02:00
Klaas Freitag
af3beca746
tests: Added test data for the owncloud integration test script.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:32:01 +02:00
Klaas Freitag
35ebf70ad1
owncloud: Clear the stat cache on close to force a new stat call.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:31:40 +02:00
Klaas Freitag
9f9209bba0
lock: Use wide char types for lock functions.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-23 07:31:16 +02:00
Daniel Molkentin
47f151c594
FolderWizard: Return targetPath properly
2013-07-22 23:14:41 +02:00
Daniel Molkentin
7b5ef2186e
Remove accidential change
2013-07-22 23:14:12 +02:00
Daniel Molkentin
8236dafb96
INotify backend: honor ignored files
...
Actually this needs a careful redesign,
but this is good enough to fix the issue.
Fixes : #763
2013-07-22 21:39:13 +02:00
Daniel Molkentin
56e5627b6b
ownCloudFolder -> Folder
...
Fixes #769
2013-07-22 20:30:38 +02:00
Daniel Molkentin
38db0eddab
Make selection of target ListView-based
...
Fixes #222
2013-07-22 18:07:44 +02:00
Daniel Molkentin
710625e2a3
Spelling bee
2013-07-22 18:06:27 +02:00
Klaas Freitag
70495d3ede
client: Don't call strdup on NULL.
...
CID: #968159
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:54:02 +02:00
Klaas Freitag
78605ac6cc
exclude: Fix a double close().
...
CID: #996802
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:53:10 +02:00
Klaas Freitag
def897ca67
exclude: Use mbchar to open exclude file.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:51:26 +02:00
Klaas Freitag
cd0b85dec5
exclude: Preinitialize memory with zero.
...
CID: #996807
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:48:20 +02:00
Klaas Freitag
40d1498fc3
owncloud: Fix possible NULL pointer dereferences.
...
CID: #996808
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:46:54 +02:00
Klaas Freitag
722a556a90
std: Fix a memory on error in c_compare_file().
...
CID: #996811
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:39:23 +02:00
Klaas Freitag
f552637ffd
owncloud: Fix a possible null pointer dereference.
...
CID: #996827
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:38:55 +02:00
Klaas Freitag
4be88b68cc
csync: Fix possible null pointer dereferences in tree walkers.
...
CID: 1032801
CID: 1032804
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:38:55 +02:00
Klaas Freitag
0876c18ec9
std: Fix a memleak on error in c_iconv().
...
CID: #1032806
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:38:39 +02:00
Klaas Freitag
7c4c7f1b04
std: Fix memleak on error in c_rename().
...
CID: #1032807
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:11:57 +02:00
Klaas Freitag
047cf69f1e
std: Fix file descriptor checks.
...
CID: #1032809
CID: #1032808
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-22 15:11:51 +02:00
Daniel Molkentin
a5e7af6c1f
Make FolderMan a singleton
...
It doesn't "belong" to application (think about lib use cases).
This is better.
2013-07-22 13:59:52 +02:00
Klaas Freitag
917cc7faab
Base overall progress data on both trees not just one
2013-07-22 12:55:24 +02:00
Daniel Molkentin
5fe4d2db2b
Introduce MirallConfigFile::save/restoreGeometry()
2013-07-22 12:28:43 +02:00
Daniel Molkentin
b2c587e2f8
Settings: Show overall state as account icon
...
Requires the previous refactoring commit
2013-07-22 12:11:12 +02:00
Daniel Molkentin
40c2d891c1
Refactor sync result
...
Sync result computation is now owned by FolderMan
2013-07-22 12:10:13 +02:00
Klaas Freitag
d5ad3a8a70
Removed mistakenly checked in file.
2013-07-22 09:47:15 +02:00
Daniel Molkentin
c74382af4f
octetsToString: Add TB case to pretty printer
2013-07-20 01:27:41 +02:00
Daniel Molkentin
0be0111724
Use WA_DeleteOnClose for settings
...
instead of trying brain dead things
2013-07-20 01:27:00 +02:00
Daniel Molkentin
f0d454b511
Ignore list editor fixes
2013-07-20 01:26:11 +02:00
Daniel Molkentin
b79a45403e
Implement UI changes discussed with Jan.
...
Fixes #785
Fixes #782
Fixes #781
2013-07-19 22:14:21 +02:00
Klaas Freitag
1cc60e755b
Rather show overall progress in settings dialog.
2013-07-19 17:05:46 +02:00
Klaas Freitag
a12782dccf
Add callback parameter and call overall progress bar for initialization.
2013-07-19 17:04:31 +02:00
Klaas Freitag
59ed14698c
Fix header
2013-07-19 17:04:13 +02:00
Daniel Molkentin
7fb7cc8c46
Don't hardcode strings, use constants instead
...
This hopefully reduces the chances for
regressions during refactoring.
2013-07-19 16:28:12 +02:00
Daniel Molkentin
1400889b23
Small cleanups
2013-07-19 16:28:12 +02:00
Daniel Molkentin
44fa9bd141
remove skip save pwd parameter -- not used any longer
2013-07-19 16:28:12 +02:00
Klaas Freitag
992dffa032
Add an overall progress counter to progressDispatcher
2013-07-19 13:05:30 +02:00
Klaas Freitag
45cdcb7502
Add a progress callback for overall and individual file up and download
...
progress.
2013-07-19 12:26:48 +02:00
Klaas Freitag
5fa7e48c24
Do not show the frame around the progress.
2013-07-19 11:07:47 +02:00
Klaas Freitag
3b00dfebed
Add a textual display of the file size in progress.
2013-07-19 10:04:09 +02:00
Klaas Freitag
b42c7e07e6
More work on progress display of file up and download.
...
This is at least working for file upload, untested for downloads
and other operations. Needs more testing and more polish.
2013-07-17 22:34:11 +02:00
Markus Goetz
ab7bfabf12
Put cookies into csync
...
We already have the auth cookies from the quota request,
so put them into csync to avoid a 401 roundtrip
2013-07-17 16:27:18 +02:00
Markus Goetz
ab72644ace
Check if quota request had HTTP 207
2013-07-17 15:08:48 +02:00
Daniel Molkentin
218fa040c8
Reduce thread priority
2013-07-16 16:05:37 +02:00
Daniel Molkentin
b8f783f104
Set proxies and ignored files before every sync run
2013-07-16 16:05:04 +02:00
Olivier Goffart
fdd1f885a1
Fixup previous commit.
...
We should not overwrite the error
2013-07-16 13:34:59 +02:00
Olivier Goffart
db7e8560cf
Mark parent directory as error if a file fails to download
...
The result is that we do not save the parent directory in the db
(recursively) so on the next sync, we don't read this directory from the
db as there might be missing entries since download error are not saved
in the db.
2013-07-16 13:34:47 +02:00
Olivier Goffart
6beb96293f
Do not save for resume if there is an error from the server
...
errors (such as 500) may mean the the server do not suport
resuming
2013-07-16 13:34:22 +02:00
Markus Goetz
1263ca990d
Fix download resuming on OS X
2013-07-16 13:33:55 +02:00
Klaas Freitag
e12adbcc7e
Rather use _fstat64 on win32 for proper size types.
2013-07-16 13:32:40 +02:00
Klaas Freitag
32559175c9
Use correct stat struct on all platforms.
2013-07-16 12:22:52 +02:00
Daniel Molkentin
6882880ba7
Add csync_clear_exclude_list
...
This requires the introduction of c_strlist_clear(),
which does not destroy, but only clear a string list.
2013-07-15 14:37:18 +02:00
Daniel Molkentin
ae2e3e7fb1
Remove autostart option from Windows installer
...
now handled by the application
2013-07-15 11:05:14 +02:00
Andreas Schneider
866af5bf24
std: Add missing includes for memset and uintptr_t.
2013-07-15 08:05:19 +02:00
Andreas Schneider
73fa5f2224
std: Fix const handling on Linux and BSD.
2013-07-14 16:01:51 +02:00
Andreas Schneider
7c9de0230f
cmake: Fix names of the include dirs.
2013-07-14 15:57:30 +02:00
Andreas Schneider
341e0e8967
cmake: Fix iconv detection on FreeBSD.
2013-07-14 15:51:09 +02:00
Andreas Schneider
bdb3772e8f
cmake: Fix argument order of get_filename_component().
2013-07-14 15:39:40 +02:00
Andreas Schneider
5599573e2f
cmake: Fix getting filename components.
2013-07-14 15:38:10 +02:00
Andreas Schneider
6b189316ab
cmake: Require at least version 3.3.9 for sqlite3_prepare_v2().
2013-07-13 09:17:40 +02:00
Andreas Schneider
1bae4f4dd4
Revert "CID 1033194: Fix resource leak in stateedb test."
...
This reverts commit c40a3844e0 .
There is no leak and we expect it to be NULL. Since we fork here, it
doesn't matter if we leak memory in this case.
2013-07-13 08:57:56 +02:00
Daniel Molkentin
edd9d9aee3
Fix disabled state _again_
...
Seems like a bug in Designer
2013-07-12 18:05:59 +02:00
Klaas Freitag
207ee9955f
Dealloc the query cache in statedb_close
2013-07-12 16:37:33 +02:00
Klaas Freitag
365fb2a5fe
Optimize the get_stat_by_hash function.
2013-07-12 16:22:58 +02:00
Daniel Molkentin
8c66085621
Folder wizard: Warn if a chosen dir is read-only
...
Fixes #755
2013-07-12 13:54:20 +02:00
Klaas Freitag
40ab325a37
Cleaned up credentialstore class a bit.
...
Removed all "user mode" stuff from the class that was used to ask the
user interactively for the password. We do not do that any more.
2013-07-12 12:22:11 +02:00
Klaas Freitag
7ae95b14f4
Added method to check if the password is in the config file.
2013-07-12 12:21:34 +02:00
Klaas Freitag
9046df8985
CID 1032811: Fix resource leaks on error.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-12 12:09:49 +02:00
Klaas Freitag
4c1106066a
CID 1032813: Add missing break statement.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-12 12:09:01 +02:00
Klaas Freitag
38f19a6ada
CID 1032814: Don't deref a NULL pointer in _csync_walk_tree().
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-12 12:08:03 +02:00
Klaas Freitag
be58f3a64e
CID 1032816: Leave the ownership of the buffer to the calling function.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-12 12:06:30 +02:00
Klaas Freitag
5d731f7530
CID 1033193: Fix resource leaks in statedb test.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-12 12:05:38 +02:00
Klaas Freitag
c40a3844e0
CID 1033194: Fix resource leak in stateedb test.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-12 12:03:51 +02:00
Andreas Schneider
9382a047ae
cmake: Update FindNeon and add support for version checking.
2013-07-12 11:57:07 +02:00
Klaas Freitag
4aa0c58bb0
Remove duplicate close, coverity found.
2013-07-12 11:41:51 +02:00
Klaas Freitag
c082a3f763
Preinitialize buf with zero, coverity found.
2013-07-12 11:41:51 +02:00
Klaas Freitag
ebc98f07c3
Cleaned code a bit, covertiy found.
2013-07-12 11:41:51 +02:00
Klaas Freitag
90873a9ae8
Release memory properly in error case, Coverity found.
2013-07-12 11:41:51 +02:00
Klaas Freitag
566f5ce614
Close fd even if its zero. Coverity Found.
2013-07-12 11:41:50 +02:00
Andreas Schneider
c1e02db882
BUG 16: Correctly include iconv headers.
2013-07-12 11:32:15 +02:00
Andreas Schneider
81df0406eb
cmake: Rewrite FindIconv from scratch.
...
This version supports BSD correctly.
2013-07-12 11:31:46 +02:00
Klaas Freitag
d0edcd1fba
Better do not use the var name abort as it confuses syntax highlighter.
2013-07-11 17:01:49 +02:00
Klaas Freitag
5da6103fb5
Documented the docexpire option.
2013-07-11 12:32:58 +02:00
Klaas Freitag
6b5b9db20a
Handle progress through ProgressDispatcher class, WIP.
2013-07-11 12:32:58 +02:00
Daniel Molkentin
eb39d144e4
Use default cookie jar again
2013-07-10 18:59:01 +02:00
Daniel Molkentin
cfaaf4a2c4
Don't always send Auth headers
...
Use slotAuthentication again instead.
2013-07-10 18:57:52 +02:00
Daniel Molkentin
279a738aa6
General Settings: Fix spacing in layout
2013-07-10 12:46:43 +02:00
Olivier Goffart
52c7ff415e
Fix the test
...
After commit a25fbb6160 , we re compute the
hash before insterint into the db. Which means that the test need to
have different paths in order to succeed
2013-07-10 12:15:53 +02:00
Olivier Goffart
c20a2bf16b
Add a way to configure the block size for httpbf
2013-07-10 12:15:11 +02:00
Daniel Molkentin
d22eb0ceef
win32: Read inode values even though file is open
...
According to MSDN, CreateFile can be passed 0 if only
stat-like info is required.
This allows to upload locked files.
2013-07-10 11:19:07 +02:00
Daniel Molkentin
10b55f11a2
Fix build for Qt <= 4.6
2013-07-10 09:48:10 +02:00
Daniel Molkentin
25065c4151
Remember geometry of LogBrowser
2013-07-10 09:34:41 +02:00
Daniel Molkentin
d2657bc154
Do display floating points with precision of 1
...
For several GB of quota, we might end up showing
<1% far too long. So show one decimal number,
unless it's zero.
2013-07-10 09:34:41 +02:00
Daniel Molkentin
4fde3f4a65
Quota in Account Settings: properly round value
2013-07-10 09:34:41 +02:00
Daniel Molkentin
e398cfb27c
Introduce Utility::compactFormatDouble()
...
Like QLocale::toString(double, 'f', prec), but drops trailing
zeros after the decimal point.
2013-07-10 09:34:27 +02:00
Daniel Molkentin
3cc670ec29
Send non-standard port along with host
...
In QNAM, that's actually the default,
and we were overriding it incorrectly
for no obvious reason. When using the
QHTTP fallback, we need to submit a
non-standard port manually.
Fixes #748
2013-07-10 08:43:10 +02:00
Klaas Freitag
4489eb6cc0
Allow newly created database in test.
2013-07-09 17:31:06 +02:00
Markus Goetz
c8d9e8458a
OS X: Find out if we are a startup item
2013-07-09 17:30:50 +02:00
Klaas Freitag
b7d549e5a0
Check for zero size database file.
2013-07-09 17:30:40 +02:00
Markus Goetz
892419e880
OS X: Ability to disable startup item
2013-07-09 17:13:41 +02:00
Olivier Goffart
a25fbb6160
Save the right filename in the DB when there are new files on a renamed folder
2013-07-09 16:30:09 +02:00
Olivier Goffart
68a427d7e4
Make sure the directory after a rename has a md5
...
If not when we do a read from db later, the updater will beleive the
directory is no longer on the server
2013-07-09 16:29:21 +02:00
Olivier Goffart
73ef2c1b6f
Do RENAMES before any PUT
...
In order to fix mirall issue #731
where one rename a file then re-create the original
2013-07-09 16:29:03 +02:00
Markus Goetz
13fb49cf39
Make Jenkins happy
2013-07-09 14:23:58 +02:00
Markus Goetz
eabe3f968e
Raise settings dialog when creating
...
Else at least on OS X it is burried somewhere.
2013-07-09 14:18:23 +02:00
Markus Goetz
2ca5eaaab9
utility.cpp: Make compile on OS X
2013-07-09 14:07:48 +02:00
Klaas Freitag
5f0f49b5bd
Use new c_rename function.
2013-07-09 11:13:58 +02:00
Klaas Freitag
3a51c9ce8b
Added rename function to csync library.
2013-07-09 11:11:49 +02:00
Andreas Schneider
98ea781550
std: Define ENODATA if not present.
...
Fix for FreeBSD.
2013-07-08 18:28:37 +02:00
Klaas Freitag
0682dfbc38
c_parse_uri: Handle out of memory condition with ENOMEM.
...
Fixes https://open.cryptomilk.org/issues/13
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-08 15:51:48 +02:00
Klaas Freitag
bf6a0ea68e
Use unsuspicous var name to not confuse syntax highlighter.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-07-08 15:51:41 +02:00
Daniel Molkentin
eed3deac67
Acount Settings: Enable in place password change
2013-07-08 14:49:01 +02:00
Daniel Molkentin
a63863b65c
Detect missing system tray
...
Fixes #497
2013-07-08 14:48:58 +02:00
Daniel Molkentin
748ff13bce
Utility::freeDiskSpace()
...
Does not yet work for UNC locations
2013-07-08 14:48:17 +02:00
Klaas Freitag
c1a73564f5
Fix for coverity CID 1029795
2013-07-08 12:26:44 +02:00
Klaas Freitag
2befdf50da
Fix coverity CID 1029796
2013-07-08 12:26:44 +02:00
Daniel Molkentin
6c7700c2e7
Save size of settings dialog
...
Fixes #541
2013-07-08 04:01:36 +02:00
Daniel Molkentin
c8ccb014c8
Use plural form for sync notification
...
Fixes #419
2013-07-08 03:19:49 +02:00
Daniel Molkentin
f1bd14e8de
Remove superflous cast
2013-07-08 01:44:49 +02:00
Daniel Molkentin
024d01a192
Cleanly install themed clients next to owncloud on Unix
...
- Renames libowncloudsync for themes
- Properly names i18n dir
2013-07-08 01:44:49 +02:00
Daniel Molkentin
b2d02ef0bd
Improve labeling in case of root sync
2013-07-07 01:24:56 +02:00
Daniel Molkentin
751d7deda6
Utility: Compile on Windows again
...
Theme moc files belong with libowncloud
2013-07-06 22:42:02 +02:00
Daniel Molkentin
fff795146e
Make Utility::*Startup* testable
2013-07-06 22:41:59 +02:00
Klaas Freitag
6898d96a5c
Do not store userdata but retrieve dynamically through csync API.
2013-07-05 18:43:29 +02:00
Klaas Freitag
82569559cc
Added function to retrieve the progress callback.
2013-07-05 18:41:41 +02:00
Daniel Molkentin
c6219581f6
More work on ignore/exclude files:
...
- Introduce split between sytem and user files
- Add Editor
Current limitation: Picking up the changes requires
a restart
2013-07-05 16:54:11 +02:00
Klaas Freitag
d0c5fb2395
Check connection at startup through ConnectionValidator
2013-07-05 13:14:48 +02:00
Klaas Freitag
6c2c81dc83
Format integer to string.
2013-07-05 11:40:44 +02:00
Daniel Molkentin
bfdb0c0012
Enable autostart when the client has been configured
2013-07-05 01:05:23 +02:00
Daniel Molkentin
d870d6c326
Implement "Show Desktop Notifications" option (default: on)
...
Should make #314 subscriber happy :-)
2013-07-05 01:01:23 +02:00
Daniel Molkentin
c06410e726
Implement Launch on Startup (Win, Linux).
...
Mac OS started. Untested.
2013-07-05 00:25:19 +02:00
Daniel Molkentin
ef03ebe086
Remove obsolete include
2013-07-04 20:43:20 +02:00
Daniel Molkentin
a217e8f24c
Compile fix
2013-07-04 20:21:40 +02:00
Daniel Molkentin
c164beb040
Commit squashed refactoring branch
...
- introduce settings dialog
- general settings for general / proxy settings
- standalone proxy settings dialog removed
- standalone status dialog removed
- moved status dialog into settings dialog
- radically cut down links in context menu
- add help link to context menu
This needs more cleanup and testing. Known issues:
- When the wizard is called while the settings dialog
is open, it will not show old information (see FIXME)
- Some settings are not implemented yet (greyed out)
- The counter in the FileItemDialog is not correct the
first time around.
Based on the discussion done with Jan and Klaas during the
Nuenberg workshop.
2013-07-04 20:02:44 +02:00
Klaas Freitag
5f9913570a
std: Handle NULL pointer argument in c_dir() correctly.
2013-07-04 15:13:39 +02:00
Klaas Freitag
e5089943ba
std: Check c_dir() not just with NULL.
2013-07-04 15:13:03 +02:00
Andreas Schneider
bd6608a33d
tests: Refactor treewalk test.
2013-07-04 15:11:26 +02:00
Andreas Schneider
8f7900ee8f
statedb: Make sure we call sqlite3_close on a valid pointer.
2013-07-04 12:26:22 +02:00
Andreas Schneider
47b436c279
vio: Add missing internal prototype.
2013-07-04 12:17:02 +02:00
Andreas Schneider
bfdd73a0bc
statedb: Fix a build error.
2013-07-04 12:16:47 +02:00
Andreas Schneider
cd23f8d2d1
CID 1033195: Fix resource leak.
2013-07-04 11:57:31 +02:00
Andreas Schneider
bd6a66d51e
tests: Fix a resource leak.
2013-07-04 11:55:55 +02:00
Klaas Freitag
cb65273ef9
statedb: Check db integrity and only overwrite the old on success.
2013-07-04 11:40:23 +02:00
Klaas Freitag
64925efe18
std: Fix resource leak and return code of win32 copy function.
2013-07-04 11:36:10 +02:00
Klaas Freitag
f8e31b95b1
tests: Remove the db before db_none test to meet the test condition.
2013-07-04 11:34:43 +02:00
Klaas Freitag
fb48813f15
owncloud: Use the new get/put methods of file up- and download.
2013-07-04 11:30:54 +02:00
Andreas Schneider
a1628c8111
vio: Make csync_vio_getfd() useable by the module.
2013-07-04 11:30:54 +02:00
Klaas Freitag
12bca2789a
propagate: Use get/put methods for file up- and download.
2013-07-04 11:30:54 +02:00
Klaas Freitag
fbfa3426e2
tests: Fix multibyte stat().
2013-07-04 11:30:54 +02:00
Klaas Freitag
ec6f40c84e
vio: Add new function csync_vio_put and csync_vio_put.
...
With that, modules can implement get and put functions to up- and
download files from or to a given file descriptor. That is just an
alternative way of the usual read/write way that is still there
of course.
If a module wants to implement get and put, it has to set its
capabilities to true.
2013-07-04 11:30:48 +02:00
Klaas Freitag
527da08d3b
src: Add function csync_vio_local_getfd().
2013-07-04 10:48:03 +02:00
Klaas Freitag
123472e286
src: Add function csync_vio_convert_file_stat().
2013-07-04 10:39:59 +02:00
Klaas Freitag
0a29be89ca
cmake: Check for __mingw_asprintf for asprintf replacement.
...
This is required since mingw32 4.8.
2013-07-04 10:35:47 +02:00
Klaas Freitag
8da59de17b
std: Define O_NOATIME if not already defined.
2013-07-04 10:35:06 +02:00
Andreas Schneider
d43b382089
tests: Fix testing the vio plugins.
2013-07-04 10:29:48 +02:00
Andreas Schneider
cccbb6699a
cmake: Find SMBClient correctly.
2013-07-04 10:29:48 +02:00
Andreas Schneider
8953ed544c
statedb: Remove context where it isn't needed.
2013-07-04 10:29:48 +02:00
Andreas Schneider
d05b077851
statedb: Always pass down the db pointer.
2013-07-04 10:29:19 +02:00
Klaas Freitag
ce6cf57a29
Make test work again by not writing the db.
2013-07-04 10:28:55 +02:00
Klaas Freitag
7eb3f901a6
Experimental: Fix the mv and recreate case as described in mirall#731.
...
Please note that this needs review and test and probably does not fully
fix it. It just makes sure that renames are handled before PUTs.
2013-07-03 22:38:45 +02:00
Klaas Freitag
7ef620f58d
Merge remote-tracking branch 'ogoffart/dav' into dav
2013-07-03 16:36:28 +02:00
Klaas Freitag
44a52ad951
Removed useless logging.
2013-07-03 16:32:33 +02:00
Olivier Goffart
f8fdff885e
Make sure to write the errors in the DB as well.
...
If a file can't be uploaded, we still need to write it into the DB if it
was in the DB before, with the old timestamp.
2013-07-02 23:07:37 +02:00
Olivier Goffart
1c9fa48d60
Create a function to free a csync_file_stat
2013-07-02 18:25:17 +02:00
Olivier Goffart
270e06a99b
Fix a possible leak
2013-07-02 17:42:47 +02:00
Klaas Freitag
5171e5880d
Initialize member var with zero to avoid crash.
2013-07-02 17:01:16 +02:00
Klaas Freitag
2ef62524d6
Use showTrayMessage instead of _tray directly
2013-07-02 17:01:16 +02:00
Klaas Freitag
4bbb29c2b4
Terminate sync process in the wizard rather than in folderman unload.
2013-07-02 17:01:16 +02:00
Klaas Freitag
261776cc78
Remove useless log message.
2013-07-02 17:01:16 +02:00
Daniel Molkentin
3008142b1b
lowercase webdav request
2013-07-01 14:21:04 +02:00
Daniel Molkentin
152e729768
thinko
2013-06-28 23:23:42 +02:00
Daniel Molkentin
e7c77df59e
Quota: Distinguish 0 and <1
2013-06-28 23:14:09 +02:00
Daniel Molkentin
4ff1a13f32
Implement folder display.
...
- Displayed as disabled action
- Refactor davRequest along the way
- take Verb as QByteArray
- pass along a QIODevice
Not implemented for Qt < 4.8
2013-06-28 23:01:31 +02:00
Daniel Molkentin
b9b18d6120
Remove unused configfile instance
2013-06-28 22:28:18 +02:00
Daniel Molkentin
4945ce3c8c
Use awesome Qt template magic
2013-06-28 22:27:53 +02:00
Daniel Molkentin
19aa8c63c0
build again
2013-06-28 22:27:16 +02:00
Daniel Molkentin
efd11b61c6
Merge branch '1.3'
2013-06-28 11:47:09 +02:00
Daniel Molkentin
1facb1f95d
1.3.80 (pre 1.4.0)
2013-06-27 16:58:55 +02:00
Jenkins for ownCloud
3db0788a91
[tx-robot] updated from transifex
2013-06-27 16:57:44 +02:00
Jenkins for ownCloud
e068098046
[tx-robot] updated from transifex
2013-06-27 16:57:44 +02:00
Daniel Molkentin
f2d289326b
More whitespace changes
2013-06-27 16:57:44 +02:00
Jenkins for ownCloud
ae57f27eb9
[tx-robot] updated from transifex
2013-06-27 16:57:44 +02:00
Daniel Molkentin
a1767b2f7f
String whitespace fixes
2013-06-27 16:57:15 +02:00
Markus Goetz
5e9fcf7537
Raise setup wizard
2013-06-27 16:57:15 +02:00
Markus Goetz
8192cc7eea
Setup Dialog: Fix widget size issue (2)
2013-06-27 16:57:15 +02:00
Markus Goetz
2b8e1f2504
Setup Dialog: Fix widget size issue
...
in advanced settings
2013-06-27 16:57:15 +02:00
Daniel Molkentin
9d01f80744
Fix Dialog behavior
...
- Fix proxy dialog being callable multiple times
- Use smart pointers in more places
- _owncloudSetupWizard was guarded by a smart pointer,
this needs to be accounted for in other code pathes.
Fixes Setup dialog not showing up when left-clicking
on unconfigured instances on Windows.
2013-06-27 16:54:33 +02:00
Jenkins for ownCloud
1a04c9da67
[tx-robot] updated from transifex
2013-06-27 01:42:28 +02:00
Daniel Molkentin
d35e1baee1
Remove obsolete code
2013-06-26 17:27:44 +02:00
Jenkins for ownCloud
2f16e50c87
[tx-robot] updated from transifex
2013-06-26 15:55:25 +02:00
Jenkins for ownCloud
3a662f7afb
[tx-robot] updated from transifex
2013-06-26 01:27:29 +02:00
Daniel Molkentin
903a78623c
Minor theme changes
2013-06-25 14:51:39 +02:00
Daniel Molkentin
7cd2f39f82
ChangeLog
2013-06-25 10:37:40 +02:00
Daniel Molkentin
1a25644d60
Fix version number
2013-06-25 09:52:44 +02:00
Daniel Molkentin
8a8d98d401
Changelog
2013-06-25 09:47:47 +02:00
Daniel Molkentin
16d99b8ff8
0.80 for ownCloud 1.3
2013-06-25 09:25:34 +02:00
Jenkins for ownCloud
949dd5db35
[tx-robot] updated from transifex
2013-06-25 01:45:02 +02:00
Jenkins for ownCloud
49a5c5bb8b
[tx-robot] updated from transifex
2013-06-24 23:05:09 +02:00
Jenkins for ownCloud
48aa355eea
[tx-robot] updated from transifex
2013-06-24 23:01:20 +02:00
Daniel Molkentin
644b2673e0
More whitespace changes
2013-06-24 23:00:33 +02:00
Jenkins for ownCloud
8eed62e639
[tx-robot] updated from transifex
2013-06-24 22:58:54 +02:00
Daniel Molkentin
04c8449e5f
String whitespace fixes
2013-06-24 22:58:00 +02:00
Jenkins for ownCloud
9dd776ff6c
[tx-robot] updated from transifex
2013-06-24 22:55:32 +02:00
Jenkins for ownCloud
016868e95a
[tx-robot] updated from transifex
2013-06-24 21:43:58 +02:00
Jenkins for ownCloud
5d9c664fba
[tx-robot] updated from transifex
2013-06-24 21:25:21 +02:00
Daniel Molkentin
a662c85728
Add "Reset Folder" option to status dialog
...
to recover from invalid databases. Features
a big fat warning.
2013-06-24 21:17:00 +02:00
Daniel Molkentin
5c4b7d427d
Add "Reset Folder" option to status dialog
...
to recover from invalid databases. Features
a big fat warning.
2013-06-24 21:15:22 +02:00
Markus Goetz
12cc8bfd95
Raise setup wizard
2013-06-24 15:15:46 +02:00
Markus Goetz
11c6f20c90
Setup Dialog: Fix widget size issue (2)
2013-06-24 14:57:48 +02:00
Markus Goetz
c602ec310d
Setup Dialog: Fix widget size issue
...
in advanced settings
2013-06-24 13:24:46 +02:00
Andreas Schneider
22477b23a6
statedb: Never overwrite data set by the user!
...
Only a user of csync is allowed to call csync_set_userdata(). Never call
this inside of csync cause you will overwrite the data pointer and
information is lost!
2013-06-23 14:50:49 +02:00
Stefan Agner
33eaf7e7b0
statedb: use ctx when opening database for integrity check
...
Signed-off-by: Stefan Agner <stefan@agner.ch >
2013-06-23 14:03:27 +02:00
Olivier Goffart
60a4180dd6
Delay the csync_init after we called status.php
...
That way, if there was a redirection, it is handled propertly
2013-06-21 00:34:46 +02:00
Olivier Goffart
8e42721959
Do not store the redirected URL in the config file.
...
Because it may be a temporary URL.
Especially anoying in captive portal
Fix issue #368
This is a revert of the revert 0bc9b6f44e
With small changes
2013-06-21 00:34:28 +02:00
Olivier Goffart
4553fa1d09
Merge remote-tracking branch '1.3' into master
2013-06-21 00:04:01 +02:00
Daniel Molkentin
b206a3b8e2
Beta4
2013-06-20 21:01:38 +02:00
Daniel Molkentin
3bff5a061b
Network: Display actual error message next to code.
2013-06-20 20:02:25 +02:00
Daniel Molkentin
0bc9b6f44e
Revert "Do not store the redirected URL in the config file."
...
This reverts commit 905f70a186 .
Patch still has issues, defer until after Beta 4
2013-06-20 19:50:34 +02:00
Daniel Molkentin
77653747ac
0.70.93
2013-06-20 19:45:18 +02:00
Olivier Goffart
905f70a186
Do not store the redirected URL in the config file.
...
Because it may be a temporary URL.
Especially anoying in captive portal
Fix issue #368
2013-06-20 17:50:02 +02:00
Olivier Goffart
0dbecb129e
Log the fact that csync was aborted
2013-06-19 18:41:30 +02:00
Olivier Goffart
a8707b681d
Report proper error when csync_init fails
...
Fix mirall issue #705
2013-06-19 18:17:32 +02:00
Olivier Goffart
5d8f9f5346
Silent clang warning
2013-06-19 18:16:43 +02:00
Daniel Molkentin
e43ff398cd
Merge branch '1.3'
...
Conflicts:
doc/troubleshooting.rst
2013-06-19 16:09:54 +02:00
Daniel Molkentin
a441b1d562
Bump year
2013-06-19 16:07:07 +02:00
Daniel Molkentin
6e2042cd55
Doc: Expand usage page
2013-06-19 16:04:48 +02:00
Daniel Molkentin
bb8b58dc66
Doc: more fixes on troubleshooting section
2013-06-19 15:48:04 +02:00
Daniel Molkentin
9cd099056b
Doc: More structure in troubleshooting.rst
2013-06-19 15:40:20 +02:00
Daniel Molkentin
0adbc032ae
Doc: Expand trouble shooting section
2013-06-19 15:40:15 +02:00
Daniel Molkentin
22a679fb8c
Doc: Add back --logfile, as it still exists
2013-06-19 15:40:09 +02:00
Daniel Molkentin
35a67fab0a
Doc: remove now meaningless scentences
2013-06-19 15:40:06 +02:00
Daniel Molkentin
fdc8117211
doc: Fix wording
2013-06-19 15:40:02 +02:00
Daniel Molkentin
24208e6137
Remove mirall man page
2013-06-19 15:39:56 +02:00
Daniel Molkentin
c0cd255ea3
Doc: More structure in troubleshooting.rst
2013-06-19 15:39:03 +02:00
Daniel Molkentin
a0375fd000
Doc: Expand trouble shooting section
2013-06-19 15:06:47 +02:00
Daniel Molkentin
6d847cd5f9
Doc: Add back --logfile, as it still exists
2013-06-19 15:06:16 +02:00
Daniel Molkentin
6470a3f539
Doc: remove now meaningless scentences
2013-06-19 15:05:33 +02:00
Daniel Molkentin
c6111d09ce
doc: Fix wording
2013-06-19 14:29:56 +02:00
Daniel Molkentin
d6012854a9
Remove mirall man page
2013-06-19 14:29:28 +02:00
Daniel Molkentin
46c7026726
Answer correctly if proxy auth is needed
...
Fixes #704
2013-06-19 12:48:36 +02:00
Daniel Molkentin
01ad3c4d81
Remove more dead code for readability
2013-06-19 11:31:09 +02:00
Olivier Goffart
3d2c3b321c
Disable the blacklist by default
...
The blacklist might hide errors and reduce the ability to do proper
diagnostics.
Note that in _csync_push_file, we kept csync_statedb_get_progressinfo
because it is also used for the resume feature
Also added output when a file has been blacklisted.
2013-06-18 19:19:28 +02:00
Daniel Molkentin
4ac98bde73
Remove dead code from StatusDialog
2013-06-18 17:38:20 +02:00
Daniel Molkentin
f42a6d6ef6
Advertise the use of Gists for long logs
2013-06-18 15:21:56 +02:00
Daniel Molkentin
9055c6ade7
Add storage backend field to issue template
2013-06-18 14:57:12 +02:00
Olivier Goffart
1356a5bbaa
Fix reading the password from the config
...
The code was expecting pwdba to be in base64, which it was not if it
came from the "password" field
2013-06-18 14:19:37 +02:00
Olivier Goffart
3c320c2736
Credidentail dialog: it was suposed to be asynchronous
2013-06-18 14:19:37 +02:00
Olivier Goffart
969757199e
Fix changing the password when the password manager is not available
...
Leaving the state in NoKeychainBackend would break any further attempt
to get the password because CredentialStore::canTryAgain would return
false.
2013-06-18 14:19:37 +02:00
Daniel Molkentin
60f1c65a48
Don't lose proxy settings when changing passwords
2013-06-17 14:25:11 +02:00
Daniel Molkentin
b87b0e16e6
Avoid infinite loop if authcheck fails
2013-06-17 13:35:54 +02:00
Andreas Schneider
3043b97815
cmake: Use pkg-config for libsmbclient.
2013-06-16 21:37:03 +02:00
Daniel Molkentin
8ed0b1be55
Teach ownCloud theme about QVariant
2013-06-13 16:31:38 +02:00
Olivier Goffart
ed76e5f1f2
Fix conflict file appearing when a file cannot be stated
...
We still need to fetch the md5 from the database to be able to store it
back.
2013-06-13 15:06:35 +02:00
Daniel Molkentin
91b5f1076f
Theming cleanups
...
- remove splash screen pixmap
- remove backend icon (folderIcon())
- Move owncloud ad into owncloud theme
2013-06-13 12:56:20 +02:00
Daniel Molkentin
8ec2457965
Only change subtitle if the config file actually exists
2013-06-13 12:55:07 +02:00
Daniel Molkentin
82d79b1188
Remove folder from the scheduling queue
...
Not really needed, but cleaner
2013-06-12 12:42:02 +02:00
Olivier Goffart
e33601becd
Fix leak
2013-06-12 12:23:12 +02:00
Olivier Goffart
334443adbb
Fix crash when removing a folder
...
The problem is that the module_property of csync are not really tight to
a context, but are global to all the contextes.
Which means csync_owncloud may still have a pointer to the destroyed
context of the destroyed folder.
By always resetting the context pointer, we make sure there is no stale
pointers there
2013-06-12 12:23:12 +02:00
Daniel Molkentin
92b9bf59a7
0.70.92
2013-06-12 11:10:34 +02:00
Daniel Molkentin
99579e8a2a
1.3.0beta3
2013-06-12 11:10:08 +02:00
Daniel Molkentin
89438f7ace
Make SyncDisabler local to slotAddFolder
...
This also allows us to update the folder state as
soon as the wizard is being closed.
2013-06-12 09:27:20 +02:00
Daniel Molkentin
d323ec5dd9
FileItemDialog: more clarity in the label
...
- finished %n sec ago -> last finished %n sec ago
- switch to minutes after 60 seconds
2013-06-11 22:34:37 +02:00
Daniel Molkentin
bb5cf37330
Fix issues found after review
...
- use safer formatting
- remove unnecessary condition
2013-06-11 22:33:11 +02:00
Daniel Molkentin
4b0bdd648c
Do not repeat old strings
...
Fixes #678 , fixes #494
2013-06-11 22:14:32 +02:00
Olivier Goffart
5588fbe695
Fix clicking on the systray when the setup is not finished
...
We should raise the wizard
2013-06-11 21:32:44 +02:00
Olivier Goffart
12ea381205
Do not re-use the configuration wizard.
...
Create it on demand.
This allow yo alays keep a cleen state.
Mirall issue #668
2013-06-11 21:15:37 +02:00
Daniel Molkentin
99fbf25fb2
Keep the member variable, avoids double instanciation
2013-06-11 18:41:35 +02:00
Daniel Molkentin
b37645e14d
Revert "Put FolderWizard on the stack"
...
This reverts commit 1ec5a1aaa2 .
2013-06-11 18:33:39 +02:00
Daniel Molkentin
1ec5a1aaa2
Put FolderWizard on the stack
2013-06-11 18:19:09 +02:00
Daniel Molkentin
3eb7acde25
Folder wizard: use native separators in path lineedit
2013-06-11 18:18:38 +02:00
Daniel Molkentin
e53e39cfad
Remove obsolete members from enum
2013-06-11 18:17:34 +02:00
Daniel Molkentin
1a17f40233
Remove debug
2013-06-11 18:17:22 +02:00
Daniel Molkentin
10094a997a
Proxy Dialog: default to port 8080
2013-06-11 17:46:00 +02:00
Daniel Molkentin
2af38b093f
Fix status delegate
...
- remove magic values
- remove backend icon, put status icon in the front
- elide text when > list view width
- use list view font
2013-06-11 14:46:12 +02:00
Olivier Goffart
015eeb1e05
Clean the progress database on csync_commit
...
It was cleaned twice in csync_destroy because of the conflict resolution
https://github.com/owncloud/mirall/issues/667
2013-06-11 10:24:34 +02:00
Klaas Freitag
32818283a5
Remove default console log of httpbf
2013-06-11 08:53:19 +02:00
Klaas Freitag
4a04b3e184
Use a proper cast in inode query.
2013-06-11 08:47:32 +02:00
Daniel Molkentin
b03c168175
Status dialog> Do not adjust pen when using Vista Style
...
Light blue and white are not contrasting enough
2013-06-10 21:29:45 +02:00
Daniel Molkentin
1c6bc84d2d
Wizard: Always initialize all labels
2013-06-10 21:29:45 +02:00
Andreas Schneider
d19a652993
cmake: Fix -D_FORTIFY_SOURCE detection.
2013-06-10 16:17:43 +02:00
Andreas Schneider
d864899ff1
src: Fix a build warning.
2013-06-10 16:17:33 +02:00
Andreas Schneider
85a858b7ed
src: Fix creating the inode system on 32bit system.
2013-06-10 16:08:14 +02:00
Olivier Goffart
541239c17b
Make the message box more explicit when all files have been removed
...
Also clean the db if the user wish to keep the files
2013-06-10 15:58:02 +02:00
Daniel Molkentin
74b4ade15a
Add missing return statement
2013-06-10 15:37:52 +02:00
Klaas Freitag
bf8188e9e8
Create metadata table if not existing.
2013-06-10 11:48:38 +02:00
Klaas Freitag
72cc0f5d7c
Fixed testcase.
2013-06-10 11:48:38 +02:00
Olivier Goffart
f71d4dcc79
Add a log output when the replica is invalid in csync_vio
...
https://github.com/owncloud/mirall/issues/669
2013-06-10 10:19:46 +02:00
Olivier Goffart
78937b09b8
Clean the rename datastructure in csync_commit
...
Fixes the crash in mirall issue 670
https://github.com/owncloud/mirall/issues/670
2013-06-10 10:11:13 +02:00
Daniel Molkentin
205502fd3b
Fix incorrect license attribution
...
Fixes #672
2013-06-10 07:42:35 +02:00
Daniel Molkentin
54e4217216
Add Missing LGPL_EXCEPTION.txt
...
Fixes #671
2013-06-10 07:38:35 +02:00
Olivier Goffart
d2579a7754
Warn if we detect that all fles are about to be removed.
2013-06-08 15:41:53 +02:00
Daniel Molkentin
76580840dd
Fix misleading confirmation message
...
Fixes #459
2013-06-07 22:01:26 +02:00
Olivier Goffart
779e59156c
Added --logexpire to remove the log after some hours
2013-06-07 18:58:16 +02:00
Daniel Molkentin
b0f0d0b1cd
qDebug() ises local8bit, not utf-8.
...
Fixes #651
2013-06-07 17:28:04 +02:00
Olivier Goffart
882e027e40
Remove dead condition
...
rc==123 was a magic value set to mean not to save the error. But after
some refactoring, it is not done like that anymore
2013-06-07 16:43:48 +02:00
Klaas Freitag
161e2fbadc
Avoid build failure if NDEBUG is unset.
2013-06-07 16:19:22 +02:00
Klaas Freitag
ae5847138c
Fix test cases for the new database code.
2013-06-07 16:09:22 +02:00
Klaas Freitag
5852a2dd06
Create an empty metadata table if non exists.
2013-06-07 16:09:07 +02:00
Klaas Freitag
fbfba8bfbb
Add another database integrity check on startup to avoid corrupt dbs.
2013-06-07 16:08:45 +02:00
Daniel Molkentin
5a2d7e9c9f
Do not corrupt ctx->replica value if push_file fails
2013-06-07 14:58:38 +02:00
Klaas Freitag
d9ef991448
Removed unused progress info allocation.
2013-06-07 09:18:27 +02:00
Daniel Molkentin
858dcb53bd
Status dialog delegate: Use font from option
2013-06-06 22:12:18 +02:00
Daniel Molkentin
9d7db88fcb
status dialog: Use contrast color for highlights
...
Fixes #440 .
2013-06-06 22:11:36 +02:00
Daniel Molkentin
2099b7c6a0
ensureJournalGone: fix logic
2013-06-06 21:43:05 +02:00
Daniel Molkentin
4442564ad2
Clean up slotAddFolder
...
Ensure folder sync scheduling is off in the meanwhile.
2013-06-06 21:27:15 +02:00
Daniel Molkentin
12148b5c9b
remove journal when adding a new sync on an existing folder
2013-06-06 17:59:50 +02:00
Daniel Molkentin
d7d77a49fc
Show help on Windows
...
We have no console, so show a message box.
2013-06-06 16:00:51 +02:00
Daniel Molkentin
b70c2f5c20
torture scripts: fix description
2013-06-06 11:05:21 +02:00
Olivier Goffart
bb03664bfd
Let csync_update report the right error.
...
The problem is that the call to csync_memstat_check will try to open a
file, that will fail on windows and override the errno
2013-06-06 10:44:52 +02:00
Daniel Molkentin
033249423f
Add torture scripts + standard layout files
2013-06-05 21:36:55 +02:00
Klaas Freitag
e4e30e2cdd
Use multibyte version of open in database version check.
2013-06-05 17:59:34 +02:00
Klaas Freitag
f320f9c701
void an unused variable.
2013-06-05 16:39:06 +02:00
Klaas Freitag
e92dd4c1da
Removed some logs that are not needed.
2013-06-05 16:35:48 +02:00
Klaas Freitag
cab00ea668
Added missing CloseHandle, detected by Coverty.
2013-06-05 16:34:58 +02:00
Daniel Molkentin
0c959e8661
Windows: Log change of power state
2013-06-05 16:14:20 +02:00
Daniel Molkentin
79785241ea
Docs: --logdir replaces --logfile
2013-06-05 14:57:32 +02:00
Daniel Molkentin
0090862313
wizard: show native separators on folder chooser button
2013-06-04 00:46:34 +02:00
Daniel Molkentin
a4a68c6622
Wizard: Better wording when renaming failes
2013-06-03 23:34:28 +02:00
Daniel Molkentin
e92a422d3d
Send OC-Chunked instead of OC_CHUNKED.
...
Will still be understood by the server, as PHP mangles the header
to read HTTP_OC_CHUNKED in both cases.
2013-06-03 22:51:28 +02:00
Klaas Freitag
49b4c341ae
Really unload folders before reconfiguring.
2013-06-03 17:27:06 +02:00
Klaas Freitag
9001dbb082
Use variable verb and avoid warnings.
2013-06-03 17:23:39 +02:00
Olivier Goffart
22a07634b6
Fix upload of big files when proxy remove the OC_CHUNKED header
...
In that case, the first chun would be uploaded as a chunk.
Take that case into account and if we get a success after only one
chunk, we try to delete the chunk, and it it worked, it means chunking
was not supported.
2013-06-03 17:23:39 +02:00
Olivier Goffart
7c1f91abdd
Add the --logdir commandline option
...
To log to a different file for every sync.
This also changed a QueuedConnection to AutoConnection, that way we
directly save the log from the main thread in the file without waiting
for the event loop (so if it crashes before, the log has been writen)
2013-06-03 16:25:41 +02:00
Klaas Freitag
1f2ba7e254
Handle rename fails for backup reasons correctly.
2013-06-03 15:47:39 +02:00
Klaas Freitag
8014bcb7c4
Check for emptiness before backuping the entire dir.
2013-06-03 15:47:07 +02:00
Klaas Freitag
b1c8bf5954
Fix backup name generation.
2013-06-03 15:46:41 +02:00
Klaas Freitag
0eb6740bac
Added default argument to terminateSyncProcess
2013-06-03 15:46:11 +02:00
Klaas Freitag
96531b548a
Minor Cleanups.
2013-06-03 15:45:28 +02:00
Klaas Freitag
f3371360ed
Check the CredentialStore state before fetching creds again.
2013-06-03 15:44:58 +02:00
Olivier Goffart
5bb4c3be43
TMP threaded
2013-06-03 10:43:21 +02:00
Daniel Molkentin
a06078f89f
bump version
2013-05-31 16:26:54 +02:00
Klaas Freitag
fe6fdb5e88
Enable NE_LFS, important for Win32 platform.
2013-05-31 13:23:21 +02:00
Daniel Molkentin
c53ad974ee
Make socks proxies work.
2013-05-29 14:17:30 +02:00
Daniel Molkentin
4d663f6cfa
More cheating on proxies: Add OS to User-Agent
2013-05-28 19:35:54 +02:00
Daniel Molkentin
95c532c46a
Set User-Agent to contain Mozilla/5.0 string
...
A blatant lie for a blatant abuse of Firewall filters.
2013-05-28 15:46:03 +02:00
Klaas Freitag
20969cf6bb
Removed an extra space.
2013-05-24 15:43:42 +02:00
Klaas Freitag
e4b9f21f81
Fix statedb load test case.
2013-05-22 16:51:09 +02:00
Klaas Freitag
f2669ae886
Fix statedb-query test.
2013-05-22 16:43:31 +02:00
Daniel Molkentin
39cfe91da6
fix httpbf test case
2013-05-22 16:32:08 +02:00
Daniel Molkentin
45e5578b52
init to false in case of doubt
2013-05-22 16:15:26 +02:00
Klaas Freitag
92b0af4b0a
Compare the correct type.
2013-05-22 16:13:27 +02:00
Klaas Freitag
126559b2be
For new databases, skip the is-empty check.
2013-05-22 16:10:43 +02:00
Klaas Freitag
0764ef1620
For directories, do not consider the size as its invalid on remote.
2013-05-22 16:10:43 +02:00
Daniel Molkentin
10437db2f9
Bump version
2013-05-22 15:33:42 +02:00
Klaas Freitag
8115f71096
Avoid memory allocation screwup.
2013-05-22 12:33:09 +02:00
Klaas Freitag
4a58cae0b0
Finialize insert statement.
2013-05-22 12:33:09 +02:00
Klaas Freitag
bcdd8b95bf
Allow empty MD5 sum on save, happens with directoires.
2013-05-22 12:33:09 +02:00
Klaas Freitag
69d251630f
Code cleanups, move closedb out of if statements.
2013-05-22 12:33:09 +02:00
Klaas Freitag
02f93ec4d5
Free allocted memory of local and remote list.
2013-05-22 12:33:09 +02:00
Klaas Freitag
dd8ceacf75
Avoid compile warning due to non-top variable declaration.
2013-05-22 12:33:09 +02:00
Klaas Freitag
673ca36db8
More efficient database writing, do integrity check on db.
2013-05-22 12:33:09 +02:00
Klaas Freitag
68e0dbb18f
Use wide character unlink.
2013-05-22 12:32:25 +02:00
Klaas Freitag
23912a7214
Reworked database writing code. Speed improvement > 50%.
2013-05-20 12:24:55 +02:00
Klaas Freitag
4ad01b35ce
Switch on full synchronous mode for sqlite.
2013-05-20 11:10:27 +02:00
Klaas Freitag
053a9b7da0
Add neon includes to httpbf build
2013-05-17 12:45:39 +02:00
Klaas Freitag
61335b6a70
Do not set the error_code from errno
2013-05-17 12:25:17 +02:00
Klaas Freitag
4f47aba1e2
Allow user aborting in chunked uploads
2013-05-16 17:37:30 +02:00
Klaas Freitag
2385bbcf55
Add an abort callback.
2013-05-16 17:37:00 +02:00
Klaas Freitag
ad7aac4152
Rather use eq and ne for string comparison.
2013-05-16 16:12:27 +02:00
Daniel Molkentin
b9c7980433
Work on non-mac again
2013-05-16 15:00:52 +02:00
Olivier Goffart
07ce6cfa79
don't use member variable of the propagator
2013-05-16 14:50:36 +02:00
Olivier Goffart
9ce47c9675
make the propagator asynchronous
2013-05-16 13:54:22 +02:00
Daniel Molkentin
ecff867e46
Get further on mac
2013-05-16 13:02:51 +02:00
Klaas Freitag
4af8f470e8
Check the stat result.
2013-05-16 12:46:06 +02:00
Olivier Goffart
5c79d8bdef
t3.pl: test renaming folder
...
Add a test to test that renaming folder and doing complex stuff in them
works
2013-05-15 17:59:13 +02:00
Olivier Goffart
d8d4f118d7
Fix possible leak
2013-05-15 17:59:13 +02:00
Daniel Molkentin
6b4501fd4b
Try to make t1 utf-8-mac safe
2013-05-15 17:57:19 +02:00
Olivier Goffart
40255d643c
propagator-ng: adapt to the merge of rename_folders branch
2013-05-15 15:22:20 +02:00
Daniel Molkentin
ccb8fcc614
ignore t1.cfg
2013-05-15 14:39:23 +02:00
Klaas Freitag
551d457c7c
Pulled Test.pm out of t1.pl for reuse. Simplified t1.pl.
2013-05-15 11:15:50 +02:00
Klaas Freitag
eb2997e609
Normalized UTF-8 and createLocalFile added.
2013-05-14 17:46:35 +02:00
Klaas Freitag
ae1541a95f
Dependency info added.
2013-05-14 16:32:36 +02:00
Klaas Freitag
f56a075f36
Create directories vio mkcol and do not compare dir sizes.
2013-05-14 16:01:57 +02:00
Olivier Goffart
00d27d0e9c
Fix HTTPBF again
...
it really needs to be %u because if it is signed, then we have -- in the
URL which the server can't understand
2013-05-14 15:30:56 +02:00
Olivier Goffart
3e795a84c2
Fix memory leak.
...
csync_destroy do not call vio_commit. Maybe it should?
2013-05-14 15:30:56 +02:00
Olivier Goffart
6735b82326
Fix leak
2013-05-14 15:30:56 +02:00
Klaas Freitag
1a648a612e
Merge remote-tracking branch 'ogoffart/rename_folders_merged' into dav
2013-05-13 16:28:31 +02:00
Klaas Freitag
8f6562f737
Disabled lock test for owncloud.
2013-05-13 15:30:10 +02:00
Klaas Freitag
f2f12a5629
Use %d for int variables in sprintf.
2013-05-13 15:30:01 +02:00
Klaas Freitag
885eaad729
Removed goto from code.
2013-05-13 15:29:29 +02:00
Klaas Freitag
cb0e06e7f8
Merge remote-tracking branch 'ogoffart/dav' into dav
2013-05-13 15:10:29 +02:00
Klaas Freitag
7b060a7af6
Do not create lock for ownCloud Client any more.
2013-05-13 14:03:33 +02:00
Olivier Goffart
28942e3051
Recreates the statedb if it was corrupted
...
Fixes: https://github.com/owncloud/mirall/issues/595
Some corruptions do not happen when the database is opened, but only on
some querries.
In that case, recreates the database if querries such as DROP or
CREATE fails.
2013-05-13 11:57:25 +02:00
Olivier Goffart
b31200a6f2
propagator-ng: fix setting the mtime
2013-05-10 13:20:21 +02:00
Olivier Goffart
8f3e260ede
fix typo
...
This broke the new propagator
2013-05-10 13:13:02 +02:00
Olivier Goffart
41a56b19b7
t1.pl: let configure csync command
2013-05-10 12:45:51 +02:00
Olivier Goffart
98cbb599b8
Fix handling of conflicting directories
...
We can safely ignore them in the propagator
2013-05-10 12:35:10 +02:00
Klaas Freitag
b7c03e92da
Temporary disable cached propfind.
2013-05-10 09:55:44 +02:00
Klaas Freitag
276ccd3fb6
Fix setting of csync error code in updater.
2013-05-09 14:12:26 +02:00
Klaas Freitag
9d84c19b69
Reworked integration test: File assert traversal fixed.
2013-05-09 13:26:28 +02:00
Klaas Freitag
b1f62b51bf
Add owncloud module files to build.
2013-05-09 13:26:28 +02:00
Daniel Molkentin
a75376e6a7
Rename csync_abort -> async_request_abort. Add csync_resume.
2013-05-08 17:33:50 +02:00
Daniel Molkentin
ee5aaf76c5
Introduce csync_abort()
...
If called, it will set a bool in the context,
which will be respected by all expensive visitors.
2013-05-08 16:57:12 +02:00
Olivier Goffart
ecd314cef5
Give the tmp file a proper hidden and excluded name
2013-05-08 14:31:52 +02:00
Markus Goetz
952290890c
Merge remote-tracking branch 'origin/dav' into dav_recursive_update_squashed
...
Conflicts:
modules/csync_owncloud.c
2013-05-08 14:31:24 +02:00
Markus Goetz
9b4eb40216
Remove timedelta stuff
2013-05-08 14:27:59 +02:00
Markus Goetz
639f1127b7
Move stuff to _util.c
2013-05-08 13:59:07 +02:00
Olivier Goffart
0b1ecd0ac6
propagator-ng: Abort on fatal error
2013-05-08 13:30:30 +02:00
Markus Goetz
9c2f223093
Add module property to disable recursive PROPFIND
2013-05-08 13:26:59 +02:00
Markus Goetz
927ccf5d08
Use C-style comments instead of modern //
2013-05-08 13:20:42 +02:00
Markus Goetz
52e2775292
Make PROPFIND cache external unit
...
and introduce a csync_owncloud.h
2013-05-08 13:12:01 +02:00
Olivier Goffart
852e30ef07
owncloudcmd: don't abort on unknown argument
2013-05-08 12:11:23 +02:00
Markus Goetz
980c176073
Recursive PROPFIND cache for ownCloud module
2013-05-08 11:58:17 +02:00
Olivier Goffart
2193da0ab5
Fix a few FIXME
2013-05-07 17:47:29 +02:00
Olivier Goffart
7cd12e7dc5
remove some FIXME
2013-05-07 17:16:11 +02:00
Olivier Goffart
3c87cd71d7
Merge branch 'rename_folders' into dav
...
Conflicts:
modules/csync_owncloud.c
src/csync.c
src/csync.h
src/csync_propagate.c
src/csync_propagate.h
src/csync_statedb.c
src/csync_statedb.h
src/csync_util.c
src/std/c_path.h
2013-05-07 15:24:12 +02:00
Klaas Freitag
52d9a9fb0a
Merge remote-tracking branch 'ogoffart/dav' into dav
2013-05-07 12:28:35 +02:00
Klaas Freitag
c8fdf1d4fb
Minor reformatting.
2013-05-07 12:27:40 +02:00
Olivier Goffart
247f4d948c
don't ajust the time anymore with the difference from client to server
2013-05-07 11:45:02 +02:00
Olivier Goffart
79818924b3
Fix httpbf when resuming uploads
2013-05-07 11:45:02 +02:00
Olivier Goffart
b1ac67ce8b
Always consider that the conflict should happen on the locale
...
Don't take in account which file is newer, the conflict file will always
be on the locale side.
This patch also consider that INSTRUCTION_NEW and INSTRUCTION_EVAL means
the same.
2013-05-07 10:48:44 +02:00
Olivier Goffart
685bf395be
propagator-ng: resume uploads
...
Currently i think it corrupt the files
2013-05-06 18:41:56 +02:00
Klaas Freitag
b0fbabc1bf
Show progress in csync client with commandline switch -v
2013-05-06 17:27:20 +02:00
Klaas Freitag
12b57124a4
Add a progress callback for overall and individual file up and download
...
progress.
2013-05-06 17:14:17 +02:00
Olivier Goffart
0636ae6f28
propagator-ng: be able to resume download
2013-05-06 16:59:11 +02:00
Klaas Freitag
599e435443
Use the new logging framework for ownCloud module.
2013-05-06 16:58:14 +02:00
Klaas Freitag
36ec7aa5b6
Added set_property method for the ownCloud module.
2013-05-06 16:56:45 +02:00
Klaas Freitag
25948ef708
Add the file level progress callback.
2013-05-06 16:52:08 +02:00
Klaas Freitag
4ce67e38d1
Fix printf operator to interpret phash correctly for sqlite3.
2013-05-06 16:27:11 +02:00
Olivier Goffart
698edcc1c0
Revert "Fix httpbf test."
...
This reverts commit 460c5b067d .
We need to use %u for unsigned in otder to avoid the '-' to many to
appear in the transferid
2013-05-06 16:13:58 +02:00
Olivier Goffart
7f8eba3700
propagator-ng: set the modtime on downloaded files
2013-05-06 12:09:21 +02:00
Olivier Goffart
02957aba45
propagator-ng: Emit the fileReceived signal
2013-05-05 12:46:40 +02:00
Klaas Freitag
946258ca59
Created a test file for ownCloudPropagator. Not much in yet.
2013-05-05 12:36:42 +02:00
Klaas Freitag
2e53e2e4e0
Really return true in case of error.
2013-05-05 12:34:38 +02:00
Klaas Freitag
721a8f79ab
Improve error handling, add error string to each individual file item.
2013-05-05 11:47:19 +02:00
Olivier Goffart
ecaf66db5d
style: use _ in front of member variable
2013-05-05 11:32:12 +02:00
Olivier Goffart
0c775aba6d
propagator-ng: get the etag also in the GET request
2013-05-05 11:32:12 +02:00
Olivier Goffart
71b238031f
Fix compilation after previous rebase
2013-05-05 11:32:12 +02:00
Olivier Goffart
662bd4e5fe
propagator-ng: handle conflict
...
Always download the file from the server.
And if they are equals, ignore the conflict
2013-05-05 11:17:42 +02:00
Olivier Goffart
5118054fa3
Enable the backup of conflicts files in owncloudcmd
2013-05-05 11:17:07 +02:00
Klaas Freitag
c956d11183
More error handling of propagator, some cleanups.
2013-05-04 17:14:47 +02:00
Klaas Freitag
7df23a1b19
Proper error reporting of propagator - WIP
2013-05-04 17:14:47 +02:00
Klaas Freitag
72580d7213
move command line client into bin dir
2013-05-04 17:14:47 +02:00
Olivier Goffart
264cc73806
Implement renaming on windows
...
(Not actually tested)
2013-05-04 16:18:13 +02:00
Klaas Freitag
c61035f767
Put the lock file into the sync dir.
2013-05-04 16:10:11 +02:00
Klaas Freitag
54ed522bbe
Check for null argument.
2013-05-04 16:08:49 +02:00
Olivier Goffart
c041076c95
Handle renames
2013-05-04 15:32:11 +02:00
Olivier Goffart
f6ff189f35
Add owncloudcmd
...
A simple commandline client like ocsync.
The goal is to be used bu the t1.pl test
2013-05-04 13:52:35 +02:00
Klaas Freitag
84a28fa8f7
Merge remote-tracking branch 'ogoffart/dav' into dav
2013-05-04 13:24:21 +02:00
Klaas Freitag
cca965e288
get etag header out of PUT reply.
2013-05-04 13:23:05 +02:00
Klaas Freitag
8a80a55aec
Remove unused varialbe.
2013-05-04 12:17:22 +02:00
Klaas Freitag
1561032973
Handle http error code correctly, even if neon reports success.
2013-05-04 12:16:35 +02:00
Olivier Goffart
e1e8842548
New owncloud propagator that skip the vio abstraction layer
...
The vio abstraction layer within csync is inneficient for the owncloud
use case because not all calls maps well to the POSIX interface. We can
be much more efficient by doing exactly what we need.
Also, this will allow us to scedule better the calls and possibly to use
threads.
2013-05-04 11:02:30 +02:00
Olivier Goffart
8c0dbb03e1
Install httpbf and make it possible to include the header in C++ code
2013-05-03 19:23:26 +02:00
Olivier Goffart
10443fc1e3
in walk tree, we can now change the md5
...
Also also in commit always assume that the propagate is done. it might
have been done by someone else
2013-05-03 19:23:26 +02:00
Olivier Goffart
546fdeed6c
Add a way for mirall to access the dav session
2013-05-03 19:23:25 +02:00
Olivier Goffart
b1fc9b2a64
Don't reset the md5 if the mtime change locally.
...
Consider this case when one creates a file with an invalid filename (for
the server) in a directory in the local side.
say: foo/bar/%invalid%.txt
The following would happen:
- in the update for the local parent folder foo/bar/, the md5 is 0
because the mtime has changed
- During the reconcile, we try to send %invalid%, but there will be an
error and nothing will be changed on the server, the etags stay the
same
- We do not do any PROPFIND at the end so we do not fetch the etag
anymore. The md5 is still 0 and will be saved like that in the DB
- Next run, since the etags have not changed on the server, we read
from the DB. But a md5 of 0 in the DB means the folder was removed on
the server. That would remove the local folder (BAD!)
So we load the md5 from the db even if the local mtime change.
That means we need to compare the mtime in the local case rather than
the md5 to see if something has changed.
2013-05-03 19:21:21 +02:00
Olivier Goffart
b49aaaabfc
Fix too many PROPFIND when starting a sync
...
csync would not update the etag (md5) for directoru in the database if
the etag has changed, but none of the files within that directory
actually changed
2013-05-03 19:21:21 +02:00
Olivier Goffart
cf23799e78
Only mark a folder as modified if files within it are modified.
2013-05-03 19:21:21 +02:00
Olivier Goffart
0b648dc669
Do not fetch folder id after propagation.
...
Delay that for the next sync.
2013-05-03 19:21:21 +02:00
Klaas Freitag
4f396c4562
Testfile added.
2013-04-26 17:41:55 +02:00
Klaas Freitag
8ac8701c10
Fix httpbf upload of zero size files, incl. test for that case.
2013-04-26 17:40:24 +02:00
Klaas Freitag
ab17e2aa8b
Revert "Don't include csync_version.h from csync.h"
...
This reverts commit 5cda5d523c .
2013-04-26 10:45:14 +02:00
Klaas Freitag
5cda5d523c
Don't include csync_version.h from csync.h
2013-04-26 10:37:45 +02:00
Klaas Freitag
a1271a1db2
Rather store a ptr to the ptr to st for propagation_cleanup
2013-04-26 10:31:41 +02:00
Daniel Molkentin
776d5dfe37
Generate csync version from CMake variables
2013-04-25 12:32:01 +02:00
Olivier Goffart
959c987749
Fix storing the error of renames
2013-04-24 14:53:31 +02:00
Olivier Goffart
844c2bbafa
Avoid double free
2013-04-24 14:53:31 +02:00
Andreas Schneider
9409d1c96e
If there is no vio commit function don't fail.
2013-04-24 14:35:19 +02:00
Klaas Freitag
b09093a496
Make csync_commit and csync_destroy more readable.
2013-04-24 14:22:54 +02:00
Klaas Freitag
3b6d1cab91
Test for csync_commit
2013-04-24 14:21:51 +02:00
Klaas Freitag
fef18208d6
Add module method for csync_commit.
2013-04-24 14:21:51 +02:00
Klaas Freitag
98e6d3818f
Allow windows to load user exclude list.
2013-04-24 14:21:51 +02:00
Klaas Freitag
8b65e8fbf3
Added csync_commit to be able to reuse the csync context.
2013-04-24 14:21:51 +02:00
Olivier Goffart
eb38f5beb1
Don't reset the md5 if the mtime change locally.
...
Consider this case when one creates a file with an invalid filename (for
the server) in a directory in the local side.
say: foo/bar/%invalid%.txt
The following would happen:
- in the update for the local parent folder foo/bar/, the md5 is 0
because the mtime has changed
- During the reconcile, we try to send %invalid%, but there will be an
error and nothing will be changed on the server, the etags stay the
same
- We do not do any PROPFIND at the end so we do not fetch the etag
anymore. The md5 is still 0 and will be saved like that in the DB
- Next run, since the etags have not changed on the server, we read
from the DB. But a md5 of 0 in the DB means the folder was removed on
the server. That would remove the local folder (BAD!)
So we load the md5 from the db even if the local mtime change.
That means we need to compare the mtime in the local case rather than
the md5 to see if something has changed.
2013-04-24 14:09:20 +02:00
Klaas Freitag
460c5b067d
Fix httpbf test.
2013-04-23 17:17:31 +02:00
Daniel Molkentin
52a289d550
Bump version to distinguish nightlies
2013-04-23 16:51:29 +02:00
Klaas Freitag
374d9b0a8c
Merge from feature branch csync_commit.
2013-04-22 15:39:43 +02:00
Klaas Freitag
b91b96922e
Remove frees from module destroy which happend in commit before
2013-04-22 15:17:45 +02:00
Klaas Freitag
2f6441afb0
Do not use asprintf any more, added missing header.
2013-04-22 14:30:57 +02:00
Klaas Freitag
c46371b469
Push WIN32 preprocessor derectives to csync_lock.c.
2013-04-22 14:30:12 +02:00
Klaas Freitag
072edefc7b
Use __mingw_asprintf if asprintf is not available.
2013-04-22 13:51:53 +02:00
Klaas Freitag
4bdabb7f46
Added a module commit function.
2013-04-22 13:51:44 +02:00
Klaas Freitag
19f6b919af
Use __mingw_asprintf if asprintf is not available.
2013-04-22 13:50:59 +02:00
Klaas Freitag
64927899af
Use pointer to stat struct for id_list.
2013-04-22 10:22:20 +02:00
Klaas Freitag
a496bb0e13
Fix memleak with id_list - WIP
2013-04-20 13:06:59 +03:00
Klaas Freitag
275c18df82
Added csync_commit to be able to reuse the csync context.
2013-04-20 12:11:16 +03:00
Klaas Freitag
0d238ae1fe
Allow to set progress- and log-callback any time.
2013-04-20 12:10:45 +03:00
Klaas Freitag
66d8f8b0db
Added csync_commit to be able to reuse the csync context.
2013-04-20 11:51:27 +03:00
Klaas Freitag
0c5cdc2105
Allow to set progress- and log-callback any time.
2013-04-20 11:50:13 +03:00
Klaas Freitag
84f425a326
Remove WIN32 preprocessor directive from csync.c.
2013-04-20 11:38:25 +03:00
Olivier Goffart
112285c9aa
Fix too many PROPFIND when starting a sync
...
csync would not update the etag (md5) for directoru in the database if
the etag has changed, but none of the files within that directory
actually changed
2013-04-17 16:25:52 +02:00
Klaas Freitag
2b971a09f3
Make httpbf tests functional.
2013-04-17 15:21:38 +02:00
Klaas Freitag
35aaddda87
Added check on changes on the source file when uploading.
2013-04-16 16:27:40 +02:00
Klaas Freitag
24a562da49
More meaningful logging of read db fails.
2013-04-15 17:50:40 +02:00
Klaas Freitag
847c223408
More meaningful logging of read db fails.
2013-04-15 17:47:50 +02:00
Klaas Freitag
84febf4b77
Merge branch 'dav_0.70.5' into dav
2013-04-15 15:37:17 +02:00
Klaas Freitag
da52acbec6
Add FindPackage to httpbf module.
2013-04-15 15:32:21 +02:00
Klaas Freitag
8b52387c1a
Fix temp file name generation for Win32.
2013-04-15 13:24:46 +02:00
Daniel Molkentin
da5169bd55
Add ChangeLog for 0.70.6
2013-04-11 10:56:43 +04:00
Klaas Freitag
7171da53e8
Check that file is unchanged before copying in propagator.
2013-04-09 16:43:21 +02:00
Klaas Freitag
2a5c403d63
Default timeout to 300 seconds.
2013-04-09 15:18:26 +02:00
Klaas Freitag
c38514934c
A good word.
2013-04-09 14:41:36 +02:00
Klaas Freitag
90c4f52b34
Handle IGNORE status correctly.
2013-04-09 11:12:17 +02:00
Klaas Freitag
e93bf9fa0a
Fix for Coverity CID #996823
2013-04-09 09:42:38 +02:00
Daniel Molkentin
aa390dd17e
Set path and phash for ignored files
2013-04-08 14:21:00 +02:00
Klaas Freitag
6cee3f49bc
More robust error handling in utimes function
2013-04-08 12:27:27 +02:00
Klaas Freitag
1585cab673
Compare to explicit NULL for clearer code.
2013-04-08 09:11:25 +02:00
Klaas Freitag
a1ebf8556a
Fix for Coverity CID #996827
2013-04-08 09:07:19 +02:00
Andreas Schneider
85b565fcbe
csync: Use macros for CSYNC_STATUS checking.
2013-04-06 18:48:16 +02:00
Andreas Schneider
7934cde2db
csync: Pass the errno to csync_errno_to_status().
...
This is needed to be sure we are thread-safe. See also the manpage of
strerror_r(3).
2013-04-06 18:48:16 +02:00
Andreas Schneider
b701bf3d9b
csync: Rename UNSPEC_ERROR to UNSUCCESSFUL.
2013-04-06 18:48:16 +02:00
Klaas Freitag
4e6d54194f
Check for file equalness after having created a conflict file.
...
If the files are equal and the conflict was created because the
timestamps were screwed the conflict is removed again. This only
works on the local repository so far.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-06 18:48:11 +02:00
Klaas Freitag
9f7de96a73
Added c_compare_file function plus a test function.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-06 18:11:18 +02:00
Klaas Freitag
b8cf6f7f5c
Make VIO_METHOD_HAS_FUNC macro more robust.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-06 18:11:18 +02:00
Klaas Freitag
4280adc60a
More optimized database handling for csync journal build up.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-06 18:11:15 +02:00
Olivier Goffart
68fdf56db7
Add an API to be able to pass information to the vio module.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:22 +02:00
Klaas Freitag
bec2c4a2ea
Added get_status_string function.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:22 +02:00
Klaas Freitag
3de8a78e1c
Added error_string handling, improved error handling.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:22 +02:00
Klaas Freitag
2204c94770
Introduce csync status codes
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:22 +02:00
Klaas Freitag
7c138efd0e
Rename csync_errno_to_csync_error to csync_errno_to_csync_status.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:21 +02:00
Klaas Freitag
f4ee205fe9
Minor code cleanups, warning avoidings and indentation.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:21 +02:00
Klaas Freitag
aada909836
Use multibyte character in file system functions.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:21 +02:00
Klaas Freitag
33d57eec3c
Remove parenthesis to make Win32 compile and happy.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:21 +02:00
Klaas Freitag
f5c9458079
Define iconv conversions as thread safe varialbe instead of static.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:21 +02:00
Klaas Freitag
72dddfd7f5
Introduce csync status codes for a more detailed error reporting.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:21 +02:00
Klaas Freitag
10863cd32d
Add CSYNC_STATUS_CODE, a general csync status code.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:21 +02:00
Klaas Freitag
f8f82a9af2
Added custom errnos for use with csync in addition to the system errnos.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-04-05 17:40:21 +02:00
Klaas Freitag
5de0173804
Fix for Coverity CID #996824
2013-04-05 15:08:28 +02:00
Klaas Freitag
5d5ee328b0
Fix for Coverity CID #996825
2013-04-05 15:05:44 +02:00
Andreas Schneider
e1edda17db
getpass: Don't fail if stdin is not a tty.
...
We don't need to manipulate the tty state (such as turning off echo)
when prompting for passwords if we're not reading from a tty.
2013-04-05 14:12:05 +02:00
Daniel Molkentin
28aa1448c1
Remove superfluous frees.
2013-04-04 18:31:01 +02:00
Klaas Freitag
ec51a6933a
Improve c_tmpname function to generate tmp name properly.
2013-04-04 12:59:39 +02:00
Klaas Freitag
093b166319
Rename pi to progress_info.
2013-04-04 12:58:29 +02:00
Klaas Freitag
815f652f08
Move tmpname generation to utility function c_tmpname for cleander code.
2013-04-04 12:57:44 +02:00
Klaas Freitag
08d439129c
Fix some documentation in the code
2013-04-03 16:39:04 +02:00
Klaas Freitag
0bea2ea8f9
Push len computing to the right place.
2013-04-03 16:38:35 +02:00
Klaas Freitag
c745bf4291
Use correct printf qualifiers.
2013-04-03 16:37:55 +02:00
Olivier Goffart
9939e325cf
Fix crash when setting a NULL error
2013-04-03 10:53:20 +02:00
Klaas Freitag
34668e42b3
Merge branch 'dav_0.70.5' into dav - WIP
...
Conflicts:
CMakeLists.txt
CPackConfig.cmake
src/csync.h
src/csync_update.c
tests/ownCloud/t1.pl
2013-04-02 14:44:01 +02:00
Klaas Freitag
867595e1ef
Fix release date.
2013-04-02 10:01:28 +02:00
Olivier Goffart
296011436a
Store the error string in the database when blacklisting
2013-03-28 13:54:01 +01:00
Olivier Goffart
6659ee6d76
store the error string for files in the tree
2013-03-28 13:54:01 +01:00
Klaas Freitag
4b98ee0644
Pushed version to 0.70.6
2013-03-28 09:57:49 +01:00
Klaas Freitag
6de7ddf294
Use httpbf for all transfers.
2013-03-27 18:06:54 +01:00
Klaas Freitag
6f3168e88a
Added function to retrieve http error code and fix return value check.
2013-03-27 18:05:50 +01:00
Klaas Freitag
d1efcb7dd4
Changelog for 0.70.5
2013-03-27 15:29:27 +01:00
Klaas Freitag
2010c4ad21
Fix a typo.
2013-03-26 15:07:41 +01:00
Klaas Freitag
b826d59925
Make VIO_METHOD_HAS_FUNC macro more robust.
2013-03-26 12:39:52 +01:00
Klaas Freitag
5e0e42baaf
Make VIO_METHOD_HAS_FUNC macro more robust.
2013-03-26 12:35:35 +01:00
Klaas Freitag
5951039894
Improved C style and added more tests.
2013-03-26 12:01:48 +01:00
Klaas Freitag
a84332c910
Improved C style and added more tests.
2013-03-26 12:00:57 +01:00
Klaas Freitag
79c51540da
Check for file equalness after having created a conflict file.
...
If the files are equal and the conflict was created because the
timestamps were screwed the conflict is removed again. This only
works on the local repository so far.
Conflicts:
src/csync_propagate.c
2013-03-26 11:57:32 +01:00
Klaas Freitag
0baa80c235
Test added for c_compare_file.
2013-03-26 11:53:14 +01:00
Klaas Freitag
a71aef1731
Added c_compare_file function and test - WIP.
2013-03-26 11:52:46 +01:00
Klaas Freitag
466faba761
Fix test script.
2013-03-26 10:06:00 +01:00
Klaas Freitag
6aec7f4211
Push context to module to make logging of the module work.
2013-03-26 10:05:15 +01:00
Klaas Freitag
ef7c5c261d
Fix memory allocation for path.
2013-03-22 21:48:01 +01:00
Klaas Freitag
43fa6e4418
Check for file equalness after having created a conflict file.
...
If the files are equal and the conflict was created because the
timestamps were screwed the conflict is removed again. This only
works on the local repository so far.
2013-03-22 21:04:09 +01:00
Klaas Freitag
5657ff3d34
Fix: set path correctly.
2013-03-22 16:29:04 +01:00
Klaas Freitag
a3f29967f7
Test added for c_compare_file.
2013-03-22 13:54:46 +01:00
Klaas Freitag
d43779671f
Added missing changelog 0.70.4.
2013-03-22 11:09:24 +01:00
Klaas Freitag
7b7ce3a43c
Remove versions table before new creation.
2013-03-22 11:04:04 +01:00
Klaas Freitag
3ce614039a
Added c_compare_file function and test - WIP.
2013-03-22 10:23:17 +01:00
Klaas Freitag
8b229f6413
Minor fixups.
2013-03-22 10:22:50 +01:00
Klaas Freitag
19f07f9aea
Handle non statable files correctly, read missing info from db.
2013-03-20 21:56:09 +01:00
Klaas Freitag
945be9438c
Avoid variable name new to not confuse syntax highlighter.
2013-03-20 21:55:34 +01:00
Daniel Molkentin
abe53a8669
Do not define NDEBUG manually
2013-03-19 17:50:43 +01:00
Klaas Freitag
b82c156c7e
Bump version to 0.70.5
2013-03-19 16:23:10 +01:00
Klaas Freitag
d117593fd1
Fix a const char warning.
2013-03-19 16:23:05 +01:00
Klaas Freitag
5a8d90cc25
Fix path handling in update routine.
2013-03-19 16:22:11 +01:00
Klaas Freitag
20816f346d
Fix a apple only warning.
2013-03-19 16:21:36 +01:00
Klaas Freitag
db70a3b2ae
Skip files which are not statable and ignore links and such.
2013-03-19 14:20:38 +01:00
Klaas Freitag
e3a4ec453c
Handle non statable files gracefully.
2013-03-19 14:20:03 +01:00
Klaas Freitag
f88e9baf15
Handle renames in read only shares correctly.
2013-03-19 14:18:34 +01:00
Andreas Schneider
df2a04b4ab
misc: Include stdio.h for snprintf.
2013-03-19 14:18:12 +01:00
Andreas Schneider
061fa6cc1b
misc: Correctly handle getenv().
...
The returned string of getenv() has an unknown size. You need to store
the result always in a char array with a certain size to make sure we
don't feed tainted data to the next function call.
2013-03-19 14:17:44 +01:00
Klaas Freitag
13c44ad25c
Skip files which are not statable and ignore links and such.
2013-03-19 14:02:12 +01:00
Andreas Schneider
ab70947755
propagate: Fix renaming in the propagation.
2013-03-19 13:56:20 +01:00
Andreas Schneider
7d580916a8
modules: Add capabilities to smb module.
2013-03-19 13:46:06 +01:00
Andreas Schneider
029cdd4980
modules: Add capabilities to sftp module.
2013-03-19 13:45:50 +01:00
Klaas Freitag
d943b2880a
Handle non statable files gracefully.
2013-03-19 11:48:46 +01:00
Klaas Freitag
089d919be2
Fix mkdir tests, as they use relative pathes the cwd should be defined.
2013-03-14 14:29:31 +01:00
Klaas Freitag
d865905743
Use proper HBF result code.
2013-03-14 13:42:02 +01:00
Klaas Freitag
7630ab5807
Moved variable declaration.
2013-03-14 13:41:27 +01:00
Klaas Freitag
c263532ba3
Merge remote-tracking branch 'ogoffart/davbf' into dav
2013-03-14 13:36:55 +01:00
Klaas Freitag
38946ed025
More detailed error handling if one chunk fails.
2013-03-14 13:15:45 +01:00
Klaas Freitag
0ab1a4aeeb
Make chunk default size 10 MB
2013-03-14 13:15:21 +01:00
Andreas Schneider
480c97c487
cmake: Update compiler flags.
2013-03-14 10:10:41 +01:00
Klaas Freitag
dd74b12b48
Merge remote-tracking branch 'ogoffart/davbf' into dav
2013-03-13 17:13:42 +01:00
Olivier Goffart
2205c9a339
Resume chunked upload if conneciton is lost
2013-03-12 11:42:17 +01:00
Olivier Goffart
b4ec9f887c
Do not fetch folder id after propagation.
...
Delay that for the next sync.
(cherry picked from commit 1eb534dd53 )
2013-03-11 20:38:17 +01:00
Olivier Goffart
b99677f985
Only mark a folder as modified if files within it are modified.
2013-03-11 20:38:17 +01:00
Andreas Schneider
2ef1c72726
std: Refactor c_rename().
2013-03-11 11:23:05 +01:00
Andreas Schneider
4c83526676
std: Implement error checks for c_iconv().
2013-03-11 11:13:21 +01:00
Andreas Schneider
862f83988f
tests: Update valgrind suppressions.
2013-03-08 18:50:26 +01:00
Andreas Schneider
0b5a83fc7f
tests: Fix memleaks in encoding test.
2013-03-08 18:50:26 +01:00
Andreas Schneider
13901b23f0
tests: Fix memleaks in vio test.
2013-03-08 18:50:22 +01:00
Olivier Goffart
6a5ad6e81e
Revert "Do not fetch folder id after propagation."
...
This reverts commit 1eb534dd53 .
Because folder re-appears in some cases
(IL issue #143 )
2013-03-08 17:47:39 +01:00
Klaas Freitag
2cc291c520
tests: Add treewalk test.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-03-08 15:55:03 +01:00
Klaas Freitag
87c313485b
tests: Treewalk function unit tests added.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-03-08 15:55:03 +01:00
Klaas Freitag
cf75a71b8b
Make use of push_to_tmp_first function.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-03-08 15:55:03 +01:00
Klaas Freitag
d7a4a574ab
Add a vio capabilites function to let a module define its capabilities.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-03-08 15:54:55 +01:00
Olivier Goffart
e05b44b06d
Fix blacklist with renamed files
...
When renaming blacklisted files, we still need to find the other node to
mark the error
2013-03-07 11:07:38 +01:00
Klaas Freitag
47b1e64059
Handle renames in read only shares correctly.
2013-03-06 16:00:28 +01:00
Olivier Goffart
1eb534dd53
Do not fetch folder id after propagation.
...
Delay that for the next sync.
2013-03-05 20:33:18 +01:00
Klaas Freitag
f211ee8bf1
Add a command line option to set a http proxy (owncloud only)
2013-03-05 15:33:14 +01:00
Andreas Schneider
8d43a743a1
misc: Include stdio.h for snprintf.
2013-03-05 10:49:08 +01:00
Andreas Schneider
fc16af05a5
misc: Include stdio.h for snprintf.
2013-03-05 10:45:33 +01:00
Andreas Schneider
3041e73b0a
misc: Correctly handle getenv().
...
The returned string of getenv() has an unknown size. You need to store
the result always in a char array with a certain size to make sure we
don't feed tainted data to the next function call.
2013-03-05 10:43:28 +01:00
Andreas Schneider
fdb2fe3ef9
misc: Correctly handle getenv().
...
The returned string of getenv() has an unknown size. You need to store
the result always in a char array with a certain size to make sure we
don't feed tainted data to the next function call.
2013-03-05 10:24:34 +01:00
Olivier Goffart
d6a6fb0d67
Keep the tmp file and resume from it
2013-03-02 15:02:27 +01:00
Olivier Goffart
53ad4a910f
Progress database:
...
Remember about errors, and don't retry if there is more than 3 errors
Conflicts:
src/csync_propagate.c
2013-03-02 15:01:40 +01:00
Olivier Goffart
2e73ce5605
owncloud: Properly report the error when the connection drop
2013-03-02 15:01:40 +01:00
Olivier Goffart
0906312c02
Merge remote-tracking branch 'freitag/dav' into davbf
2013-03-02 13:43:59 +01:00
Olivier Goffart
ca20703370
httpbf: Fix leak
2013-03-02 13:42:36 +01:00
Olivier Goffart
259b6050bf
Progress database:
...
Remember about errors, and don't retry if there is more than 3 errors
2013-03-01 12:31:20 +01:00
Andreas Schneider
457086c63e
tests: Apply changes to the logging system.
2013-03-01 10:06:06 +01:00
Andreas Schneider
91d92bfa16
log: Add functions to set userdata for the logging callback.
2013-03-01 09:59:55 +01:00
Olivier Goffart
355a807775
Fix removing of folder when the folder is locked on windows.
...
When the folder is locked on windows, rmdir fails and the folmder is not
removed. But on the next sync, one should try to remove that folder again, and
not upload it to the server as we did before.
There was two problems:
1- The removed folder is still in the DB, so when csync_update read from
DB, for the remote, it still finds it. Fix that by storing an empty MD5
for directories that should have been deleted.
2- The folder is likely to be modified since its contents are gone.
Which means next sync will try to sync it back to the server.
Fix that by refreshing the mtime in the tree
2013-02-25 11:32:32 +01:00
Klaas Freitag
b216b9f546
Push version to 0.70.4
2013-02-20 17:39:16 +01:00
Klaas Freitag
fed597c840
Only try the PROPFIND again if the error is ERRNO_WRONG_CONTENT.
2013-02-20 17:38:09 +01:00
Klaas Freitag
3d4b426137
Removed some useless logging.
2013-02-19 09:40:14 +01:00
Andreas Schneider
2d6514b509
owncloud: Fix some problems in the owncloud module.
...
Thanks to Patrick Buergi.
2013-02-19 08:36:46 +01:00
Andreas Schneider
11b539088e
client: Fix connection to a remote with password in it.
...
The password needs to be cleaned after we processed the uri.
Thanks to Patrick Buergi.
2013-02-19 08:35:20 +01:00
Andreas Schneider
fc2b860022
client: Fix setting the debug level.
...
Thanks to Patrick Buergi.
2013-02-19 08:34:44 +01:00
Olivier Goffart
ca34c4fd5f
Fix removing of folder when the folder is locked on windows.
...
When the folder is locked on windows, rmdir fails and the folmder is not
removed. But on the next sync, one should try to remove that folder again, and
not upload it to the server as we did before.
There was two problems:
1- The removed folder is still in the DB, so when csync_update read from
DB, for the remote, it still finds it. Fix that by storing an empty MD5
for directories that should have been deleted.
2- The folder is likely to be modified since its contents are gone.
Which means next sync will try to sync it back to the server.
Fix that by refreshing the mtime in the tree
2013-02-13 19:20:26 +01:00
Olivier Goffart
1be65be68e
Fix crash in owncloud_mkdir
...
ne_simple_request destroy the request, we cannot access the error code
after it.
2013-02-13 18:25:28 +01:00
Olivier Goffart
b6a37064e9
Allow to configure the timeout in the config
2013-02-13 18:25:28 +01:00
Olivier Goffart
2e945c07af
owncloud: fix session cookie again.
...
Some load balancers may add more cookies, and we would pick the wrong
one. So keep all the cookies.
If we already read a session cookie, don't parse more cookie as they are
not session cookie.
2013-02-13 18:25:28 +01:00
Klaas Freitag
7d1d880a9b
Return a proper error code in case the file is locked on win32.
2013-02-13 12:38:50 +02:00
Olivier Goffart
b028c64325
In case of error dirring a rename, mark the source as updated
...
That way, the file will be saved in the DB again, and the next try, it
will retry to rename
2013-02-12 15:11:15 +01:00
Olivier Goffart
79bbbe75d7
Report error to the callback in mkdir and rename
2013-02-12 13:36:17 +01:00
Klaas Freitag
75cc77b947
Fixed build on win.
2013-02-10 16:43:38 +01:00
Klaas Freitag
c98f2dfba9
Do PROPFIND with multiple attempts to fix owncloud/mirall #285
...
temporarily.
2013-02-09 17:13:57 +01:00
Klaas Freitag
0410771d1b
Log the response buffer if the propfind response is not XML.
...
This will help to debug the problem described in bug owncloud/mirall
2013-02-09 17:13:56 +01:00
Klaas Freitag
b92a5f55b8
Fixed a typo lintian brought up.
2013-02-09 17:13:56 +01:00
Olivier Goffart
8646246e75
Also report the error for the other node in case of error
2013-02-08 21:51:03 +01:00
Olivier Goffart
5a262d7588
Fix crash in owncloud_mkdir
...
ne_simple_request destroy the request, we cannot access the error code
after it.
2013-02-08 21:06:25 +01:00
Daniel Molkentin
2b8925c210
FindNeon: Work on non-xbuilds as well
2013-02-08 16:08:29 +03:00
Daniel Molkentin
79159ae32c
Remove debug line
2013-02-08 15:56:26 +03:00
Olivier Goffart
7edc31048a
owncloud: Retry when a download fails because of a timeout
2013-02-08 13:46:53 +01:00
Daniel Molkentin
a6f63aea94
Safely detect neon-config in cross builds
2013-02-08 15:46:42 +03:00
Klaas Freitag
a79c380707
Remove strange _tcslen define and fixed some potential leaks.
2013-02-07 14:45:12 +02:00
Klaas Freitag
b167b6e2d8
Fix a leak and simplify code.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-07 12:59:41 +01:00
Klaas Freitag
c2757cd7be
Make _tmkdir define argument aware to simplify the usage even more.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-07 12:59:38 +01:00
Klaas Freitag
56afb2dc04
Fixed mem leaks in c_dir functions.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-07 12:59:36 +01:00
Klaas Freitag
41021d58d5
tests: Ported more tests to be cross platform capable.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-07 12:59:33 +01:00
Klaas Freitag
c7e60b5231
Renamed filename encoding functions.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-07 12:59:31 +01:00
Andreas Schneider
87aee96b98
update: Fix a memleak in the file tree walker.
...
Reviewed-by: Klaas Freitag <freitag@owncloud.com >
2013-02-07 12:56:03 +01:00
Olivier Goffart
2615205adc
Fix renaming folder when a file was modified by another client
2013-02-06 18:40:03 +01:00
Olivier Goffart
170e5389b3
Do not issue a rename when the file was modified localy
2013-02-06 18:40:03 +01:00
Olivier Goffart
71caa3356c
Automatically creates the destination folder if it does not exist
2013-02-06 18:40:02 +01:00
Olivier Goffart
0cf770017d
Do not abort when move fail
2013-02-06 18:40:02 +01:00
Olivier Goffart
77a25eafbb
remove wrong comments
2013-02-06 18:40:02 +01:00
Olivier Goffart
fe756799d2
Make it work when renaming a directory and a subdirectory at the same
...
time
2013-02-06 18:40:02 +01:00
Olivier Goffart
0c874f0c3c
fix some issues while moving. Now it works in simple cases
2013-02-06 18:40:02 +01:00
Olivier Goffart
3793d725a7
avoid double free
2013-02-06 18:40:02 +01:00
Olivier Goffart
77d77ff056
Compile the header with a C++ compiler
...
template is a keyword in C++
2013-02-06 18:40:02 +01:00
Olivier Goffart
d88c58deae
WIP: rename folders
2013-02-06 18:40:02 +01:00
Olivier Goffart
bdd331ee08
Allow to configure the timeout in the config
2013-02-06 18:38:46 +01:00
Andreas Schneider
7cb8763e13
cmake: Don't copy and install deprecated csync_log.conf.
2013-02-06 18:20:39 +01:00
Andreas Schneider
5baf362af0
Revert "WIP"
...
This reverts commit acd7080329 .
Oops :)
2013-02-06 18:18:04 +01:00
Andreas Schneider
acd7080329
WIP
2013-02-06 17:48:19 +01:00
Klaas Freitag
1e61a03f32
Fix const warnings after revert of wrong SAFE_FREE patch.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 15:11:41 +01:00
Klaas Freitag
877bf0c90f
Remove definition of _tcslen to avoid confusion.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 15:11:41 +01:00
Klaas Freitag
5b6d971055
No more platform specific code in csync_vio_local.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 15:11:41 +01:00
Klaas Freitag
5d9306c841
Deprecate blksize and blkcount of the stat struct. Not needed in csync.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 15:11:41 +01:00
Klaas Freitag
0bc0181f91
Added c_rename function to do platform specific renaming.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 15:11:41 +01:00
Klaas Freitag
390a307840
tests: Cleaned up some encoding tests.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 15:11:41 +01:00
Klaas Freitag
c45ca25c28
Avoid crash in iconv destroy.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 15:11:41 +01:00
Klaas Freitag
874a820426
Use correct variable type to make test build on win32.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 15:11:41 +01:00
Klaas Freitag
4d3a30c21f
Fixed typo in variable name.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 15:11:41 +01:00
Daniel Molkentin
9c0c693081
Add iconv support to convert charsets to different platforms.
2013-02-06 15:11:40 +01:00
Olivier Goffart
13bb5ca2c3
Fix memory leaks and some more multibyte conversoins.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:44:40 +01:00
Klaas Freitag
6b3ac8c685
Use _tclosedir rather than closedir.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:44:14 +01:00
Klaas Freitag
f2b9bc6d0d
Use wide char variable to remove directory.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:43:49 +01:00
Klaas Freitag
7d0acf9ba3
Encoding test and make all tests work cross platform.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:42:17 +01:00
Klaas Freitag
d2e5fc66fa
ownCloud: Added missing brackets.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:39:58 +01:00
Klaas Freitag
e40a810187
Make client compile with picky compiler.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:39:21 +01:00
Klaas Freitag
1d703ee6c4
Rename _TCHAR type to mbchar_t.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:38:58 +01:00
Klaas Freitag
ce080d5ee1
Fix definition of tmp file name.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:38:25 +01:00
Klaas Freitag
0e804ca685
Added wide character to utf8 and vice versa conversion functions.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:37:51 +01:00
Klaas Freitag
201d0ec97c
Define abstractions for cross platform file operations with wide char.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:37:11 +01:00
Klaas Freitag
b152b39e67
ownCloud: Use wide char aware file system functions.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:36:29 +01:00
Klaas Freitag
9120098811
Use wide character abstraction functions for file operations.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:27:53 +01:00
Klaas Freitag
922254ba94
Defined abstractions for basic file operations to use with wide char.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:23:55 +01:00
Klaas Freitag
bd4c9b3a7f
Added wide character to utf8 and vice versa conversion functions.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org >
2013-02-06 14:23:14 +01:00
Olivier Goffart
50dac60bc9
owncloud: fix session cookie again.
...
Some load balancers may add more cookies, and we would pick the wrong
one. So keep all the cookies.
If we already read a session cookie, don't parse more cookie as they are
not session cookie.
2013-02-06 12:32:48 +01:00
Klaas Freitag
b7a740d0b3
Switch off unix extensions like the server, see mirall bug #204 .
2013-02-05 12:38:40 +01:00
Andreas Schneider
8b7cab119b
std: Add discard_const macros.
2013-01-30 16:09:51 +01:00
Olivier Goffart
624c99de8f
Make progress works correctly when files are chunked
2013-01-30 12:29:56 +01:00
Olivier Goffart
53b1edd1dc
httpbf: Make sure to use unsigned number as the id
...
Else, we can have filename like foo-chunking--1234-4-0 and the double
dash make the serverside regexp fail
2013-01-29 16:23:55 +01:00
Olivier Goffart
e75f11b87a
Use httpbf in owncloud
2013-01-29 16:23:28 +01:00
Olivier Goffart
c716fbb96e
Refactoring: create the neon request in sendfile
...
... instead of open.
That way we can do something else for the big files
2013-01-29 16:22:46 +01:00
Klaas Freitag
e134c85ae7
Initial checkin of the http-big-file handling.
2013-01-28 21:17:23 +01:00
Klaas Freitag
52f33de902
Set version to 0.70.3 plus ChangeLog
2013-01-24 10:39:42 +01:00
Klaas Freitag
4ca84c80c6
Do not limit Cookie detection to PHPSESSID only (mirall#260)
2013-01-24 10:06:42 +01:00
Klaas Freitag
0d6b32ed0a
Updated Changelog
2013-01-23 16:03:34 +01:00
Klaas Freitag
460947a3ac
Set version to 0.70.2 for release
2013-01-23 14:05:58 +01:00
Klaas Freitag
96f9c09e35
Fix a crash for the case that csync_init fails.
2013-01-22 16:48:36 +01:00
Klaas Freitag
1db825a733
Set path shortcuts for win32 as well.
2013-01-21 13:38:33 +01:00
Olivier Goffart
b7cbd311ba
Fix connection with NTLM proxy (should go to dav branch)
2013-01-18 16:28:42 +01:00
Klaas Freitag
82a3e49d82
Bump version to 0.70.1 for oCC 1.2.0 beta2
2013-01-16 16:37:09 +01:00
Klaas Freitag
ccc9419a58
Reduce the sqlite_compile errors dramatically.
2013-01-16 16:27:59 +01:00
Klaas Freitag
21379de9c3
Fixed comment and initialized errno for stat.
2013-01-16 16:25:51 +01:00
Klaas Freitag
5b1a9d8ed8
Handle 405 status code in mkdir correct as EEXIST.
2013-01-16 13:48:52 +01:00
Klaas Freitag
e83cc82f0d
remove a duplicate void'ing.
2013-01-16 13:47:41 +01:00
Klaas Freitag
0752aff55a
Handle 405 as EPERM rather than EEXIST
2013-01-16 11:42:13 +01:00
Klaas Freitag
23fe05604b
Added new error types for service unavail, quoto and file too big.
2013-01-13 21:39:54 +01:00
Olivier Goffart
3b4b500d4f
leak fix
2013-01-10 11:32:42 +01:00
Olivier Goffart
de87ed2d31
Make it a error when the file cannot be created
...
Mark it a an error when the file cannot be created because the folder
cannot be created.
Should display errors on windows if the file is too long
2013-01-10 11:32:42 +01:00
Olivier Goffart
97e0e75ae2
Missing errno code on mingw
2013-01-10 11:32:42 +01:00
Olivier Goffart
6f1e70aae6
Always use the db even if the mtime change localy.
...
As long as the md5 is the same, use the db, even if the mtime change
localy.
2013-01-10 11:32:42 +01:00
Olivier Goffart
c8e274110a
Don't abort in merge_tree if the file don't exist
...
Scenario:
We have A/B/C/file.txt
mv A/B/{C,C2}
start sync, and before sync ends
mv A A2
then as sync start and we try to merge, since it is no longer possible
to stat A/B/ which has been updated as C was moved, then the database
would not be synced
then start sync again and A/B/C2/file.txt is seen as new, and is
duplicated
By saving the database anyhow we work around that problem
2013-01-10 11:32:41 +01:00
Olivier Goffart
5b8917672c
Only do the correctId after both the remote and the local have been processed
...
It is important if there are operations such as delete, which operate on
the remote tree, and thet may also invalidate the id we got on the
localtree (for example, the parent directory of a removed file)
2013-01-10 11:32:27 +01:00
Olivier Goffart
b23d15eb11
csync_tree_walk: let the visitor change the instruction
2013-01-10 11:32:20 +01:00
Olivier Goffart
9998c7cde1
Do not fetch the id in _csync_sync_dir
...
But rather at then end
2013-01-10 11:28:01 +01:00
Olivier Goffart
0cf1061248
Reduce the number of stat when creating new directory.
...
Do not do a stat before, it is unlikely that it succeed, and if it does
indeed show there is a file with the same name, the following mkdir ill
fail properly
(The only difference will be that EEXIST will be returned instead of
ENOTDIR
2013-01-10 11:27:52 +01:00
Olivier Goffart
9261f66fd8
Do not fetch the id of new directory in _csync_new_dir
...
Delay the id update to after when we do all the directory. When we
create ne directory it is likely that there will be something inside.
2013-01-10 11:21:12 +01:00
Olivier Goffart
00ee9f4960
leak fix
2013-01-10 11:18:54 +01:00
Klaas Freitag
96eb138410
Make big file support working for win32.
2013-01-09 15:06:03 +01:00
Klaas Freitag
3d4ba6c29b
Write config files after all directories were traversed.
2013-01-09 15:04:17 +01:00
Klaas Freitag
ba21a9b3a2
Check if neon was built with LFS support.
2013-01-09 15:03:20 +01:00
Klaas Freitag
5e4c0acc6b
Use wide char variable to remove directory.
2013-01-09 15:02:07 +01:00
Klaas Freitag
c2844b0545
Added csync_get_error_string function to provide backend errors.
2012-12-20 20:47:10 +01:00
Klaas Freitag
70e89720d5
Some code cleanups, removed not needed stuff.
2012-12-20 17:10:03 +01:00
Klaas Freitag
d6287fb5e3
fix win32 build, ifdefed non existing errnos.
2012-12-19 20:20:26 +01:00
Klaas Freitag
a880949836
Display all SSL certificates from the chain to the user to approve.
2012-12-19 18:06:36 +01:00
Klaas Freitag
3343601179
Remove temp files if GET fails, fixes owncloud/mirall#194
2012-12-19 12:41:16 +01:00
Klaas Freitag
e5b95540e7
drop not longer needed case statement.
2012-12-19 12:31:56 +01:00
Andreas Schneider
c795010988
log: Use a thread local variable for logging callback.
2012-12-18 14:25:35 +01:00
Andreas Schneider
490d3016e6
priv: Remove log_verbosity variable.
2012-12-18 14:16:50 +01:00
Klaas Freitag
fe048f69cd
Set version to upcoming version 0.70.0
2012-12-18 13:50:56 +01:00
Klaas Freitag
bbf4e07579
Proper errno to csync error conversion, more errno fixes in oC module.
2012-12-17 17:22:24 +01:00
Andreas Schneider
9a539526f1
log: Use a thread local variable for the log level.
2012-12-17 09:40:17 +01:00
Andreas Schneider
28c6c9a6df
std: Add missing copyright header for c_dir.c.
2012-12-15 12:37:47 +01:00
Klaas Freitag
ecf09c4077
Added error_string handling with modules
2012-12-14 16:49:03 +01:00
Klaas Freitag
e3ef10765b
Avoid a compile warning.
2012-12-14 16:49:03 +01:00
Olivier Goffart
5bc95e1667
Fix memory leak
2012-12-14 11:19:14 +01:00
Olivier Goffart
89241013c3
Owncloud: Do not use PATH_MAX
...
We should not limit the size of the buffers to arbitrary values.
Should fix https://github.com/owncloud/mirall/issues/174
2012-12-14 00:14:45 +01:00
Olivier Goffart
1c8dde3b61
owncloud: install the compression hook in sendfile
...
In some cases (if the local file can't be opened) close will be called
without calling sendfile. That would result in the hook leaking, and
causing crash because it is only unhooked in sendfile.
2012-12-14 00:14:44 +01:00
Olivier Goffart
c09461a9e4
After a move, we also need to refresh the id of the destination folders
...
Else, the id are not good, and if we move folders like this:
mv folderA folderB
csync
mv folderB folderC
csync
we want that the first sync refresh correctly the folderB id so that the
second sync do not re-create folderB
When working on the renamed path, we are on the remote tree, but the new
folder is only on the local tree. hence the 'tree' passed to the helper
function is not the same.
2012-12-14 00:14:44 +01:00
Olivier Goffart
10965eaa98
Fix renaming if the other file already exist on the server.
...
In that case, we have a conflict. Handle it the same ways as for new
files.
2012-12-12 14:20:48 +01:00
Olivier Goffart
4e8ff9ae05
Fix end of file.
...
csync_util.c:347:1: error: no newline at end of file [-Werror,-pedantic,-Wnewline-eof]
2012-12-12 14:20:48 +01:00
Klaas Freitag
654e87a9d5
Fix temp name creation: Place dot correctly for hidden files.
2012-12-12 14:18:30 +01:00
Klaas Freitag
5772021a53
Merge remote-tracking branch 'ogoffart/dav' into dav
2012-12-12 13:37:10 +01:00
Klaas Freitag
ab595a4c8f
Add another useful logging line.
2012-12-12 13:36:58 +01:00
Markus Goetz
316fd7b036
Exclude: Tell which file we load
2012-12-11 17:28:37 +01:00
Markus Goetz
fded216fb6
Propagate: Fix file name pattern
...
Starting with dot on Windows is a bad idea
2012-12-11 17:26:46 +01:00
Klaas Freitag
246e10c403
Up- and download errors are soft errors.
2012-12-11 15:27:00 +01:00
Markus Goetz
bd71ddf0aa
Iconv: Also search in /usr on OS X
2012-12-11 14:25:56 +01:00
Daniel Molkentin
fc8ec72371
Fix c&p error
2012-12-11 12:09:51 +01:00
Daniel Molkentin
1507ca2eaf
Split download state
2012-12-11 12:09:33 +01:00
Klaas Freitag
8ed89bca86
Hide temp files for download to local.
2012-12-11 11:35:38 +01:00
Klaas Freitag
1705a309b2
Merge remote-tracking branch 'ogoffart/dav' into dav
2012-12-10 21:16:05 +01:00
Klaas Freitag
70a273eafd
Do not compile lock test for win32.
2012-12-10 21:15:45 +01:00
Klaas Freitag
faa1b83e9e
Fixed rename function to use TCHAR.
2012-12-10 21:15:31 +01:00
Klaas Freitag
128c69676f
Added some useful logging for GET
2012-12-10 21:15:08 +01:00
Klaas Freitag
64683332c7
Remove wrong comment.
2012-12-10 20:49:08 +01:00
Markus Goetz
42b090ec0d
Propagate: Change temp file name
...
.. to something already in the exclude list
2012-12-10 19:15:16 +01:00
Markus Goetz
885e073b8a
Win32: Hide file while downloading
2012-12-10 19:15:16 +01:00
Olivier Goffart
bac1311486
Don't include "config.h" in the public header.
...
That file is not installed. So it makes compiler error when trying to
include csync.h from an external project
2012-12-10 17:03:36 +01:00
Olivier Goffart
01d2586f1e
Owncloud: Report the error in the progress callback
2012-12-10 16:51:13 +01:00
Olivier Goffart
8e3331ad1d
Suppress a warning
...
The csync_set_module_property shows a warning if init is not finished
2012-12-10 16:15:26 +01:00
Olivier Goffart
7759eb4b6d
Say which function it is in the error messages
2012-12-10 16:15:26 +01:00
Daniel Molkentin
131e52b370
Unbreak win32
2012-12-09 02:44:34 +03:00
Klaas Freitag
9b1dcb23f8
Avoid crash in iconv destroy.
2012-12-08 11:06:29 +01:00
Markus Goetz
568a71daa0
Only send gzip Accept-Encoding
...
.. because later we only support gzip (and not deflate) anyway
2012-12-08 11:06:29 +01:00
Markus Goetz
7ee75f5499
Unify compress_reader and uncompress_reader
...
They are the same code anyway
2012-12-08 11:06:29 +01:00
Olivier Goffart
d3585db4ba
Owncloud: Add the fingerprint in the ssl warning mesage
...
Then the client can compare ssl certificate fingerprint
2012-12-08 11:06:29 +01:00
Olivier Goffart
58aaf98369
Only request the id for REMOTE_REPLICA after mkdir
2012-12-08 11:06:29 +01:00
Olivier Goffart
fa0c458bb3
Owncloud: Fix getting id from id cache.
...
We need to remove the quotes around the ETag
2012-12-08 11:06:29 +01:00
Olivier Goffart
415a86edeb
owncloud: Fix GET requests
...
the download via the get function DOES NOT require a full uri
2012-12-08 11:06:29 +01:00
Olivier Goffart
410eadf2f5
print a warning when calling set_module_property at the wrong time
2012-12-08 11:06:28 +01:00
Daniel Molkentin
3f24ab599c
Do not compile with iconv on windows
2012-12-07 23:12:37 +01:00
Daniel Molkentin
49d2fd685b
iconv support
...
This allows for files on mac to automatically be converted to UNC
2012-12-07 13:03:01 +01:00
Klaas Freitag
82acccf333
Some more cleanpus.
2012-12-07 09:02:42 +01:00
Klaas Freitag
c4b88129db
Adopt module logging to new logging API.
2012-12-07 09:02:25 +01:00
Olivier Goffart
30548b26e3
Remove some superfluous call to the progress callback
2012-12-06 16:49:08 +01:00
Olivier Goffart
5bdaf83c67
Don't remove trailing slash
...
There is no trailing slashes in the path
2012-12-06 16:42:22 +01:00
Olivier Goffart
0eb1855345
Revert "Only refresh the folder id for remote replica"
...
This reverts commit ce94beb068 .
This broke because the tree are not merged yet.
If a file was added on the remote, it is not yet in the remote tree, and
still we need to query the ETag
2012-12-06 16:36:13 +01:00
Olivier Goffart
b989518af3
Only request file id for remote replica
2012-12-06 16:28:37 +01:00
Olivier Goffart
5ff6baaf85
Owncloud: cache the ETAG: while doing a GET
...
Makes downloading of lots of big files twice as fast
2012-12-06 14:59:26 +01:00
Olivier Goffart
7b4e4f349e
No need to query the id again after syncing the dir
...
If there was a change, then a file would be changed, and we would do that anyway,
If there was no change, it is a waste to do it
2012-12-06 14:59:26 +01:00
Klaas Freitag
0b951ab6b1
Fixed more compile warnings.
2012-12-06 13:18:54 +01:00
Klaas Freitag
e6ad2140eb
Fixing more errno handling.
2012-12-06 13:15:25 +01:00
Daniel Molkentin
f461903a1a
Reduce compiler warnings
2012-12-06 11:49:25 +01:00
Klaas Freitag
6d9bd79ccb
Cleanup and fix == error.
2012-12-06 11:39:53 +01:00
Klaas Freitag
e997af227c
Merge remote-tracking branch 'ogoffart/dav' into dav
2012-12-06 11:35:10 +01:00
Klaas Freitag
588df3124c
Shorten log line a bit by removing the year part of the date.
2012-12-06 11:34:26 +01:00
Klaas Freitag
40206e0eab
Fix case statement for error code generation.
2012-12-06 11:34:03 +01:00
Olivier Goffart
ce94beb068
Only refresh the folder id for remote replica
...
Also don't remove trailing slash, there is no trailing slashes in the
path
2012-12-05 18:18:45 +01:00
Markus Goetz
69a979c16b
ownCloud: Allow HTTP timeout to be settable
2012-12-05 18:15:56 +01:00
Klaas Freitag
5c44eb563f
Removed wrong csync_vio_file_stat_destroy calls.
2012-12-05 15:58:14 +01:00
Olivier Goffart
f946dd4287
Owncloud: cache the last PROPFIND call.
...
So we do not need to have two calls (stat+opendir)
2012-12-05 14:49:50 +01:00
Olivier Goffart
c4dc285ff0
Move the errno codes to another header
...
We can't include csync_private.h from the modules
2012-12-05 14:43:37 +01:00
Olivier Goffart
0169b034f3
Use the full URL in the callback instead of just the path
2012-12-05 14:43:36 +01:00
Klaas Freitag
41c4e05b93
Fix error reporting from sendfile method.
2012-12-05 14:19:22 +01:00
Klaas Freitag
fb3662127c
Better error checking on get_file_id.
2012-12-05 12:55:05 +01:00
Klaas Freitag
d3378a7991
Some cleanups to avoid compile warnings.
2012-12-05 12:54:50 +01:00
Klaas Freitag
79d5e19a65
Remove left over WIP code.
2012-12-05 12:38:57 +01:00
Klaas Freitag
823706caac
Use cross platform stat type and free mem of lastDir.
2012-12-05 12:38:29 +01:00
Klaas Freitag
aaa8fe6e34
Commented loggings as currently logging is broken.
2012-12-04 18:41:20 +01:00
Klaas Freitag
b428b46ff8
Fix return code from sendfile.
2012-12-04 18:13:28 +01:00
Klaas Freitag
3e8c5e92cc
Removed leftover variables.
2012-12-04 18:12:42 +01:00
Olivier Goffart
f18f58ace0
Add progress callback
2012-12-04 17:26:23 +01:00
Olivier Goffart
f2f1672ba6
Owncloud: don't use userdata for proxy parameter
...
Use set_module_propery instead
2012-12-04 17:22:11 +01:00
Olivier Goffart
36715f54ef
owncloud: get session cookie from a module property
2012-12-04 17:22:11 +01:00
Olivier Goffart
0f35b92d75
Add an API to be able to pass information to the vio module
2012-12-04 17:22:11 +01:00
Klaas Freitag
ca30b99cea
More accurate setting of errno with custom values.
2012-12-04 17:03:00 +01:00
Klaas Freitag
d2730f6133
Clean read and write functions in owncloud_module.
2012-12-04 17:02:39 +01:00
Klaas Freitag
9e3dd6e5c8
Simplify up- and download through sendfile method in owncloud module.
2012-12-04 15:04:22 +01:00
Klaas Freitag
0d4c824fbf
Add sendfile method including a module capability.
2012-12-04 15:03:49 +01:00
Klaas Freitag
13f51c85ab
Make definition of fhandle_t more visible.
2012-12-04 15:02:13 +01:00
Andreas Schneider
7fefdc1800
modules: Fix csync_dummy modules license header.
2012-12-04 13:51:11 +01:00
Andreas Schneider
0a9cca8441
modules: Fix csync_owncloud module license header.
2012-12-04 13:50:14 +01:00
Andreas Schneider
c4f46608dc
modules: Fix csync_smb module license header.
2012-12-04 13:49:40 +01:00
Andreas Schneider
9ca550f93a
modules: Remove csync_sftp2 module.
2012-12-04 13:48:31 +01:00
Andreas Schneider
c2ced426ef
modules: Fix csync_sftp module license header.
2012-12-04 13:48:13 +01:00
Klaas Freitag
13354b6e8b
Removed old log callback code.
2012-12-03 19:41:44 +01:00
Klaas Freitag
924a19b8ea
Push variable declaration where its needed.
2012-12-03 19:40:06 +01:00
Klaas Freitag
41adbbdea7
Remove LOG_TO_CALLBACK cmake option.
2012-12-03 19:39:39 +01:00
Olivier Goffart
b8fd96fc62
Merge remote-tracking branch 'ogoffart/dav' into dav
2012-12-03 18:23:25 +01:00
Olivier Goffart
cab1324d18
Remove references to ocsync_log.conf
2012-12-03 17:56:47 +01:00
Olivier Goffart
04ebe966d2
Fix compilation after merge.
...
Log in owncloud module is temporarly disabled because it does not
compile as upstream added the context in the log.
2012-12-03 17:45:40 +01:00
Olivier Goffart
95edd6a9de
Merge remote-tracking branch 'origin/master' into dav
...
Conflicts:
config/ocsync_log.conf
src/csync.c
src/csync.h
src/csync_config.c
src/csync_log.h
src/csync_private.h
src/csync_statedb.c
tests/csync_tests/check_csync_config.c
2012-12-03 17:32:08 +01:00
Klaas Freitag
9c1893fa6d
Fix for #123 : Move declaration to top of function to escape goto.
2012-11-29 13:38:28 +01:00
Daniel Molkentin
9c853594e8
owncloud: Clean up resources allocated by neon
...
Fixes crashes that result from owncloud running out of FDs,
like oc-920.
2012-11-28 12:57:22 +01:00
Klaas Freitag
01ba8d4a9b
Wide char fixes for exclude, lock and statedb.
2012-11-27 15:39:06 +01:00
Klaas Freitag
f90550775c
Fixed tests to also run on debian host
2012-11-23 12:51:01 +01:00
Klaas Freitag
3fcc56ebbc
Add removal of a test dir
2012-11-23 11:43:39 +01:00
Klaas Freitag
1147e77d67
Fix delete in csync_config
2012-11-23 11:26:24 +01:00
Markus Goetz
d74c81feee
Owncloud: Add support for sending a cookie
2012-11-22 21:54:34 +01:00
Daniel Molkentin
ea14dc1a75
Bump version for cpack as well
2012-11-22 16:55:41 +01:00
Klaas Freitag
9eda137c77
Commented too verbose logging.
2012-11-22 15:25:27 +01:00
Klaas Freitag
a180b1c400
Changelog for 0.60.2
2012-11-21 16:12:37 +01:00
Klaas Freitag
24e137ca19
Detect loop in mkdir function to prevent looping in readonly Shared.
2012-11-21 14:53:54 +01:00
Klaas Freitag
7bce6696d4
Discover DST time error and correct.
2012-11-20 17:33:25 +01:00
Klaas Freitag
6e29ec7a7c
:x
2012-11-20 17:26:05 +01:00
Klaas Freitag
eae3b863d0
Log the http result code of the propfind
2012-11-19 13:11:26 +02:00
Klaas Freitag
917eeea48c
ownCloud: Added a stricter check on HTTP PROPFINDs.
...
Now check on both the result code and the content type of the
reply. If the content-type is not applicaton/xml do not accept the
answer even if the status code is good.
This fixes https://github.com/owncloud/mirall/issues/92
2012-11-17 21:15:59 +01:00
Klaas Freitag
3265e2c6a2
Handle PUT fail correctly.
2012-11-16 12:31:09 +01:00
Klaas Freitag
ca7fceaa2c
Remove left over declaration.
2012-11-16 12:30:29 +01:00
Daniel Molkentin
d9b14670ab
owncloud: remove unused member from transfer context
2012-11-15 12:48:02 +01:00
Klaas Freitag
a577bf8faa
Add a version table to csyncs database with the current version no.
2012-11-14 17:24:13 +01:00
Klaas Freitag
094554366b
Fix casting to signed data types.
2012-11-14 15:10:44 +01:00
Klaas Freitag
385b48da5c
Commented database copy. Rather let it recreate.
2012-11-14 15:09:16 +01:00
Klaas Freitag
146ba66b50
Initialize struct to zero to avoid free on uninitialized value.
2012-11-14 14:08:47 +01:00
Klaas Freitag
905e97f2ab
Use _tclosedir rather than closedir.
2012-11-13 11:45:12 +01:00
Klaas Freitag
a0fcd35183
win32: Ported two other occurences of win32 api to wide char support.
2012-11-12 10:44:24 +01:00
Klaas Freitag
d5a32543ef
Fix update test.
2012-11-09 17:24:17 +01:00
Klaas Freitag
7aeeeae037
Fix test, avoid double free.
2012-11-09 17:16:27 +01:00
Klaas Freitag
161d7c18ff
Push version to next release 0.60.2
2012-11-09 17:15:46 +01:00
Klaas Freitag
940ff6eeaa
Proper cross platform initialization.
2012-11-09 17:14:52 +01:00
Klaas Freitag
b748fab6e9
Set version to next release 0.60.2
2012-11-09 17:14:24 +01:00
Klaas Freitag
eb640aae00
Fix parsing of GMT times and handle time difference more tolerant.
2012-11-08 14:52:14 +01:00
Klaas Freitag
6d126f3956
Check for timegm and set a config variable accordingly.
2012-11-08 14:50:08 +01:00
Klaas Freitag
bede1acbce
Win32: Fix CreateFile call for directories.
2012-11-08 14:49:15 +01:00
Klaas Freitag
d19a0c9c46
ownCloud: log the mtime in stat.
2012-11-08 11:22:49 +01:00
Klaas Freitag
295de77a7d
Added .directory to ignore.
2012-11-08 11:21:53 +01:00
Olivier Goffart
6e6e18c030
Exclude lists: Works with \r\n line terminator
2012-11-07 17:46:13 +01:00
Olivier Goffart
62897e6d37
Win: Load the exclude lists in the config
2012-11-07 17:46:13 +01:00
Olivier Goffart
f55f687a63
Win: Don't rely on the name of the program to be owncloud.exe
...
Loosely based on the logic in csync_vio_init
2012-11-07 17:46:13 +01:00
Olivier Goffart
a4db29c277
c_copy: return error code on windows if there is an error
...
This fixes a compiler warning about not returning a value
2012-11-07 17:46:13 +01:00
Olivier Goffart
e2a8e9dce2
win: Link against all the required libraries
2012-11-07 17:46:13 +01:00
Markus Goetz
80d53ff4bd
Enable compilation with static iniparser and sqlite
2012-11-07 17:46:13 +01:00
Olivier Goffart
be13ef120d
Fix another crash if the md5 are not computed
2012-11-07 16:50:20 +01:00
Klaas Freitag
67373dcb0d
commented work in progress treewalk stuff.
2012-11-07 12:33:39 +01:00
Klaas Freitag
f65be04415
Added Windows tmp file pattern to exclude list.
2012-11-06 14:05:52 +01:00
Olivier Goffart
1a093b0ae3
Fix crash if md5 is null
...
Also make sure to copy destpath, to avoid double free.
2012-11-06 14:05:52 +01:00
Olivier Goffart
7071a455c5
Use signed hash in SQL request
...
sqlite only handle signed integer, in case of overflow, we numbers are
transformed to floating point, resulting in wierd errors.
2012-11-06 14:05:52 +01:00
Klaas Freitag
898d51f92d
WIP: Try to catch a cleared remote path
2012-10-31 21:38:57 +01:00
Klaas Freitag
e183854b58
Added experimental function to check if a file is known locally.
2012-10-31 21:33:17 +01:00
Klaas Freitag
2206c4a4d1
Fix printf operators for time delta values.
2012-10-31 21:33:17 +01:00
Klaas Freitag
af11613fba
Some cleanup of platform specific code.
2012-10-31 21:09:33 +01:00
Klaas Freitag
2fa07b1dd9
set pointer void to avoid warning on linux compile.
2012-10-31 21:08:40 +01:00
Klaas Freitag
803b3fb542
Fix compile with mingw32 for win32, removed int decl in for loop.
2012-10-31 21:08:08 +01:00
Klaas Freitag
abb3829197
Use win32 function GetFileTime to fix DTS problems on windows.
2012-10-31 20:56:24 +01:00
Klaas Freitag
4104737533
Hide the journal database under windows using win32 API.
2012-10-31 20:56:06 +01:00
Andreas Schneider
2752a9e9c0
tests: Remove the right directory in the teardown function.
2012-10-30 14:49:18 +01:00
Andreas Schneider
e3e00b4b32
tests: Add a csync_log test.
2012-10-30 11:39:51 +01:00
Andreas Schneider
dd60412a50
doc: Remove all references to log4c.
2012-10-30 11:27:21 +01:00
Andreas Schneider
0a6d7435b5
cmake: Get rid of log4c.
2012-10-30 11:27:21 +01:00
Andreas Schneider
0179c2249d
statedb: Log an error if we can't open the database.
2012-10-30 11:27:21 +01:00
Andreas Schneider
b43f6690d5
client: Add setting the debug level.
2012-10-30 11:27:21 +01:00
Andreas Schneider
8a0b4319d3
csync: Add a new logging system.
2012-10-30 11:27:21 +01:00
Andreas Schneider
95b367dd23
csync: Add option to set and get log verbosity.
2012-10-30 11:27:20 +01:00
Andreas Schneider
890df87d00
csync: Add support for a log callback.
2012-10-30 11:27:20 +01:00
Klaas Freitag
8afe182e0c
Fix merge: Initialise data before accessing them.
2012-10-28 11:31:25 +01:00
Klaas Freitag
2bb52ef6f9
Merge branch 'master' into dav - get cmocka tests and database move.
...
Conflicts:
CMakeLists.txt
cmake/Modules/FindCMocka.cmake
src/csync.c
src/csync_exclude.c
src/csync_reconcile.c
src/csync_statedb.c
src/csync_update.c
src/csync_util.c
src/vio/csync_vio.c
tests/CMakeLists.txt
tests/csync_tests/check_csync_exclude.c
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_update.c
tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Andreas Schneider
805621540a
csync: Move auth callback to a common struct.
2012-10-27 15:29:00 +02:00
Klaas Freitag
557b4bbe25
Use LIKE instead of GLOB to find files in dirs in database.
...
This fixes Github issue mirall#25
2012-10-27 12:03:39 +02:00
Klaas Freitag
9e4c873b16
Fixed csync testcases.
2012-10-26 21:33:13 +02:00
Klaas Freitag
0db9427377
Add name of rename target to treewalk data structure.
2012-10-26 20:01:25 +02:00
Klaas Freitag
8bdf0694ca
Another rename issue to ocsync instead of csync.
2012-10-26 19:59:45 +02:00
Klaas Freitag
d82850f145
Fix more csync->ocsync renaming issues.
2012-10-26 16:11:34 +02:00
Klaas Freitag
0cea891a98
Fix name of config file in log test case.
2012-10-26 11:53:29 +02:00
Andreas Schneider
14f03e0ebb
exclude: Simplify the csync_excluded() loop.
...
Thanks to Klaas Freitag.
2012-10-22 15:32:28 +02:00
Andreas Schneider
e43466d09d
tests: Add exclude test for journal db names.
2012-10-22 15:13:52 +02:00
Andreas Schneider
51ce3bea37
exclude: Reduce memory allocations of csync_excluded().
2012-10-22 15:13:02 +02:00
Andreas Schneider
9b11339a9e
util: Remove obsolete csync_create_statedb_hash().
2012-10-22 14:55:26 +02:00
Andreas Schneider
f92b8f1db7
exclude: Make sure we don't sync the csync_journal.db.
2012-10-22 14:55:26 +02:00
Andreas Schneider
76e6fbb72f
csync: Move the statedb (journal) to the local directory.
2012-10-22 14:53:59 +02:00
Andreas Schneider
42421cb4cc
exclude: Rework csync_excluded() to not leak memory on error.
2012-10-22 14:53:27 +02:00
Andreas Schneider
d507358c95
exclude: Fix build warning.
2012-10-22 14:39:03 +02:00
Klaas Freitag
01a25db3fb
exclude: Fix checking the exclude pattern for subdirs.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-10-22 12:26:35 +02:00
Andreas Schneider
31382d909e
vio: Fix a build warning.
2012-10-22 11:21:34 +02:00
Andreas Schneider
304371eecb
build: Add an option for clang.
2012-10-22 11:21:18 +02:00
Andreas Schneider
cea0c9e85f
cmake: Fix compile option on UNIX with Clang.
2012-10-22 11:20:30 +02:00
Andreas Schneider
68abef8626
util: Improve statedb hashing function to avoid possible data loss.
...
The statedb hash function only hashes the remote side and not the local
path. So if a user changes to a new empty directory to sync it with the
remote counter part, csync will delete all files.
This will result in a new full sync for all sync setups, but we will not
loose any data.
2012-10-22 11:00:51 +02:00
Andreas Schneider
12d5d012f3
lock: Use a secure umask for mkstemp().
2012-10-19 20:37:13 +02:00
Andreas Schneider
351c6089fc
modules: Return in dummy_stat() if we have no memory.
2012-10-19 20:37:13 +02:00
Andreas Schneider
5844b203e6
file: Use a smaller buffer value for c_copy().
2012-10-19 20:37:13 +02:00
Andreas Schneider
6dbdbf0997
dir: Don't leak resources on error in c_rmdirs().
...
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
6ae00fe3b2
csync: Don't leak memory on error in csync_create().
...
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
6023db367b
update: Fix a memory leak in _csync_detect_update().
...
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
47f1560d87
update: Don't leak dh on error.
...
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
b4464bd92f
statedb: Don't leak the file descriptior on error.
...
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
1d8378e307
statedb: Ensure we don't leak memory in csync_statedb_query().
...
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
b330df73a1
vio: Fix a possible resource leak in csync_vio_local_creat().
...
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
2e01dc8d88
vio: Fix a possible resource leak in csync_vio_local_open().
...
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
4010096cdf
exclude: Rework _csync_exclude_add() to check for no memory.
...
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
ade066a6c1
lock: Ensure we don't call close() on negative numbers on error.
...
Found by Coverity.
2012-10-19 19:46:34 +02:00
Andreas Schneider
6456cc36a5
file: Ensure we don't call close() on negative numbers on error.
...
Found by Coverity.
2012-10-19 19:42:04 +02:00
Andreas Schneider
f124810059
lock: Make sure we have pid value in the correct range.
...
Found by Coverity.
2012-10-19 19:38:05 +02:00
Andreas Schneider
3f02bf7990
csync: Rework _csync_treewalk_visitor().
...
This fixes some possible null pointer defererences.
Found by Coverity.
2012-10-19 19:24:07 +02:00
Andreas Schneider
81a0dc8cb0
rbtree: Fix finding the node with a NIL child.
...
Found by Coverity.
2012-10-19 19:14:54 +02:00
Andreas Schneider
06cb39e1e1
propagate: Fix a possible null pointer deference.
...
Found by Coverity.
2012-10-19 19:07:15 +02:00
Andreas Schneider
c24a18cbfd
cmake: Cleanup testing and enable test target.
2012-10-19 19:07:15 +02:00
Andreas Schneider
ac5855940a
tests: Remove the check_vio_local test.
...
It is tested by check_vio anyway.
2012-10-19 18:26:19 +02:00
Andreas Schneider
fafa632b65
tests: Migrate check_vio_handle to cmocka.
2012-10-19 18:21:37 +02:00
Andreas Schneider
7aa63e23aa
tests: Migrate check_vio_file_stat to cmocka.
2012-10-19 18:16:36 +02:00
Andreas Schneider
8d737287fb
tests: Migrate check_vio to cmocka.
2012-10-19 18:14:28 +02:00
Andreas Schneider
ecd944a162
tests: Migrate check_csync_update to cmocka.
2012-10-19 17:25:41 +02:00
Andreas Schneider
7c59ea2999
tests: Migrate check_csync_util to cmocka.
2012-10-19 16:10:30 +02:00
Andreas Schneider
b58bcb510d
tests: Migrate check_csync_time to cmocka.
2012-10-19 16:06:47 +02:00
Benjamin Legrand
cb8a501241
Fix a typeo and rename REPLCIA to REPLICA.
...
BUG #8
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-10-19 15:59:51 +02:00
Andreas Schneider
792be0f053
tests: Migrate check_csync_statedb_query to cmocka.
2012-10-19 15:53:22 +02:00
Andreas Schneider
aa227aa10b
tests: Migrate check_csync_statedb_load to cmocka.
2012-10-19 14:43:25 +02:00
Andreas Schneider
3b7104f514
tests: Migrate check_csync_lock to cmocka.
2012-10-19 14:29:10 +02:00
Andreas Schneider
eded4915e9
tests: Migrate check_csync_init to cmocka.
2012-10-19 10:57:40 +02:00
Andreas Schneider
3a179c8822
tests: Migrate check_csync_exclude to cmocka.
2012-10-18 15:17:24 +02:00
Andreas Schneider
ab5f38a680
cmake: Add check for asprintf().
2012-10-18 15:07:17 +02:00
Daniel Molkentin
996193f41a
Add git metadata files
2012-10-18 13:44:28 +02:00
Klaas Freitag
aad8e5320a
Some more memory cleanups after valgrinding.
2012-10-18 13:26:44 +02:00
Klaas Freitag
cc28d22c96
Removed overwhelming logging.
2012-10-18 13:26:44 +02:00
Klaas Freitag
6770e91d31
Fix deletion of straying tmp files.
2012-10-18 13:26:44 +02:00
Daniel Molkentin
f8e56cc099
Update ChangeLog for 0.60.1
2012-10-18 13:11:16 +04:00
Klaas Freitag
3006f14c8d
Remove tmp files after GET request.
2012-10-18 10:04:11 +02:00
Andreas Schneider
13df0426af
tests: Migrate check_csync_create to cmocka.
2012-10-17 17:46:45 +02:00
Andreas Schneider
b4eee0383d
tests: Migrate check_csync_config to cmocka.
2012-10-17 17:03:22 +02:00
Andreas Schneider
6dcb50d8ba
tests: Disable log test.
2012-10-16 17:23:07 +02:00
Andreas Schneider
1582067200
tests: Migrate check_std_c_tim to cmocka.
2012-10-16 17:06:46 +02:00
Andreas Schneider
f4b1ce9350
tests: Migrate check_std_c_str to cmocka.
2012-10-16 17:01:25 +02:00
Andreas Schneider
3395ed2b95
tests: Migrate check_std_c_rbtree to cmocka.
2012-10-16 16:37:38 +02:00
Andreas Schneider
17e0da1e65
tests: Migrate check_std_c_path to cmocka.
2012-10-16 15:49:06 +02:00
Klaas Freitag
9d126bc45a
Set version to next tag 0.60.1
2012-10-16 15:48:13 +02:00
Andreas Schneider
4db3194e84
tests: Migrate check_std_c_list to cmocka.
2012-10-16 15:32:33 +02:00
Andreas Schneider
4529928edc
tests: Migrate check_std_c_jhash to cmocka.
2012-10-16 14:54:59 +02:00
Andreas Schneider
7155528bb5
tests: Migrate check_std_c_file to cmocka.
2012-10-16 14:31:21 +02:00
Klaas Freitag
5c780e99be
Remove sqlite specific code here and use csync_statedb_get_below.
...
This also fixes an escaping problem with path names with
apostrophes, reported in bug genie #oc-1997.
2012-10-16 13:14:45 +02:00
Klaas Freitag
4682afc2bc
Added function csync_statedb_get_below_path.
2012-10-16 13:14:04 +02:00
Klaas Freitag
8633d7751a
Fix test script to work with ocsync.
2012-10-16 11:53:20 +02:00
Klaas Freitag
687efaaaf6
Some more memory free - after valgrind analyze.
2012-10-16 11:52:50 +02:00
Klaas Freitag
7c20897036
Also reset read_from_db flag in context in error case.
2012-10-16 11:52:11 +02:00
Andreas Schneider
24f066ef0b
tests: Migrate check_std_c_dir to cmocka.
2012-10-16 11:04:13 +02:00
Andreas Schneider
b1b0c2c510
tests: Start to use cmocka for the tests.
2012-10-16 10:37:40 +02:00
Klaas Freitag
e89c6dc256
Free md5 memory when destroying.
2012-10-16 09:47:07 +02:00
Andreas Schneider
2ddccf6c16
propagate: Fix build on systems without atime support.
...
This fixes bug #6 .
2012-10-15 21:27:17 +02:00
Eric Seigne
a371546038
Fix bug #4 : Hide password from command line.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-10-15 20:57:16 +02:00
Klaas Freitag
684c5a88c7
Updated changelog for 0.60.0
2012-10-10 12:23:07 +02:00
Klaas Freitag
48eec357d7
Push version to 0.60.0 - final release for owncloud client 1.1.0
2012-10-10 12:10:07 +02:00
Klaas Freitag
9b72504b30
Added more specific values to the ignore values.
2012-10-10 12:10:06 +02:00
Daniel Molkentin
e0f02c41b1
owncloud: rely entirely on caller for proxy detection
2012-10-08 21:26:12 +02:00
Andreas Schneider
e603d1c6d0
doc: Fix typos in userguide.
...
Thanks to Thomas Renninger <trenn@suse.de >
2012-10-07 12:22:16 +02:00
Klaas Freitag
e7837c0716
Fixed rename to ocsync in doc subdir.
2012-10-05 14:54:13 +02:00
Klaas Freitag
b27899ecc4
Rename of the config files.
2012-10-05 14:45:04 +02:00
Klaas Freitag
a9e544fd7d
renamed config files and dirs to ocsync.
2012-10-05 14:38:33 +02:00
Klaas Freitag
b039b5642f
Copy csync.conf from ~/.csync/ if existing.
2012-10-04 13:56:30 +02:00
Klaas Freitag
fbb88abe85
Clear memory and fix zero return type for _get_stat_by_hash
2012-10-04 13:03:42 +02:00
Klaas Freitag
2ec0b63f98
Migrate existing database from $HOME/.csync if non exists at config dir.
2012-10-04 13:02:38 +02:00
Klaas Freitag
207c8d9786
Set version to 0.50.11 - for ownCloud 1.1.0 beta3
2012-10-04 12:59:38 +02:00
Klaas Freitag
4bf72957bb
Added test for std function c_tmpname.
2012-10-01 17:24:02 +02:00
Klaas Freitag
404073fe7f
Rename csync to ocsync to not collide with upstream csync.
2012-10-01 12:39:05 +02:00
Klaas Freitag
b25d77caee
Merge branch 'fastsync' into dav
2012-10-01 10:35:28 +02:00
Klaas Freitag
29e4e506e6
Switch back to PROPSET lastmodified as getlastmodified is readonly.
2012-09-28 17:36:04 +02:00
Klaas Freitag
c4db7d1acf
use correct DAV property for lastmodified.
2012-09-28 14:11:20 +02:00
Daniel Molkentin
6c33462842
Remove redundant code block
2012-09-27 10:05:06 +02:00
Daniel Molkentin
4bae545c90
vio plugin loading: cut of filename regardless of length.
2012-09-27 10:05:01 +02:00
Klaas Freitag
2af0d6f1a4
Be careful with memory, some fixes for that.
2012-09-26 15:32:38 +02:00
Klaas Freitag
004f5ccce6
Fix state change for deleted or not longer existing directories.
2012-09-26 12:46:59 +02:00
Klaas Freitag
7b16fcf2a4
Avoid useless warnings.
2012-09-26 12:45:24 +02:00
Klaas Freitag
f031e93618
Do not try a head request as PROPFIND is more efficient on ownCloud.
2012-09-26 12:44:17 +02:00
Andreas Schneider
cd662432f9
cmake: Update ctest config.
2012-09-25 14:51:29 +02:00
Klaas Freitag
b976ac914d
Also check the files basename against the exclude pattern.
2012-09-25 15:41:55 +03:00
Klaas Freitag
4eb1ae7853
Fix test: Status must be INSTRUCTION_EVAL.
...
This test runs on an empty database. That also means that there is no
ID in the database which is needed to detect the update. An empty
ID means that the status must be evaluated.
2012-09-24 16:47:43 +03:00
Klaas Freitag
407b87c17b
Fix statedb test: Added new columns.
2012-09-24 16:28:43 +03:00
Klaas Freitag
34249e9f64
Use destination path in case of file rename.
2012-09-24 15:57:32 +03:00
Klaas Freitag
2354b9c52f
Fix detection of local file renames.
2012-09-24 15:56:42 +03:00
Klaas Freitag
77e79ea767
For rename, retrieve the new id and set in local tree.
2012-09-24 15:55:18 +03:00
Klaas Freitag
128926cac7
Check path for len exactly 1 when comparing on '.'.
2012-09-24 15:54:17 +03:00
Klaas Freitag
0dfa61650d
ownCloud: clear the cache variables before ID query.
2012-09-24 15:45:11 +03:00
Klaas Freitag
403fec1454
ownCloud: Removed unused stat variable.
2012-09-24 15:44:19 +03:00
Daniel Molkentin
7bed8e184f
Remove redundant code block
2012-09-23 11:02:18 +02:00
Daniel Molkentin
f86481d73e
vio plugin loading: cut of filename regardless of length.
2012-09-23 11:01:59 +02:00
Klaas Freitag
7a70a6fa69
Update version to 0.50.10
2012-09-20 17:57:58 +03:00
Klaas Freitag
44a6cf9bfc
Remove wrong free.
2012-09-20 17:54:23 +03:00
Klaas Freitag
e4c0fb90dd
ownCloud: some log cleanups.
2012-09-20 11:28:54 +03:00
Klaas Freitag
ee228cfff4
Make use of the Session cookie sent from the server.
2012-09-19 18:46:40 +03:00
Klaas Freitag
fc6cd714c7
win32: Fix random file name generation, init random generator once.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-09-04 12:19:12 +02:00
Klaas Freitag
50f698673c
Update version number to 0.50.9
2012-08-30 18:45:36 +03:00
Klaas Freitag
8571394847
Fix time correction between client and server.
2012-08-30 18:45:10 +03:00
Klaas Freitag
08f7fbbd71
Fix printf argument for win32 platform.
2012-08-30 17:01:52 +03:00
Klaas Freitag
caa1945daa
Added another check on file length.
2012-08-30 15:45:45 +03:00
Klaas Freitag
ecd6a86fd3
Remove wrong free command.
2012-08-30 14:30:30 +03:00
Klaas Freitag
6fbc510aeb
Free memory of id_list lists.
2012-08-30 13:05:24 +03:00
Klaas Freitag
ffc5e6f0cc
Memory cleanups for id syncing, removed unused code.
2012-08-30 13:04:48 +03:00
Klaas Freitag
7600eb4a09
Memory cleanups for id syncing.
2012-08-30 13:04:14 +03:00
Klaas Freitag
d756c45c50
Free memory used by the id in csync_file_stat.
2012-08-30 13:01:21 +03:00
Klaas Freitag
9f4f0e8106
ownCloud: more memory cleanups, use widechar unlink for tmp files,
...
adjust the modtime by the time difference between client adn server.
2012-08-30 12:59:52 +03:00
Klaas Freitag
99691059bf
Removed all usage of openSSL.
2012-08-29 15:37:31 +03:00
Klaas Freitag
4e4fca54c2
added test data as well as a test config template.
2012-08-29 15:26:31 +03:00
Klaas Freitag
52e0f06692
use a more speaking name for config file.
2012-08-29 15:26:15 +03:00
Klaas Freitag
0416107951
Fix testcase.
2012-08-29 13:34:42 +03:00
Klaas Freitag
ae94ce7430
Check if the file id method exists in the vio plugin.
2012-08-29 13:34:21 +03:00
Klaas Freitag
3950b18dc7
Fix memory leaks in new id sync code.
2012-08-28 17:53:26 +03:00
Klaas Freitag
4750380565
Fix flag setting detection of the fields.
2012-08-28 17:52:28 +03:00
Klaas Freitag
3e95056975
ownCloud: Use stat cache more structured.
2012-08-28 15:59:33 +03:00
Klaas Freitag
636ec65c60
ownCloud: removed unused statcache code.
2012-08-28 14:24:42 +03:00
Klaas Freitag
c491e8bb68
Check for valid result count after query.
2012-08-28 14:09:54 +03:00
Klaas Freitag
78c43e542c
Handle zero result list correctly.
2012-08-28 14:09:29 +03:00
Klaas Freitag
bba1396770
ownCloud: Use correct path to push into owncloud_stat.
2012-08-28 14:06:55 +03:00
Klaas Freitag
b6edf82d4e
Fixed license of tests, added dir check test.
2012-08-26 20:08:28 +02:00
Klaas Freitag
3b369c8b03
More robust query result access if columns are missing.
2012-08-26 20:07:36 +02:00
Klaas Freitag
9897335006
ownCloud: Test on null pointer before access for md5 sum.
2012-08-26 20:06:53 +02:00
Klaas Freitag
ef64756334
Merge branch 'md5' of ssh://milliways.cryptomilk.org/users/freitag/csync into fastsync
...
Conflicts:
modules/csync_owncloud.c
src/csync_private.h
src/csync_propagate.c
src/csync_reconcile.c
src/csync_statedb.c
2012-08-23 18:04:32 +03:00
Klaas Freitag
4169c4be05
More blackbox testing of csync ownCloud - enhanced test script.
2012-08-23 17:57:04 +03:00
Klaas Freitag
2420eeffd1
Read remote file tree from db if id has not changed.
2012-08-23 17:55:39 +03:00
Klaas Freitag
5b5fe29eb5
Make sqlite_query function able to deal with multiple row queries.
2012-08-23 17:54:36 +03:00
Klaas Freitag
cf8f31914a
Added a file type column to the database.
2012-08-23 17:53:53 +03:00
Klaas Freitag
1dc50eea5d
Decide if the file tree is read from db or stat'ed
2012-08-23 17:50:30 +03:00
Klaas Freitag
1e41c469f0
Add the dbtree function module.
2012-08-23 17:49:47 +03:00
Klaas Freitag
e349df9f4c
Added flag to indicate to read the remote filetree from db.
2012-08-23 17:49:18 +03:00
Klaas Freitag
8876658810
Added functions to read the file tree from database.
2012-08-23 17:48:24 +03:00
Klaas Freitag
e9cf546818
Free the memory for the MD5 string.
2012-08-23 17:44:07 +03:00
Klaas Freitag
97a7e46595
Set to INSTRUCTION_UPDATED only for NONE instructions.
2012-08-23 17:44:07 +03:00
Klaas Freitag
7f7c2b977c
Avoid a null pointer dereference.
2012-08-23 17:44:07 +03:00
Klaas Freitag
337c56da66
Fix: If no database entry exists, the status is set to NEW.
2012-08-23 17:44:07 +03:00
Klaas Freitag
a0353249f1
Remove a database column comment that just blows the log file.
2012-08-23 17:44:07 +03:00
Klaas Freitag
868a07c322
Update the md5 also if the instruction is not UPDATE.
2012-08-23 17:44:07 +03:00
Klaas Freitag
dba2c1d105
Added get_file_id function.
2012-08-23 17:43:51 +03:00
Klaas Freitag
f4c9ced446
Handle ID change propagation to the top directory.
2012-08-23 17:43:51 +03:00
Klaas Freitag
1c6da9c0bb
Update the md5 sum of files in merge.
2012-08-23 17:43:51 +03:00
Klaas Freitag
e3638ced2c
Add csync_get_file_id function for modules.
2012-08-23 17:43:51 +03:00
Klaas Freitag
62b49e8bcc
Query ids from database for local files, remove bogus code.
2012-08-23 17:43:51 +03:00
Klaas Freitag
9bd9949d68
Fixed merge conflict, only one md5 needed.
2012-08-23 17:43:21 +03:00
Klaas Freitag
ede710843b
Added csync_vio_file_id function and removed unused previous code.
2012-08-23 17:42:51 +03:00
Klaas Freitag
20f4ee16cc
removed unneeded initialisations.
2012-08-23 17:42:33 +03:00
Klaas Freitag
3fb3f78446
Add a visible log entry at program start, easier to read log output.
2012-08-23 17:41:53 +03:00
Klaas Freitag
d8967a2bd1
try to propagate EVAL status up by detecting changes in underlying
...
directories. That does not work as the reconciler runs through the
directoires in the wrong order, ie. the outermost first.
2012-08-23 17:41:53 +03:00
Klaas Freitag
c2e2f8de00
more md5 calculations
2012-08-23 17:41:53 +03:00
Klaas Freitag
f2d603108a
more logging, ids added.
2012-08-23 17:41:53 +03:00
Klaas Freitag
ae1b8a5682
Query new id for local repository because of utimes changes.
2012-08-23 17:41:53 +03:00
Klaas Freitag
0618eb956d
Merge conflicts solved.
2012-08-23 17:40:36 +03:00
Klaas Freitag
ae5394ad75
UniqID based syncing, first WIP state.
2012-08-23 17:38:44 +03:00
Klaas Freitag
d2ba37a419
Resolved merge conflict.
2012-08-23 17:38:25 +03:00
Klaas Freitag
3e85218be9
Do not do post copy stat for ownCloud.
2012-08-23 17:35:16 +03:00
Klaas Freitag
64660df84b
removed obsolete FindOpenSSL.
2012-08-23 17:34:19 +03:00
Klaas Freitag
8e401e662f
MD5 Support WIP
2012-08-23 17:34:19 +03:00
Klaas Freitag
943e960bc0
Fixed merge conflict.
2012-08-23 17:34:02 +03:00
Klaas Freitag
2a40106e70
Fixed merge conflict.
2012-08-23 17:33:41 +03:00
Dominik Schmidt
21d3ec4d2d
Add patched FindOpenSSL to fix cross-compilation for windows
2012-08-23 17:24:23 +03:00
Klaas Freitag
faf1970e3a
Avoid a null pointer dereference.
2012-08-20 19:11:46 +03:00
Klaas Freitag
ec63ab4e16
Fix: If no database entry exists, the status is set to NEW.
2012-08-20 19:11:18 +03:00
Klaas Freitag
4a6b0e7241
Remove a database column comment that just blows the log file.
2012-08-20 19:10:29 +03:00
Klaas Freitag
bc1e59a048
Update the md5 also if the instruction is not UPDATE.
2012-08-20 19:10:03 +03:00
Klaas Freitag
30d1c9ed9d
ownCloud: Some code cleanup, added documentation.
2012-08-20 19:09:24 +03:00
Klaas Freitag
82d22d1494
Added get_file_id function.
2012-08-17 16:50:31 +03:00
Klaas Freitag
d9267f7928
Handle ID change propagation to the top directory.
2012-08-17 16:48:56 +03:00
Klaas Freitag
972412e436
Update the md5 sum of files in merge.
2012-08-17 16:48:15 +03:00
Klaas Freitag
38cf0f2704
Add csync_get_file_id function for modules.
2012-08-17 16:46:50 +03:00
Klaas Freitag
0443764308
Query ids from database for local files, remove bogus code.
2012-08-17 16:46:07 +03:00
Klaas Freitag
7dcb9ffdeb
Added id lists to context type and removed change counter.
2012-08-17 16:45:12 +03:00
Klaas Freitag
fcba1cefce
Added csync_vio_file_id function and removed unused previous code.
2012-08-17 16:44:38 +03:00
Klaas Freitag
bac0002eeb
Add a visible log entry at program start, easier to read log output.
2012-08-17 16:42:23 +03:00
Klaas Freitag
0147063090
try to propagate EVAL status up by detecting changes in underlying
...
directories. That does not work as the reconciler runs through the
directoires in the wrong order, ie. the outermost first.
2012-08-15 16:32:10 +03:00
Klaas Freitag
19f52313a8
more md5 calculations
2012-08-15 12:46:36 +03:00
Klaas Freitag
142ef140f0
more logging, ids added.
2012-08-14 16:32:23 +03:00
Klaas Freitag
eb019905e4
Query new id for local repository because of utimes changes.
2012-08-14 16:31:52 +03:00
Klaas Freitag
b37096354f
Fix url to calculate hash
2012-08-14 16:31:01 +03:00
Klaas Freitag
cf24513879
Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into md5
...
Conflicts:
modules/csync_owncloud.c
src/csync_private.h
src/csync_reconcile.c
src/vio/csync_vio.c
2012-08-13 15:24:15 +03:00
Klaas Freitag
ebfeda7304
Updated Changelog for 0.50.8.
2012-08-10 12:37:22 +03:00
Klaas Freitag
f26b91f509
ownCloud: Still require time sync between the two repos.
2012-08-10 12:36:55 +03:00
Klaas Freitag
2bc171e520
Set version to 0.50.8
2012-08-09 17:07:44 +03:00
Klaas Freitag
76b09b3c14
Fix rename: Exclude directories and set mtimes accordingly.
2012-08-09 16:59:08 +03:00
Klaas Freitag
452babe593
Improved error report on proxy- and connection problems.
2012-08-09 15:12:22 +03:00
Klaas Freitag
d16dd57d85
ownCloud: More return value checking in fetch_resource_list.
2012-08-09 14:11:54 +03:00
Klaas Freitag
8ec3ea04da
more logging...
2012-08-08 19:00:11 +03:00
Klaas Freitag
3f2d5b380d
Fixed some strncpy flaws that might caused problems on win32 (mkdir)
2012-08-08 16:45:00 +03:00
Klaas Freitag
cbb09aeb0a
Sync based on uniqIDs WIP
2012-08-06 09:22:21 +02:00
Klaas Freitag
3ae996c688
Fixed rename support for Win32. Need to use unit64 instead of ino_t.
2012-08-03 18:48:44 +03:00
Klaas Freitag
60d61634e5
Updated version numbers to 0.50.8 ownCloud release.
2012-08-03 18:47:49 +03:00
Klaas Freitag
253605758e
Use remote rename if local rename is detected.
2012-08-02 16:58:54 +03:00
Klaas Freitag
28d28ecac6
ownCloud: Proxy support when working in mirall.
2012-07-31 17:59:15 +03:00
Klaas Freitag
5b38e2cb5a
Improved logging in error case (minor fix).
2012-07-31 17:58:49 +03:00
Klaas Freitag
abef7eb3d2
UniqID based syncing, first WIP state.
2012-07-31 11:40:46 +03:00
Klaas Freitag
6ba5bf45d8
removed obsolete FindOpenSSL.
2012-07-30 15:59:55 +03:00
Klaas Freitag
c753525085
removed obsolete FindOpenSSL.
2012-07-30 13:57:57 +03:00
Thomas Mueller
d4e808d45a
use custom FindOpenSSL only for cross compilation in any other cases it is used from the local system
2012-07-30 13:27:59 +03:00
Thomas Mueller
9134955899
use custom FindOpenSSL only for cross compilation in any other cases it is used from the local system
2012-07-26 14:57:15 +03:00
Klaas Freitag
1352f6bc39
MD5 Support WIP
2012-07-24 09:36:06 +02:00
Dominik Schmidt
9626f65b6b
Add patched FindOpenSSL to fix cross-compilation for windows
2012-07-23 10:58:13 +02:00
Dominik Schmidt
293b0cecaf
Add patched FindOpenSSL to fix cross-compilation for windows
2012-07-23 10:57:18 +02:00
Klaas Freitag
244d23ac0c
Updated Changelog file.
2012-07-23 09:13:44 +02:00
Klaas Freitag
718c25d449
Added missing config_test.h input file.
2012-07-20 10:52:30 +02:00
Klaas Freitag
785b7aad60
Use a proper namespace for lastmodified property.
2012-07-20 10:51:39 +02:00
Klaas Freitag
85993d2650
Don't override error code set by timedif in vio init
2012-07-19 21:21:33 +02:00
Klaas Freitag
1104619a52
No atime on apple platform.
2012-07-19 21:11:35 +02:00
Klaas Freitag
b57f33353d
fixed copy and paste errors in error output.
2012-07-19 21:06:18 +02:00
Klaas Freitag
459f25b0ef
owncloud test: Save the downloaded file in /tmp.
2012-07-19 21:04:15 +02:00
Klaas Freitag
cad3da10db
Merge branch 'timedelta' into dav
2012-07-19 15:53:12 +02:00
Klaas Freitag
8402b5b6fa
ownCloud: removed config file access again, correct handling of
...
timediff.
2012-07-19 15:39:53 +02:00
Klaas Freitag
b47ac922ad
ownCloud: handle time delta and access the config file.
2012-07-19 10:50:18 +02:00
Klaas Freitag
2b4261f15a
Added functions to generate MD5-Sums based on openssl with tests.
2012-07-18 17:00:46 +02:00
Klaas Freitag
5f93c490a5
Make ownCloud cmocka test build on the win32 platform.
2012-07-11 18:01:08 +02:00
Klaas Freitag
b74fc47e3f
More unit testing of the ownCloud module with mocka.
2012-07-11 16:50:25 +02:00
Klaas Freitag
1866956984
use lstat instead of stat to stat files. Avoids problems with links.
2012-07-11 16:48:38 +02:00
Klaas Freitag
e90b4a13b3
Added logging of the time values.
2012-07-11 16:05:40 +02:00
Klaas Freitag
59202fffe4
fixed spaces and logging if timesync is needed for the module.
2012-07-11 16:03:31 +02:00
Klaas Freitag
81e77afaec
cleaner logging of time delta.
2012-07-11 16:02:43 +02:00
Klaas Freitag
0ed8c57cad
make proper logging of the module capabilities.
2012-07-09 16:46:14 +02:00
Klaas Freitag
bcb31b6998
Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into dav
...
Conflicts:
src/csync.c
src/csync_propagate.c
src/std/c_private.h
src/vio/csync_vio.c
2012-07-09 16:39:11 +02:00
Klaas Freitag
7fb929a82d
use lstat instead of stat for local files, fix oCB #713 .
2012-07-09 16:15:27 +02:00
Klaas Freitag
7b261077a2
Avoid compile warning and use an unsigned variable.
2012-07-09 14:45:25 +02:00
Klaas Freitag
43685f69a3
do the capabilities after the module was initialized.
2012-07-09 14:45:05 +02:00
Klaas Freitag
9e81fd38e1
Added CMocka find module for cmake.
2012-07-09 14:29:17 +02:00
Klaas Freitag
5b79f1feca
Added mocka tests for the ownCloud module.
2012-07-09 14:16:20 +02:00
Klaas Freitag
9eae6d88fd
Add ownCloud directory in tests.
2012-07-09 14:10:04 +02:00
Klaas Freitag
b9329f2991
undef malloc only if not doing UNIT_TESTING.
2012-07-09 14:09:34 +02:00
Klaas Freitag
c0f1f36f59
Fix condition on when atomar push is allowed, never for local files.
2012-07-09 13:26:20 +02:00
Dominik Schmidt
77d71eb080
Load plugins on MacOSX.
2012-07-09 13:26:20 +02:00
Klaas Freitag
64f8e5031b
owncloud: remove the win32 c_tmpname use.
2012-07-09 13:26:20 +02:00
Klaas Freitag
d50f39c8b8
owncloud: Win32 use c_tmpname and set _fmode to O_BINARY.
2012-07-09 13:26:20 +02:00
Klaas Freitag
26221653ee
Updated Changelog
2012-07-09 13:26:20 +02:00
Klaas Freitag
065529642e
Ability to push to remote without using a tempfile to copy to.
...
Modules such as ownCloud make sure anyway that the upload to a
remote resource happens atomar. This patch allows to switch off
the default behaviour of first copying to a temp file in the
same directory. Use csync_set_remote_push_atomar function to
switch off.
2012-07-09 13:26:20 +02:00
Klaas Freitag
c32e50462e
Remove wrong cast
2012-07-09 13:26:20 +02:00
Klaas Freitag
3cbc0e5d7e
ownCloud: Fix mem leaks to bring valgrind down to zero loss.
2012-07-09 13:26:20 +02:00
Klaas Freitag
36b1e21c45
ownCloud: Use wide char aware file system functions.
2012-07-09 13:26:20 +02:00
Klaas Freitag
c084fa05af
Added test for std function c_tmpname.
2012-07-09 13:26:20 +02:00
Klaas Freitag
037532d73b
win32: Fix random file name generation, init random generator once.
2012-07-09 13:26:20 +02:00
Klaas Freitag
d532031e3c
Fixed release date of 1.0.2
2012-07-09 13:26:20 +02:00
Klaas Freitag
08621aa74d
Updated changelog for 0.50.6.
2012-07-09 13:26:00 +02:00
Klaas Freitag
09b82ea7cd
do not log on stderr on MacOSX because that spams system log
2012-07-09 13:26:00 +02:00
Klaas Freitag
f802b54f6f
set version to 0.50.7
2012-07-09 13:26:00 +02:00
Klaas Freitag
62acdc3b8c
win32: use wide char variant of CopyFile for file copy.
2012-07-09 13:26:00 +02:00
Klaas Freitag
d7deaf3448
win32: Use wide character variant of GetSpecialFolderPath to get home.
2012-07-09 13:26:00 +02:00
Klaas Freitag
52dbc10315
ownCloud: commented extensive log line.
2012-07-09 13:25:59 +02:00
Klaas Freitag
188584e832
logging in SSL callback, important to debug.
2012-07-09 13:25:59 +02:00
Klaas Freitag
9f900266f4
Added a newline in case the logging callback is zero.
2012-07-09 13:25:59 +02:00
Klaas Freitag
f2439d83f0
Fix wide character support for the mkdir definition.
2012-07-09 13:25:59 +02:00
Klaas Freitag
5734a31b60
Add ability to log to a callback for the csync library.
2012-07-09 13:25:59 +02:00
Klaas Freitag
dfacc611d5
ownCloud: Adopt logging to csync standard log instead of printf.
2012-07-09 13:25:59 +02:00
Klaas Freitag
dc3055e429
Add a switch LOG_TO_CALLBACK for cmake to enable callback logging.
2012-07-09 13:25:59 +02:00
Klaas Freitag
5ac721920c
ownCloud: Proper initializations with NULL avoid a crash.
2012-07-09 13:25:59 +02:00
Klaas Freitag
03476b3a11
Set the correct define to the new released version 0.50.6.
2012-07-09 13:25:59 +02:00
Klaas Freitag
a47ddb59ae
Win32: Chdir to app path before searching module relative.
2012-07-09 13:25:59 +02:00
Klaas Freitag
1d55691e75
Do not log on Apple by default as that goes to ASL
2012-07-09 13:25:59 +02:00
Klaas Freitag
5672638a5b
Update Changelog
2012-07-09 13:25:59 +02:00
Klaas Freitag
02c2fe1aeb
ownCloud: Added redirect ability.
2012-07-09 13:25:59 +02:00
Klaas Freitag
0db820fc98
Added changes for 0.50.6.
2012-07-09 13:25:59 +02:00
Klaas Freitag
86fc6d2262
Set version to 0.50.6 for next oC version.
2012-07-09 13:25:59 +02:00
Klaas Freitag
43263d8e9d
ownCloud: Fix bug #613 : Encode strange url correctly.
...
see http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-613
2012-07-09 13:25:59 +02:00
Klaas Freitag
b261ecb705
Do proper handling of Win32 special characters.
...
Introduced a tchar based handling of wide character encoding that
is happening on Windows platforms.
2012-07-09 13:25:59 +02:00
Klaas Freitag
82074cfc53
tests: Added treewalk test.
2012-07-09 13:25:59 +02:00
Klaas Freitag
124d996154
tests: Treewalk function unit tests added.
2012-07-09 13:25:59 +02:00
Klaas Freitag
1fe093b6b6
Fixed local treewalk function filter comment.
2012-07-09 13:25:59 +02:00
Klaas Freitag
26847b9fac
Fixed tests script that broke because of HTTP::DAV module
2012-07-09 13:25:59 +02:00
Klaas Freitag
3d2a43f512
ownCloud: Fixed var initialization to avoid crash after thread
...
terminated.
2012-07-09 13:25:59 +02:00
Klaas Freitag
1059c008e5
ownCloud: Add neon include dir variable to the compile include dirs.
2012-07-09 13:25:59 +02:00
Klaas Freitag
5703bb61ac
ownCloud: better debug output for file GET.
2012-07-09 13:25:59 +02:00
Klaas Freitag
992f0d6b87
ownCloud: set correct module load error code.
2012-07-09 13:25:59 +02:00
Klaas Freitag
a433ef3dfe
Changelog entries added for 0.50.5.
2012-07-09 13:25:46 +02:00
Klaas Freitag
014fc60fc7
Added GNUInstallDirs.cmake to lower the required cmake version.
2012-07-09 13:25:46 +02:00
Klaas Freitag
1939ea93f5
Moved error_code to context for thread savety.
2012-07-09 13:25:46 +02:00
Klaas Freitag
c1c36a15c4
Pushed version to 0.50.5 and lib version 0.1.5 for next oC release.
2012-07-09 13:25:46 +02:00
Klaas Freitag
ecb409bc06
Added errnos to the timediff function to allow specific error reports.
2012-07-09 13:25:46 +02:00
Dominik Schmidt
d5de27f289
Apple: Fix loading plugins inside bundles.
2012-07-09 13:25:33 +02:00
Dominik Schmidt
53d32a7485
ownCloud: set correct variable to fix warning condition.
2012-07-09 13:25:11 +02:00
Dominik Schmidt
a216790c28
do plugins on apple
2012-07-09 13:25:11 +02:00
Dominik Schmidt
8d5af96f46
Compile cstdlib with -fPIC
2012-07-09 13:25:11 +02:00
Dominik Schmidt
23d56249ca
Fix owncloud linkage against neon
2012-07-09 13:25:11 +02:00
Klaas Freitag
b75066e299
owncloud: remove not needed win32 code.
2012-07-09 13:24:50 +02:00
Klaas Freitag
b6d908e16f
owncloud: win32 use c_tmpname and set _fmode variable for binary mode.
2012-07-09 13:24:15 +02:00
Dominik Schmidt
fcb3aa6208
Define O_NOATIME to 0 if it's not there
2012-07-09 13:24:15 +02:00
Dominik Schmidt
e9e7b0c685
Simplify FindNeon.cmake
2012-07-09 13:24:14 +02:00
Dominik Schmidt
3d59926d8d
fix building without log4c
2012-07-09 13:24:14 +02:00
Dominik Schmidt
2b15df7af3
Set search hint for Libiniparser.
2012-07-09 13:23:49 +02:00
Klaas Freitag
8be6ebb1de
Push csync release to next internal beta 0.50.4.
2012-07-09 13:23:49 +02:00
Klaas Freitag
221de3c866
Added a csync_errno function to provide more info for clients.
2012-07-09 13:23:49 +02:00
Klaas Freitag
dc2148aa15
Removed a stat call that is just for a file size check.
2012-07-09 13:23:48 +02:00
Klaas Freitag
e28c530d13
Version to 0.50.3 for a next beta
2012-07-09 13:23:48 +02:00
Klaas Freitag
67a6d9b60d
Create another beta version 0.50.2
2012-07-09 12:34:05 +02:00
Klaas Freitag
d0d8477b9f
Pushed version to 0.50.1.
2012-07-09 12:34:05 +02:00
Klaas Freitag
de209ecdb9
ownCloud: Don't require time sync between server and client.
2012-07-04 16:32:17 +02:00
Klaas Freitag
6eb4e707d9
Add module capability about if a post copy size check is required.
2012-07-04 15:03:15 +02:00
Klaas Freitag
8ba2f483bf
Add a vio capabilites function to let a module define its capabilities.
2012-07-04 13:56:24 +02:00
Klaas Freitag
c263a39334
Compute server time from http header and adjust mtimes.
2012-07-03 14:38:43 +02:00
Klaas Freitag
98bc5098c9
Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into dav
...
Conflicts:
src/csync_propagate.c
2012-07-01 15:27:41 +02:00
Klaas Freitag
3fad8b5a4b
Added lost var declaration.
2012-06-26 18:30:50 +02:00
Klaas Freitag
f31c74743c
Fix condition on when atomar push is allowed, never for local files.
2012-06-26 18:30:50 +02:00
Klaas Freitag
b5e40f0fa8
Updated Changelog
2012-06-26 18:30:50 +02:00
Klaas Freitag
8034da83cc
Ability to push to remote without using a tempfile to copy to.
...
Modules such as ownCloud make sure anyway that the upload to a
remote resource happens atomar. This patch allows to switch off
the default behaviour of first copying to a temp file in the
same directory. Use csync_set_remote_push_atomar function to
switch off.
2012-06-26 18:30:50 +02:00
Klaas Freitag
9380869d01
Remove wrong cast
2012-06-26 18:30:50 +02:00
Klaas Freitag
1accd936f3
ownCloud: Fix mem leaks to bring valgrind down to zero loss.
2012-06-26 18:30:50 +02:00
Klaas Freitag
00d43e76de
ownCloud: Use wide char aware file system functions.
2012-06-26 18:30:50 +02:00
Klaas Freitag
9c15351828
Added test for std function c_tmpname.
2012-06-26 18:30:50 +02:00
Klaas Freitag
92ec13d886
win32: Fix random file name generation, init random generator once.
2012-06-26 18:30:50 +02:00
Klaas Freitag
dd2e9ba747
Changelog updated for csync version 0.50.6.
2012-06-26 18:30:19 +02:00
Klaas Freitag
e129d02024
do not log on stderr on MacOSX because that spams system log
2012-06-26 18:28:38 +02:00
Klaas Freitag
d3d3454aaa
Set csync version to 0.50.7.
2012-06-26 18:28:18 +02:00
Klaas Freitag
cd7aec1636
Do not log "module not found" messages if there is a second try.
2012-06-26 18:28:18 +02:00
Klaas Freitag
6fc93f64a4
win32: use wide char variant of CopyFile for file copy.
2012-06-26 18:28:18 +02:00
Klaas Freitag
4253194fa0
win32: Use wide character variant of GetSpecialFolderPath to get home.
2012-06-26 18:28:18 +02:00
Klaas Freitag
88dce3022d
ownCloud: commented extensive log line.
2012-06-26 18:28:18 +02:00
Klaas Freitag
40eda1c004
logging in SSL callback, important to debug.
2012-06-26 18:28:18 +02:00
Klaas Freitag
1fe6db6b2b
Fix wide character support for the mkdir definition.
2012-06-26 18:28:18 +02:00
Klaas Freitag
8b90e31ba9
ownCloud: Adopt logging to csync standard log instead of printf.
2012-06-26 18:28:18 +02:00
Klaas Freitag
5e040d47d6
Add ability to log to a callback for the csync library.
2012-06-26 18:28:07 +02:00
Klaas Freitag
4ec3f8ecea
ownCloud: Proper initializations with NULL avoid a crash.
2012-06-26 18:28:07 +02:00
Klaas Freitag
84bf91b711
Win32: Chdir to app path before searching module relative.
2012-06-26 18:28:07 +02:00
Klaas Freitag
7ec663a0c6
Do not log on Apple by default as that goes to ASL
2012-06-26 18:28:07 +02:00
Klaas Freitag
2ef3931c32
ownCloud: Added redirect ability.
2012-06-26 18:28:07 +02:00
Klaas Freitag
f6b2b09911
Added changes for 0.50.6.
2012-06-26 18:27:57 +02:00
Klaas Freitag
36cf074337
Set version to 0.50.6 for next oC version.
2012-06-26 18:27:47 +02:00
Klaas Freitag
506d3759c2
ownCloud: Fix bug #613 : Encode strange url correctly.
...
see http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-613
2012-06-26 18:27:47 +02:00
Klaas Freitag
a0fe623ab6
Do proper handling of Win32 special characters.
...
Introduced a tchar based handling of wide character encoding that
is happening on Windows platforms.
2012-06-26 18:27:47 +02:00
Klaas Freitag
09cdbfcd5e
tests: exported csync treewalk function unit tests added.
2012-06-26 18:27:26 +02:00
Klaas Freitag
2fb8672d3e
Fixed local treewalk function filter comment.
2012-06-26 18:27:26 +02:00
Klaas Freitag
893bba6548
tests: Fixed ownCloud script that broke because HTTP::DAV module.
2012-06-26 18:26:41 +02:00
Klaas Freitag
863faa0169
ownCloud: Fixed var initialization to avoid crash after thread
...
terminated.
2012-06-26 18:26:07 +02:00
Klaas Freitag
69e3f47b95
ownCloud: Add neon include dir variable to the compile include dirs.
2012-06-26 18:26:07 +02:00
Klaas Freitag
dbe623339c
Changelog entries added for version 0.50.5.
2012-06-26 18:24:55 +02:00
Klaas Freitag
095f01302b
Added GNUInstallDirs.cmake to lower the required cmake version.
2012-06-26 18:24:55 +02:00
Dominik Schmidt
b9edff2179
ownCloud: Fix warning condition in reader code.
2012-06-26 18:24:55 +02:00
Dominik Schmidt
02b617b536
Load plugins on MacOSX.
2012-06-26 18:24:39 +02:00
Dominik Schmidt
4c6a1356a1
Compile cstdlib with -fPIC.
2012-06-26 18:24:39 +02:00
Dominik Schmidt
19f460a9ea
CMake: Fix owncloud linkage against neon.
2012-06-26 18:24:39 +02:00
Klaas Freitag
798dbb408f
Pushed version to 0.50.5 and lib version 0.1.5 for next oC release.
2012-06-26 18:24:39 +02:00
Dominik Schmidt
56e6b900db
Define O_NOATIME to 0 if it's not there
2012-06-26 18:24:39 +02:00
Dominik Schmidt
68b6fbeefe
fix building without log4c
2012-06-26 18:24:39 +02:00
Dominik Schmidt
68526da12f
cmake: Added Iniparser path hints.
2012-06-26 18:24:39 +02:00
Klaas Freitag
531c09f5b3
Push csync release to next internal beta 0.50.4.
2012-06-26 18:24:39 +02:00
Klaas Freitag
b0f6602681
Added a csync_errno function to provide more info for clients.
2012-06-26 18:24:08 +02:00
Klaas Freitag
55c3b0862c
Zero'ed a stat call that is just for a file size check.
2012-06-26 18:20:16 +02:00
Klaas Freitag
9286647262
Version to 0.50.3 for a next beta
2012-06-26 18:20:16 +02:00
Klaas Freitag
e8f8615d93
owncloud: remove the win32 c_tmpname use.
2012-06-26 18:19:29 +02:00
Klaas Freitag
07b04d6c9a
Create another beta version 0.50.2
2012-06-26 18:19:29 +02:00
Klaas Freitag
600b7591ab
Pushed version to 0.50.1.
2012-06-26 18:19:29 +02:00
Klaas Freitag
4c8fe93412
owncloud: Win32 use c_tmpname and set _fmode to O_BINARY.
2012-06-26 18:18:40 +02:00
Dominik Schmidt
4f8c6729ff
Simplify FindNeon.cmake
2012-06-26 17:17:10 +02:00
Klaas Freitag
1d1c28d5ad
Updated Changelog
2012-06-22 16:13:24 +02:00
Klaas Freitag
357b5cd5f3
Ability to push to remote without using a tempfile to copy to.
...
Modules such as ownCloud make sure anyway that the upload to a
remote resource happens atomar. This patch allows to switch off
the default behaviour of first copying to a temp file in the
same directory. Use csync_set_remote_push_atomar function to
switch off.
2012-06-22 15:32:04 +02:00
Klaas Freitag
adda008122
Remove wrong cast
2012-06-20 15:19:05 +02:00
Klaas Freitag
27dbdb29fc
ownCloud: Fix mem leaks to bring valgrind down to zero loss.
2012-06-20 15:01:54 +02:00
Klaas Freitag
6354c32d3b
ownCloud: Use wide char aware file system functions.
2012-06-20 12:08:06 +02:00
Klaas Freitag
939acdd9ca
Added test for std function c_tmpname.
2012-06-20 10:55:30 +02:00
Klaas Freitag
9836ec864a
win32: Fix random file name generation, init random generator once.
2012-06-20 10:40:40 +02:00
Klaas Freitag
26aff2d744
Bumped version to 0.50.7
2012-06-18 17:25:32 +02:00
Klaas Freitag
a018a8ab38
Fixed release date of 1.0.2
2012-06-18 17:25:09 +02:00
Klaas Freitag
06ffeee786
Updated changelog
2012-06-18 17:18:58 +02:00
Andreas Schneider
28e4963647
time: Make the timediff a hidden file.
2012-06-18 16:20:28 +02:00
Klaas Freitag
370e2e451f
do not log on stderr on MacOSX because that spams system log
2012-06-18 13:02:06 +02:00
Klaas Freitag
e0eda77c6d
set version to 0.50.7
2012-06-18 10:48:13 +02:00
Klaas Freitag
c1953d61c7
Do not log "module not found" messages if there is a second try.
2012-06-18 10:43:07 +02:00
Klaas Freitag
9b64825c69
win32: use wide char variant of CopyFile for file copy.
2012-06-13 17:32:13 +02:00
Klaas Freitag
26191448e7
win32: Use wide character variant of GetSpecialFolderPath to get home.
2012-06-13 17:30:50 +02:00
Klaas Freitag
f33cdb0de9
ownCloud: commented extensive log line.
2012-06-13 17:28:26 +02:00
Klaas Freitag
3e4e4eeee8
logging in SSL callback, important to debug.
2012-06-13 11:26:37 +02:00
Klaas Freitag
d1ae05166d
Added a newline in case the logging callback is zero.
2012-06-08 12:52:48 +02:00
Klaas Freitag
13847b9249
Fix wide character support for the mkdir definition.
2012-06-08 12:52:06 +02:00
Klaas Freitag
39534fb5de
Add ability to log to a callback for the csync library.
2012-06-05 17:11:33 +02:00
Klaas Freitag
c0182c373a
ownCloud: Adopt logging to csync standard log instead of printf.
2012-06-05 17:10:50 +02:00
Klaas Freitag
024fb244ef
Add a switch LOG_TO_CALLBACK for cmake to enable callback logging.
2012-06-05 17:09:42 +02:00
Klaas Freitag
648fc78d95
ownCloud: Proper initializations with NULL avoid a crash.
2012-05-21 09:44:23 +02:00
Klaas Freitag
17450f1f4b
Set the correct define to the new released version 0.50.6.
2012-05-21 09:43:42 +02:00
Klaas Freitag
7f9003bc83
Win32: Chdir to app path before searching module relative.
2012-05-18 12:56:03 +02:00
Klaas Freitag
6e7169c72b
Another Changelog update
2012-05-16 12:49:47 +02:00
Klaas Freitag
6f60ec571b
Updated Changelog
2012-05-16 12:48:48 +02:00
Klaas Freitag
a9ac5bf752
Do not log on Apple by default as that goes to ASL
2012-05-16 12:42:00 +02:00
Klaas Freitag
3d5f533a69
Update Changelog
2012-05-16 12:09:55 +02:00
Klaas Freitag
33d1825551
Merge branch 'dav' of http://git.csync.org/users/freitag/csync into dav
...
Conflicts:
src/csync.c
2012-05-15 16:17:51 +02:00
Klaas Freitag
d228436aba
ownCloud: better debug output for file GET.
2012-05-15 16:16:04 +02:00
Klaas Freitag
a198f36bf5
ownCloud: set correct module load error code.
2012-05-15 16:15:27 +02:00
Klaas Freitag
2d34a1c993
ownCloud: Added redirect ability.
2012-05-14 17:19:50 +02:00
Klaas Freitag
7177fd3298
Added changes for 0.50.6.
2012-05-14 17:19:05 +02:00
Klaas Freitag
6eb0dd15b4
Set version to 0.50.6 for next oC version.
2012-05-11 09:29:20 +02:00
Klaas Freitag
eff0319e40
ownCloud: Fix bug #613 : Encode strange url correctly.
...
see http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-613
2012-05-10 17:55:57 +02:00
Klaas Freitag
9ec8d70822
Do proper handling of Win32 special characters.
...
Introduced a tchar based handling of wide character encoding that
is happening on Windows platforms.
2012-05-09 16:55:56 +02:00
Klaas Freitag
694a34db9a
tests: Added treewalk test.
2012-05-07 17:19:06 +02:00
Klaas Freitag
2e3a92df4c
tests: Treewalk function unit tests added.
2012-05-07 15:48:34 +02:00
Klaas Freitag
81a6b49c07
Fixed local treewalk function filter comment.
2012-05-07 15:47:57 +02:00
Klaas Freitag
37c538ed9b
Fixed tests script that broke because of HTTP::DAV module
2012-05-04 16:27:15 +02:00
Klaas Freitag
d9ae749dcf
Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into dav
...
Conflicts:
modules/csync_owncloud.c
src/csync.h
2012-05-04 14:25:01 +02:00
Klaas Freitag
9871989806
ownCloud: Fixed var initialization to avoid crash after thread
...
terminated.
2012-05-04 12:07:20 +02:00
Klaas Freitag
cbf259b482
ownCloud: Add neon include dir variable to the compile include dirs.
2012-05-04 12:07:20 +02:00
Klaas Freitag
522a6e27a2
Set module load error code after csync_vio_init failed.
2012-05-04 12:07:20 +02:00
Klaas Freitag
b6696f00df
Changelog entries added.
2012-05-04 12:07:20 +02:00
Klaas Freitag
2fa265007a
Added GNUInstallDirs.cmake to lower the required cmake version.
2012-05-04 12:07:20 +02:00
Klaas Freitag
2b5d31b29e
Moved error_code to context for thread savety.
2012-05-04 12:07:20 +02:00
Klaas Freitag
73bcdb73a7
Added errnos to the timediff function to allow specific error reports.
2012-05-04 12:05:45 +02:00
Dominik Schmidt
c4667c893b
Fix loading plugins inside MacOSX bundles.
2012-05-04 12:05:22 +02:00
Dominik Schmidt
0160be06f5
ownCloud: Fix warning condition in reader code.
2012-05-04 12:04:58 +02:00
Dominik Schmidt
4c98f6bcd8
Load plugins on apple.
2012-05-04 12:04:36 +02:00
Dominik Schmidt
a8c10780f2
Compile cstdlib with -fPIC.
2012-05-04 12:04:30 +02:00
Dominik Schmidt
ac6e5ff4b9
CMake: Fix owncloud linkage against neon.
2012-05-04 12:04:13 +02:00
Dominik Schmidt
5ac2f676d7
Define O_NOATIME to 0 if it's not there.
2012-05-04 12:03:53 +02:00
Dominik Schmidt
628151e997
CMake Modules: Simplify FindNeon.cmake.
2012-05-04 12:03:36 +02:00
Dominik Schmidt
668d7be259
CMake: Fix building without Log4C.
2012-05-04 12:02:35 +02:00
Dominik Schmidt
79c4b58c63
CMake modules: Search libiniparser in correct lib dirs.
2012-05-04 12:01:51 +02:00
Klaas Freitag
e4fae59bcf
Added a csync_errno function to provide more info for clients.
2012-05-04 12:00:46 +02:00
Klaas Freitag
0d71347508
Removed a stat call that is just for a file size check.
2012-05-04 12:00:46 +02:00
Klaas Freitag
b6c86bcacd
ownCloud: Fixed var initialization to avoid crash after thread
...
terminated.
2012-04-27 16:33:31 +02:00
Klaas Freitag
90a9f162d4
ownCloud: Add neon include dir variable to the compile include dirs.
2012-04-27 16:27:44 +02:00
Klaas Freitag
cc5d2866b1
Set module load error code after csync_vio_init failed.
2012-04-19 16:12:05 +02:00
Klaas Freitag
e5c0503797
Changelog entries added.
2012-04-18 21:33:07 +02:00
Klaas Freitag
5ceebe1d3c
Added GNUInstallDirs.cmake to lower the required cmake version.
2012-04-18 21:32:18 +02:00
Klaas Freitag
6f51876b45
Moved error_code to context for thread savety.
2012-04-17 12:31:27 +02:00
Andreas Schneider
8212553cbe
owncloud: Fix some build warnings.
2012-04-17 11:23:20 +02:00
Dominik Schmidt
13f05db934
cmake: Make Log4C optional.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 11:21:03 +02:00
Klaas Freitag
4693f313cd
cmake: Removed obsolete FindArgp module.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 11:19:44 +02:00
Dominik Schmidt
9eb9116df3
Simplify FindLibIniparser.cmake
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 11:16:32 +02:00
Klaas Freitag
010305eab2
ownCloud: catch some compiler warnings when very pedantic.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 11:16:09 +02:00
Klaas Freitag
f40ab9c6e1
ownCloud: Debug output only if NDEBUG is undefined.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 11:15:46 +02:00
Klaas Freitag
d8bac80f51
tests: Added another test to the ownCloud module test.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 11:15:34 +02:00
Klaas Freitag
b8100868a3
ownCloud: added memory buffered put requests with fallback on file.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 11:13:18 +02:00
Klaas Freitag
4acb4eef63
ownCloud: Added a flag for the existance of the current directory.
...
That saves a lot of stat calls because the for each PUT a stat has
to be done if the parent dir exists.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:50:10 +02:00
Klaas Freitag
44a078b991
Win32: Add win32 rename function that overwrites existing targets.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:49:51 +02:00
Klaas Freitag
0bedd5d9a3
Win32: Disabled Query per inode, always returning NULL.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:49:29 +02:00
Klaas Freitag
99c0405a26
ownCloud: Disabled useless debugging output.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:48:59 +02:00
Klaas Freitag
45ad55d894
ownCloud: Added http compression support for GET requests.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:48:28 +02:00
Klaas Freitag
dec1e6a3cf
tests: Use correct value from perl stat call to get the file mtime.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:48:12 +02:00
Klaas Freitag
ec921a1e51
Win32: Added some specific headers to c_private.h to fix build.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:47:56 +02:00
Andreas Schneider
fdc1a71050
csync: Use uint32_t for uid and gid.
2012-04-17 10:46:58 +02:00
Klaas Freitag
d2ae109cc3
Win32: substitute uid_t and gui_t and removed a not needed include.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:46:04 +02:00
Klaas Freitag
2ac172f4fe
update: Add new exported file tree traverse functions.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:45:04 +02:00
Klaas Freitag
f0d2943e5f
Do not bail out if the config can't be read, use default values.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:42:36 +02:00
Klaas Freitag
5e7d5c983a
win32: Copy the default conf file from the application dir.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:42:01 +02:00
Klaas Freitag
f292c01eac
Read $HOME variable first before checking the password file entry.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:40:35 +02:00
Klaas Freitag
8e64584c12
tests: Added test script to test the ownCloud module of csync.
...
The script t1.pl is a perl based check script for the ownCloud
module of csync. It requires a running ownCloud server and does
a couple of blackbox tests with it.
See README for more information how to operate.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:40:21 +02:00
Klaas Freitag
871dde4911
Added ability to limit the csync run to the local tree only.
...
That gives apps the chance to use the efficient treewalk of csync
to get information on the tree.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:40:21 +02:00
Klaas Freitag
53263a2685
owncloud: set _fmode variable to set file ops to binary mode.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-17 10:40:21 +02:00
Klaas Freitag
db614ecf34
Pushed version to 0.50.5 and lib version 0.1.5 for next oC release.
2012-04-17 10:36:52 +02:00
Klaas Freitag
e32d02c984
Added errnos to the timediff function to allow specific error reports.
2012-04-16 09:33:40 +02:00
Dominik Schmidt
f355bef266
Fix loading plugins inside bundles
2012-04-15 14:36:11 +02:00
Dominik Schmidt
87bc7ca4cc
Fix warning condition
2012-04-15 14:35:38 +02:00
Dominik Schmidt
8312e4430c
do plugins on apple
2012-04-15 14:13:07 +02:00
Dominik Schmidt
d768ad7f0f
Compile cstdlib with -fPIC
2012-04-14 14:54:14 +02:00
Dominik Schmidt
c3703023dd
Merge branch 'dav'
2012-04-14 03:30:50 +02:00
Dominik Schmidt
7b2d1da3b7
Define O_NOATIME to 0 if it's not there
2012-04-14 03:13:28 +02:00
Dominik Schmidt
e5a9d64353
Simplify FindNeon.cmake
2012-04-14 03:13:28 +02:00
Dominik Schmidt
0b7f273df3
fix building without log4c
2012-04-14 03:13:28 +02:00
Dominik Schmidt
9d8383c0fe
Libiniparser narf
2012-04-14 03:13:28 +02:00
Klaas Freitag
341c48197e
removed argp lib check.
2012-04-14 03:13:28 +02:00
Klaas Freitag
8a528d3abc
ownCloud: catch some compiler warnings when very pedantic.
2012-04-14 03:13:28 +02:00
Klaas Freitag
6620d68c5e
Push csync release to next internal beta 0.50.4.
2012-04-14 03:13:28 +02:00
Klaas Freitag
33b045270b
ownCloud: Debug output only if NDEBUG is undefined.
2012-04-14 03:13:28 +02:00
Klaas Freitag
b433b7d2ac
tests: Added another test to the ownCloud module test.
2012-04-14 03:13:27 +02:00
Klaas Freitag
285baa6fb7
Added a csync_errno function to provide more info for clients.
2012-04-14 03:13:27 +02:00
Klaas Freitag
9a2c83b94c
ownCloud: added memory buffered put requests with fallback on file.
2012-04-14 03:13:27 +02:00
Klaas Freitag
10c11cc5e8
Removed a stat call that is just for a file size check.
2012-04-14 03:13:27 +02:00
Klaas Freitag
ece98b55a4
ownCloud: Added a flag for the existance of the current directory.
...
That saves a lot of stat calls because the for each PUT a stat has
to be done if the parent dir exists.
2012-04-14 03:13:27 +02:00
Klaas Freitag
a64ce22997
Win32: Add win32 rename function that overwrites existing targets.
2012-04-14 03:13:27 +02:00
Klaas Freitag
270a4262b4
Win32: Disabled Query per inode, always returning NULL.
2012-04-14 03:13:27 +02:00
Klaas Freitag
b815e169f1
ownCloud: Disabled useless debugging output.
2012-04-14 03:13:27 +02:00
Klaas Freitag
a40df40b4c
ownCloud: Added http compression support for GET requests.
2012-04-14 03:13:27 +02:00
Klaas Freitag
a85ed3862b
tests: Use correct value from perl stat call to get the file mtime.
2012-04-14 03:13:27 +02:00
Klaas Freitag
3979492914
Version to 0.50.3 for a next beta
2012-04-14 03:13:27 +02:00
Klaas Freitag
a4865cfdf4
Win32: Added some specific headers to c_private.h to fix build.
2012-04-14 03:13:27 +02:00
Klaas Freitag
4730d80738
Win32: substitute uid_t and gui_t and removed a not needed include.
2012-04-14 03:13:27 +02:00
Klaas Freitag
254045780a
Add new exported file tree traverse functions.
2012-04-14 03:13:27 +02:00
Klaas Freitag
4a0713370e
Do not bail out if the config can't be read, use default values.
2012-04-14 03:13:27 +02:00
Klaas Freitag
1634a8bdf4
Win32: copy the default conf file from the application dir.
2012-04-14 03:13:27 +02:00
Klaas Freitag
48579fe73f
Disable config file copy for Win32 platform.
2012-04-14 03:13:27 +02:00
Klaas Freitag
becb03ad97
Read $HOME variable first before checking the password file entry.
2012-04-14 03:13:27 +02:00
Klaas Freitag
d0e308a81d
owncloud: memclear a buf and remove not needed win32 code.
2012-04-14 03:13:27 +02:00
Klaas Freitag
dfb774714e
Create another beta version 0.50.2
2012-04-14 03:13:27 +02:00
Klaas Freitag
1380902ede
Pushed version to 0.50.1.
2012-04-14 03:13:26 +02:00
Klaas Freitag
da32a9facf
owncloud test: Make use of a little cfg file to configure credentials.
2012-04-14 03:13:26 +02:00
Klaas Freitag
9916abc072
tests: Added test script to test the ownCloud module of csync.
...
The script t1.pl is a perl based check script for the ownCloud
module of csync. It requires a running ownCloud server and does
a couple of blackbox tests with it.
See README for more information how to operate.
2012-04-14 03:13:26 +02:00
Klaas Freitag
1a329539ec
Added ability to limit the csync run to the local tree only.
...
That gives apps the chance to use the efficient treewalk of csync
to get information on the tree.
2012-04-14 03:13:26 +02:00
Klaas Freitag
b6ad8635d6
owncloud: set _fmode variable to set file ops to binary mode.
2012-04-14 03:13:26 +02:00
Klaas Freitag
f7c8e9f26c
std: Renamed struct_stat to csync_stat_t and use c_private.h again.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-04-14 03:13:26 +02:00
Dominik Schmidt
9d73d7705d
Make LOG4C optional
2012-04-14 00:05:52 +02:00
Dominik Schmidt
8e64cebe57
Simplify FindLibIniparser.cmake
2012-04-13 23:20:34 +02:00
Dominik Schmidt
da0c0b3bbe
Fix owncloud linkage against neon
2012-04-13 22:54:03 +02:00
Dominik Schmidt
979f4f7f20
Define O_NOATIME to 0 if it's not there
2012-04-13 22:36:16 +02:00
Dominik Schmidt
99ee323a58
Simplify FindNeon.cmake
2012-04-14 00:35:16 +02:00
Dominik Schmidt
249cb8ecf4
fix building without log4c
2012-04-14 00:16:28 +02:00
Dominik Schmidt
dc0de28a77
Libiniparser narf
2012-04-14 00:11:11 +02:00
Dominik Schmidt
7067836c68
Make LOG4C optional
2012-04-14 00:06:46 +02:00
Klaas Freitag
acccd5445f
removed argp lib check.
2012-04-13 21:49:40 +02:00
Dominik Schmidt
0927bae5d4
Simplify FindLibIniparser.cmake
2012-04-13 21:45:56 +02:00
Klaas Freitag
a6c16c063e
ownCloud: catch some compiler warnings when very pedantic.
2012-04-10 11:49:16 +02:00
Klaas Freitag
7204b9bdd8
Push csync release to next internal beta 0.50.4.
2012-04-10 11:49:16 +02:00
Klaas Freitag
07b2371740
ownCloud: Debug output only if NDEBUG is undefined.
2012-04-10 11:49:16 +02:00
Klaas Freitag
6d8e79bbe2
tests: Added another test to the ownCloud module test.
2012-04-10 11:49:16 +02:00
Klaas Freitag
cc87c0629a
Added a csync_errno function to provide more info for clients.
2012-04-10 11:49:16 +02:00
Klaas Freitag
bf53697664
ownCloud: added memory buffered put requests with fallback on file.
2012-04-10 11:49:16 +02:00
Klaas Freitag
cea1d4fd47
Removed a stat call that is just for a file size check.
2012-04-10 11:49:16 +02:00
Klaas Freitag
3fd80bb0e2
ownCloud: Added a flag for the existance of the current directory.
...
That saves a lot of stat calls because the for each PUT a stat has
to be done if the parent dir exists.
2012-04-10 11:49:16 +02:00
Klaas Freitag
24796539ff
Win32: Add win32 rename function that overwrites existing targets.
2012-04-10 11:49:16 +02:00
Klaas Freitag
5543d20441
Win32: Disabled Query per inode, always returning NULL.
2012-04-10 11:49:16 +02:00
Klaas Freitag
74f0b57ed7
ownCloud: Disabled useless debugging output.
2012-04-10 11:48:40 +02:00
Klaas Freitag
86549e142f
ownCloud: Added http compression support for GET requests.
2012-04-10 11:48:33 +02:00
Klaas Freitag
cef5d2ade1
tests: Use correct value from perl stat call to get the file mtime.
2012-04-10 11:48:23 +02:00
Klaas Freitag
6ff95a1b93
Version to 0.50.3 for a next beta
2012-04-10 11:48:23 +02:00
Klaas Freitag
980bd6cbd6
Win32: Added some specific headers to c_private.h to fix build.
2012-04-10 11:47:42 +02:00
Klaas Freitag
cce1502bfc
Win32: substitute uid_t and gui_t and removed a not needed include.
2012-04-10 11:47:42 +02:00
Klaas Freitag
1a7ca763e9
Add new exported file tree traverse functions.
2012-04-10 11:47:41 +02:00
Klaas Freitag
d354e443c4
Do not bail out if the config can't be read, use default values.
2012-04-10 11:47:41 +02:00
Klaas Freitag
8555be060b
Win32: copy the default conf file from the application dir.
2012-04-10 11:47:41 +02:00
Klaas Freitag
c2a296ae98
Disable config file copy for Win32 platform.
2012-04-10 11:46:23 +02:00
Klaas Freitag
1ee41f9f97
Read $HOME variable first before checking the password file entry.
2012-04-10 11:46:23 +02:00
Klaas Freitag
fd9a380fc9
owncloud: memclear a buf and remove not needed win32 code.
2012-04-10 11:45:19 +02:00
Klaas Freitag
ad453115b4
Create another beta version 0.50.2
2012-04-10 11:45:19 +02:00
Klaas Freitag
8dfde01d86
Pushed version to 0.50.1.
2012-04-10 11:45:19 +02:00
Klaas Freitag
fb0a0ae81c
owncloud test: Make use of a little cfg file to configure credentials.
2012-04-10 11:45:19 +02:00
Klaas Freitag
807981fe87
tests: Added test script to test the ownCloud module of csync.
...
The script t1.pl is a perl based check script for the ownCloud
module of csync. It requires a running ownCloud server and does
a couple of blackbox tests with it.
See README for more information how to operate.
2012-04-10 11:44:57 +02:00
Klaas Freitag
a75591d0d4
Added ability to limit the csync run to the local tree only.
...
That gives apps the chance to use the efficient treewalk of csync
to get information on the tree.
2012-04-10 11:44:57 +02:00
Klaas Freitag
3676ca623a
owncloud: set _fmode variable to set file ops to binary mode.
2012-04-10 11:43:56 +02:00
Klaas Freitag
3ae453cc36
std: Renamed struct_stat to csync_stat_t and use c_private.h again.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-03-21 13:48:41 +01:00
Klaas Freitag
dbc9576876
Fix use of strerror_r on non GNU platforms.
2012-03-19 12:40:43 +01:00
Klaas Freitag
6300e78816
Fix use of strerror_r on non GNU platforms.
2012-03-19 12:40:43 +01:00
Klaas Freitag
8b9c10246e
Fix use of strerror_r on non GNU platforms.
2012-03-19 12:40:43 +01:00
Klaas Freitag
f0a84bb5da
Fix use of strerror_r on non GNU platforms.
2012-03-19 12:40:43 +01:00
Klaas Freitag
a0e0caa5b8
Fix use of strerror_r on non GNU platforms.
2012-03-19 12:40:43 +01:00
Klaas Freitag
ffd2e0e767
Fixed file copy for Win32 platform by using API function FileCopy.
2012-03-19 12:40:30 +01:00
Klaas Freitag
ea89ac46ac
Use getopt functions instead of GNU libc specific argp functions.
...
For command line option parsing, better use the getopt functions
instead of the GNU libc specific argp functions if we want to be
portable. argp usage does not compile on MacOS, thus it was now
removed from csync.
2012-03-15 15:15:35 +01:00
Klaas Freitag
e264ac347d
owncloud: use decoded file name to search in stat result list.
2012-03-15 14:11:14 +01:00
Klaas Freitag
5ad5d176f9
ownCloud: Use win32 API to get the standard user temp path.
...
Conflicts:
modules/csync_owncloud.c
2012-03-15 14:11:14 +01:00
Klaas Freitag
14791534ca
owncloud: cleaned some comment signs from C++ to C type.
2012-03-15 14:11:14 +01:00
Klaas Freitag
bc138efa4e
owncloud: set _fmode variable to set file ops to binary mode.
2012-03-07 16:18:08 +01:00
Klaas Freitag
87d3a56221
owncloud: More robust programming, some additional logs.
2012-03-07 16:18:08 +01:00
Klaas Freitag
bb1ccadebc
ownCloud: Fix translation of mkcol 405 errcode to ernno.
2012-03-07 16:18:08 +01:00
Klaas Freitag
9b8e75e4fc
ownCloud: append a trailing slash in mkdir as neon requests.
2012-03-07 16:18:08 +01:00
Klaas Freitag
a454156dc2
ownCloud: remove wired function to generate errno from neon error.
...
The errno is now either generated from the session values of neon
or individually in each function.
2012-03-07 16:18:08 +01:00
Klaas Freitag
edb073a290
ownCloud: removed the test on webdav.php. It is not needed.
...
The server handles it correctly itself to return the correct
type for the toplevel dir webdav.php
2012-03-07 16:18:08 +01:00
Klaas Freitag
9f67accf14
owncloud: Fix stat function for WebDAV root.
...
If a propcall happens to webdav.php the webdav server returns the
result list for all entries. In stat only the webdav.php entry is
interesting and must be searched within the result list.
2012-03-07 16:18:08 +01:00
Andreas Schneider
e409d0fae9
time: Use correct abs() function for long long.
2012-03-07 16:17:43 +01:00
Andreas Schneider
f0cf678c0e
Fix config checks.
2012-03-02 17:04:02 +01:00
Dominik Schmidt
3ed887f152
windows: don't use malloc directly in csync_get_[user_home_dir||local_username]
2012-03-02 17:04:02 +01:00
Dominik Schmidt
4c22c84bd1
windows: fix loading plugins
2012-03-02 17:04:02 +01:00
Dominik Schmidt
00c47f62c4
windows: install libcsync.dll to bin/
2012-03-02 17:04:02 +01:00
Dominik Schmidt
94006d0171
windows: don't refer to SYSCONFDIR
2012-03-02 17:04:02 +01:00
Dominik Schmidt
4df3aee5c2
Replace csync_auth with ssh_gets implementation from libssh
2012-03-02 17:04:02 +01:00
Dominik Schmidt
f08d145c39
Link against libargp on non-linux platforms
2012-03-02 17:04:02 +01:00
Dominik Schmidt
593cd4514a
windows: disable locks
2012-03-02 17:04:02 +01:00
Dominik Schmidt
1fbba4f158
mingw: resolve name clashes in dummy module and link it against libcsync
2012-03-02 17:04:02 +01:00
Dominik Schmidt
6e4ce19a85
Add csync_fnmatch
2012-03-02 17:04:02 +01:00
Dominik Schmidt
d1ea29f4aa
Don't check for links on non-unix platforms
2012-03-02 17:04:02 +01:00
Dominik Schmidt
6272a2b485
Use stat if lstat is not available
2012-03-02 17:04:02 +01:00
Dominik Schmidt
da286857e0
windows: add utimes implementation
2012-03-02 17:04:02 +01:00
Dominik Schmidt
dd9b73f383
mingw: enable asprintf
2012-03-02 17:04:02 +01:00
Dominik Schmidt
674aa7cd64
windows: add strerror_r implementation
2012-03-02 17:04:02 +01:00
Dominik Schmidt
31389975e7
Add missing break statement
2012-03-02 17:04:02 +01:00
Dominik Schmidt
ee6c631f28
windows: add missing status codes, types and return-values
2012-03-02 17:04:02 +01:00
Dominik Schmidt
29f45a4ee5
windows: minor adjustments
2012-03-02 17:04:02 +01:00
Dominik Schmidt
11c515f869
mingw: resolve name clashes in sftp module
2012-03-02 17:04:02 +01:00
Dominik Schmidt
f064dbcde4
Make libsmbclient optional
2012-03-02 17:02:59 +01:00
Andreas Schneider
1d9b4f0640
std: Make it possible to use the macros alone.
2012-03-02 17:02:59 +01:00
Andreas Schneider
9d6001d39d
std: Add missing include.
2012-03-02 17:02:59 +01:00
Andreas Schneider
29839d42a8
misc: Add missing header file guard and update copyright.
2012-03-02 13:47:45 +01:00
Andreas Schneider
9c86b3adcd
csync: Use csync_get_user_home_dir().
2012-03-02 13:40:10 +01:00
Andreas Schneider
3952c4be62
misc: Add csync_get_user_home_dir() and csync_get_local_username().
2012-03-02 13:40:05 +01:00
Andreas Schneider
7cff62945f
Update ChangeLog.
2012-02-22 18:28:38 +01:00
Andreas Schneider
ebdc44cae5
Update AUTHORS.
2012-02-22 18:27:16 +01:00
Andreas Schneider
cd2c75e602
Increase version numbers for beta release.
2012-02-22 18:27:09 +01:00
Klaas Freitag
ded226911e
owncloud: Removed unused file attribute contenttype from PROPFIND.
2012-02-22 18:23:18 +01:00
Klaas Freitag
56c583615d
owncloud: Remove more unused logging.
2012-02-22 18:23:18 +01:00
Klaas Freitag
3025ada5dc
owncloud: Use c_parse_uri instead of neon equivalent, minor cleanups.
2012-02-22 18:23:18 +01:00
Klaas Freitag
5c97b6f81d
owncloud: Call the neon ssl functions only if SSL is active.
...
Especially ne_ssl_trust_default_ca seems to crash in case no SSL is
used actually. Added a flag to determine between SSL and no SSL.
Moved a debug message to the right place.
2012-02-22 18:23:18 +01:00
Klaas Freitag
bc1174cb8a
owncloud: Add ne_ssl_trust_default_ca to trust default certificates.
2012-02-22 18:23:18 +01:00
Klaas Freitag
784fc60ec1
Fix off-by-one error in url rewrite for SSL.
2012-02-22 18:23:18 +01:00
Klaas Freitag
d7e13276e5
owncloud: Remove the sorting of the dirlist results.
2012-02-22 18:23:18 +01:00
Klaas Freitag
5ba71bbf79
Change module link statement to link against LIBCSYNC.
...
For windows building, the whole csync lib instead of the C standards
only is needed. Not a big difference, so changed for all platforms.
2012-02-22 18:23:18 +01:00
Klaas Freitag
45ec3c0248
owncloud: Removed unused _stat function.
2012-02-22 18:23:18 +01:00
Klaas Freitag
71e110364e
owncloud: added cleanPath and moved _stat_perms.
2012-02-22 18:23:18 +01:00
Klaas Freitag
f56103dc0d
owncloud: Removed unused cleanUrl function.
2012-02-22 18:23:18 +01:00
Klaas Freitag
664f1cb17d
owncloud: some code cleanups.
2012-02-22 18:23:18 +01:00
Klaas Freitag
e320ccf7f8
owncloud: Renames of the vio functions by appending owncloud.
...
That avoids name clashes with MinGW. Patch provided by Dominik Schmidt.
2012-02-22 18:23:18 +01:00
Klaas Freitag
425f4b1cec
owncloud: Some code fixes and more errno corrections.
2012-02-22 18:23:18 +01:00
Klaas Freitag
545115bfae
owncloud: Set proper useragent, fixed some comments and warnings.
2012-02-22 18:23:18 +01:00
Klaas Freitag
936a32295f
owncloud: Added SSL support.
2012-02-22 18:23:18 +01:00
Klaas Freitag
19a485944a
owncloud: added missing close.
2012-02-22 18:23:18 +01:00
Klaas Freitag
7c3544611b
owncloud: Adopted to new owncloud scheme.
2012-02-22 18:23:18 +01:00
Klaas Freitag
07b4fbcf4f
owncloud: Module renamed to owncloud.
2012-02-22 18:23:18 +01:00
Klaas Freitag
e4259719ad
owncloud: Convert webdav -> http in init function.
2012-02-22 18:23:18 +01:00
Klaas Freitag
931a2823f8
owncloud: Fixes in setting errno correctly in stat.
2012-02-22 18:23:18 +01:00
Klaas Freitag
a25c59be94
owncloud: Use the correct property name for lastmodification time.
2012-02-22 18:23:18 +01:00
Klaas Freitag
56d36ae63e
owncloud: Code rearranges and stat call added to stat.
...
Rearranged function sequence and added stat call to parent dir to
function open if file is written to. That allows a proper ENOENT
return value if directory is not yet existing. Fixed more escaping
glitches.
2012-02-22 18:23:18 +01:00
Klaas Freitag
ac01d3a404
owncloud: More memory management fixes and debug output.
2012-02-22 18:23:18 +01:00
Klaas Freitag
1c0275bfee
owncloud: Fixed escaping for url paths, improved error handling.
...
Fixed escaping for url paths, improved error handling and mem
management
2012-02-22 18:23:17 +01:00
Klaas Freitag
17d0b504fa
owncloud: Fixed uri parsing, added escaping, more mem cleanups.
2012-02-22 18:23:17 +01:00
Klaas Freitag
0aed3f57b4
owncloud: Implemented proper auth callback handling. Fixed move request
2012-02-22 18:23:17 +01:00
Klaas Freitag
1c7a286dec
owncloud: Renamed local var for consistency.
2012-02-22 18:23:17 +01:00
Klaas Freitag
fd189b3946
owncloud: Code cleanups.
...
Removed unused variables, fixed some comments, added some memory frees,
removed compile warnings
2012-02-22 18:23:17 +01:00
Klaas Freitag
709d4d560d
owncloud: Reworked read and write to operate on local copies.
...
This creates local temporary files and uses them to transfer the data
(GET and PUT requests).
2012-02-22 18:23:17 +01:00
Klaas Freitag
f4978ad6eb
owncloud: Fix rename: use target path only instead of complete uri.
2012-02-22 18:23:17 +01:00
Klaas Freitag
fc808fa80a
owncloud: Implementation of utimes.
2012-02-22 18:23:17 +01:00
Klaas Freitag
e0deecfa82
owncloud: Set permissions in stat data block correctly.
2012-02-22 18:23:17 +01:00
Klaas Freitag
5f040f4063
owncloud: Simplify code useing c_basename to get filename from path.
2012-02-22 18:23:17 +01:00
Klaas Freitag
7f26533f8e
owncloud: Improve error handling and set errno.
2012-02-22 18:23:17 +01:00
Andreas Schneider
3821e6e472
owncloud: Fix the size field in stat data structure.
2012-02-22 18:23:17 +01:00
Andreas Schneider
7c5e30be99
owncloud: Implement the _stat call correctly.
2012-02-22 18:23:17 +01:00
Andreas Schneider
2f90d5ac6f
owncloud: Fix the _creat function.
2012-02-22 18:23:17 +01:00
Andreas Schneider
d5145e1e0a
owncloud: Add debug messages for _open.
2012-02-22 18:23:17 +01:00
Andreas Schneider
2b15a7b663
owncloud: Implement write function.
2012-02-22 18:23:17 +01:00
Klaas Freitag
8691ce2c7e
module: Start implementing functions using libneon.
...
Implement opendir, readdir, closedir and stat and various minor fixes.
2012-02-22 18:23:17 +01:00
Andreas Schneider
141a095d45
module: Start with some webdav code based on libneon.
2012-02-22 18:23:17 +01:00
Andreas Schneider
f0f36120ad
module: Build the webdav module.
2012-02-22 18:23:17 +01:00
Andreas Schneider
f1647b3338
module: Add a webdav module skeleton.
2012-02-22 18:23:17 +01:00
Andreas Schneider
2b05dc33b7
client: Disable conflict copies by default.
2012-02-22 17:52:19 +01:00
Andreas Schneider
f753a3db0a
util: Rename temp file of the unix extension test.
2012-02-22 16:18:07 +01:00
Andreas Schneider
9a12d219d3
vio: Add support for SSL scheme names.
...
If the scheme is https try to load the module without the s at the end
if there is no module.
2012-02-13 14:33:23 +01:00
Andreas Schneider
f4f22373ed
Remove TODO.
2012-02-04 14:27:48 +01:00
Andreas Schneider
63565b0f26
time: Fix clock_gettime().
2012-02-04 14:24:22 +01:00
Andreas Schneider
aa6bef0d77
config: Add missing config values.
2012-02-04 14:11:37 +01:00
Andreas Schneider
ca52cb0545
Update ChangeLog.
2012-02-04 13:57:55 +01:00
Andreas Schneider
c2bad8004d
smb: Require newer samba version.
2012-02-04 13:47:00 +01:00
Andreas Schneider
59d1432c4a
Update README.
2012-02-04 13:41:17 +01:00
Andreas Schneider
2ec6c98101
tests: Fix the csync util test.
2012-02-04 13:30:10 +01:00
Andreas Schneider
e8b0b34fe5
tests: Fix time test.
2012-02-04 13:24:56 +01:00
Andreas Schneider
19abbc04ff
csync: Use csync_gettime().
2012-02-04 13:24:53 +01:00
Andreas Schneider
1d609e5985
time: Add csync_gettime() function.
2012-02-04 13:09:07 +01:00
Andreas Schneider
331783baef
propagate: Remove dead and wrong assignments.
2012-02-04 12:54:15 +01:00
Andreas Schneider
8e89bfec2b
propagate: Fix dead assignment.
2012-02-04 12:47:39 +01:00
Andreas Schneider
82c2017a04
path: Fix dead assignment.
2012-02-04 12:44:15 +01:00
Andreas Schneider
eb2b3438ba
lock: Fix unlink in error path.
2012-02-04 12:41:55 +01:00
Andreas Schneider
9f802a83f3
propagate: Fix some blank lines.
2012-02-04 12:37:33 +01:00
Andreas Schneider
b99fd213b6
vio: Fix build errors.
2012-02-04 12:34:46 +01:00
Andreas Schneider
de2cb55f0e
propagate: Remove unused variables.
2012-02-04 12:28:51 +01:00
Andreas Schneider
6dca82a4a1
reconcile: Fix return value.
2012-02-04 12:26:27 +01:00
Andreas Schneider
4e5b29257e
include: Fix packed attribute for file structure.
2012-02-04 12:23:54 +01:00
Andreas Schneider
5a28200e8b
cmake: Increase minimun requried cmake version.
2012-02-04 12:23:30 +01:00
Andreas Schneider
1c52b90fa4
Pack the csync_file_stat structure.
2012-02-04 12:15:48 +01:00
Andreas Schneider
d0888ffba8
cmake: Fix build on OSX.
2012-01-20 15:23:18 +01:00
Christian Jann
ffd7d5b247
better idea to align the INSTRUCTIONs printf(%-20s,...)
2011-04-12 19:42:08 +02:00
Christian Jann
9c40ecafc4
csync.reconciler: show the correct type: "file" or "dir"
2011-04-12 17:59:25 +02:00
Christian Jann
deb620b5be
align everything correctly (easier to read)
...
prefix "CSYNC_": no extra information -> removed
we could even remove "INSTRUCTION_" or change it to "INST_"
2011-04-12 17:09:39 +02:00
Christian Jann
a8071bfd14
csync.propagator/csync.reconciler first print instruction type,
...
than print the path and align everything correctly (easier to read)
2011-04-12 17:06:18 +02:00
Christian Jann
f65612ff2e
hide instruction NONE messages when log level is set to debug,
...
only show these messages on log level trace
2011-04-12 13:20:50 +02:00
Christian Jann
aad3e146fc
set instruction after conflict backup for the statedb merger to NONE
2011-04-12 10:09:41 +02:00
Christian Jann
1fbe6b6c96
Better way to fix bug "Found a bug but no bugtracker"
2011-04-06 17:09:05 +02:00
Christian Jann
92dc16a59e
Increase version numbers.
2011-04-06 17:08:52 +02:00
Christian Jann
c848d8ffd7
added conflict-copy option to csync client
2011-04-06 17:08:30 +02:00
Christian Jann
2627275da5
updated .gitignore
2011-04-06 17:08:14 +02:00
Christian Jann
9864baa0c8
fixed small error:
...
csync/first/a~
was renamed to:
csync/first/~a_conflict-20110326-190457~
but it should be:
csync/first/a_conflict-20110326-190457~
2011-04-06 17:08:01 +02:00
Christian Jann
d842119065
improved logging
2011-04-06 17:07:20 +02:00
Christian Jann
e4d8e793f6
added new conflict resolution to libcsync
...
- use the latest version of the two files under its original filename
in both destinations (same as currently implemented)
- additionally, create a copy of the older file under a different name
using the same file extension with appended marker (e.g. "conflict")
and timestamp in both destinations
(e.g. textfile.odt -> textfile_conflict-20100222-105000.odt)
- At the Moment 'textfile_conflict-20100222-105000.odt' is only created
on the side where the conflict has occurred and gets synced to the other side
on the second sync.
2011-04-06 16:57:24 +02:00
Christian Jann
29616c0b2e
ignore kdevelop project files
2011-04-06 16:56:27 +02:00
Christian Jann
09980fcf5a
fix hundreds of these warnings:
...
csync.c:272:75: warning: ISO C99 requires rest arguments to be used
2011-04-06 16:56:05 +02:00
Christian Jann
f76d9fbcc3
added kate's suffix for backupfiles to .gitignore
2011-04-06 16:55:14 +02:00
Andreas Schneider
d9da6b6e91
Updated ChangeLog.
2010-02-15 12:31:15 +01:00
Andreas Schneider
f46817b2c1
Improved the interactive keyboard auth function.
2010-02-15 12:30:38 +01:00
Andreas Schneider
94b7fdc8ca
Improved the ssh auth functions.
2010-02-15 12:20:57 +01:00
Andreas Schneider
84c77a2d5a
Improve the server is known messages.
2010-02-15 12:10:17 +01:00
Andreas Schneider
3a9bfdb489
Increase version numbers.
2010-02-15 11:56:35 +01:00
Andreas Schneider
3df0eb527f
Require at least libssh 0.4.0.
2010-02-15 11:55:48 +01:00
Andreas Schneider
7394c19ea1
Update FindLibSSH module to the lastest version.
2010-02-15 11:55:15 +01:00
Andreas Schneider
fdd8236aeb
Migrated sftp module to libssh 0.4.
2010-02-05 12:28:12 +01:00
Andreas Schneider
511635c119
wurst
2010-01-30 00:05:01 +01:00
Andreas Schneider
3ff5ad5f7a
Added more cache entries to the default config.
2010-01-17 08:32:55 +01:00
Andreas Schneider
96822d7f99
Fixed generate_findpackage_file.
2010-01-12 15:43:45 +01:00
Andreas Schneider
a46d5101d7
Fixed build warning.
2009-09-12 14:21:44 +02:00
Andreas Schneider
6c2c86aa50
Fixed build warning.
2009-09-12 12:27:03 +02:00
Andreas Schneider
3a265152d8
Set compiler to c99.
2009-09-12 12:26:09 +02:00
Andreas Schneider
16c76166bd
Improve detection of system libraries.
2009-09-01 12:25:10 +02:00
Andreas Schneider
93acacfa62
Improve FindCheck module.
2009-09-01 12:16:51 +02:00
Andreas Schneider
f33a01216a
Fix FindLog4C.cmake.
2009-09-01 12:16:31 +02:00
Andreas Schneider
14c1366c86
Fix generate_findpackage_file.
2009-09-01 12:16:10 +02:00
Andreas Schneider
b608f782c3
Improve the Log4C module.
2009-09-01 12:08:52 +02:00
Andreas Schneider
6ca27cd6c1
Improve generate_findpackage_file.
2009-09-01 12:01:04 +02:00
Andreas Schneider
d082c8479e
Require at least version 0.3.3 of libssh.
2009-08-25 10:53:58 +02:00
Andreas Schneider
5e282c1fc3
Add an improved FindLibSSH module.
2009-08-25 10:53:33 +02:00
Andreas Schneider
44e9f4fea8
Fix name conflicts with newer libssh versions.
2009-08-25 10:47:12 +02:00
Andreas Schneider
c0671371ce
Don't leak memory using sftp attributes.
2009-08-25 10:44:34 +02:00
Andreas Schneider
200e3e7123
Add missing requirements.
2009-07-09 09:50:37 +02:00
Andreas Schneider
fbf2491406
Ignore all cscope files.
2009-07-09 09:44:50 +02:00
Andreas Schneider
312c40d16f
Improve c_list_find functions.
2009-06-05 11:22:06 +02:00
Andreas Schneider
f98265b30e
Some code cleanups.
2009-06-05 10:51:22 +02:00
Andreas Schneider
92abcf243b
Update to version 0.43.0.
2009-05-25 18:20:06 +02:00
Andreas Schneider
460aa67dca
Document the propagation functions.
2009-05-25 12:58:34 +02:00
Andreas Schneider
778640f1e1
Fix the documentation of the reconciliation.
2009-05-25 12:58:00 +02:00
Andreas Schneider
62b33fbf2d
Fix textwidth.
2009-05-25 11:59:30 +02:00
Andreas Schneider
7c88ed8454
Document Reconcilation.
2009-05-25 11:58:51 +02:00
Andreas Schneider
022731b241
Add a group for update detection functions.
2009-05-25 11:58:31 +02:00
Andreas Schneider
7ab802a3b2
Document update detection functions.
2009-05-25 11:42:46 +02:00
Andreas Schneider
3c05e000f8
Reformat some code in update detection functions.
2009-05-25 11:33:18 +02:00
Andreas Schneider
f57576f08a
Cleanup c_list_insert_sorted().
2009-05-23 11:57:15 +02:00
Andreas Schneider
5dda8fdfa5
Some code reformating.
2009-05-22 20:23:54 +02:00
Andreas Schneider
1d7ce7d5fe
Improve the documentation of csync_excluded().
2009-05-22 20:21:20 +02:00
Andreas Schneider
dd3c9cd99e
Document csync_config_load().
2009-05-22 20:19:06 +02:00
Andreas Schneider
6e893ab31c
Document the return value of c_list_remove().
2009-05-21 11:53:07 +02:00
Andreas Schneider
44b5fd650e
Fix Windows installation paths.
2009-05-14 19:40:33 +02:00
Andreas Schneider
4e462e9762
Fix indent.
2009-05-14 19:38:40 +02:00
Andreas Schneider
32ee0d9610
Add c_rmdirs() check.
2009-05-14 17:27:54 +02:00
Andreas Schneider
f79b291646
Add a c_rmdirs() function.
2009-05-14 17:22:42 +02:00
Andreas Schneider
338370514e
Don't force the build type or we can't overwrite it.
2009-05-14 11:22:38 +02:00
Andreas Schneider
fdea54edc5
Fix the vim modlines.
2009-05-13 10:12:07 +02:00
Andreas Schneider
80de674a84
Improve SQLite3 module.
2009-05-07 17:04:48 +02:00
Andreas Schneider
9586291bd0
Rename FindLog4C.
2009-05-07 17:03:24 +02:00
Andreas Schneider
050b806dc8
Rename FindLibSSH.
2009-05-07 17:00:25 +02:00
Andreas Schneider
df5a8d6662
Add a macro to get the size of an array.
2009-05-06 19:35:21 +02:00
Andreas Schneider
73548e8a16
Merge branch 'master' of git://git.csync.org/projects/csync/csync
2009-04-29 10:08:34 +02:00
Andreas Schneider
e7a495dc50
Fix a segfault in c_uppercase and c_lowercase.
2009-04-29 09:55:32 +02:00
Andreas Schneider
3114e02833
Add tests for c_lowercase and c_uppercase.
2009-04-29 09:55:13 +02:00
Andreas Schneider
9de1f977b5
Cleanup some code of the doubly-linked list.
2009-04-25 10:57:46 +02:00
Andreas Schneider
867a8cb246
Reformat some code.
2009-04-22 13:41:46 +02:00
Andreas Schneider
e7a09af755
Add a function to uppercase and to lowercase a string.
2009-04-21 09:05:40 +02:00
Andreas Schneider
1cb6ae6fca
Fix compilation with latest libssh trunk.
2009-04-12 23:58:29 +02:00
Andreas Schneider
b54e952efe
Add some comments and move log4c config to the end.
2009-04-12 11:33:50 +02:00
Andreas Schneider
9650bccc2f
Add a rolling file appender to the config file.
2009-04-12 11:25:58 +02:00
Andreas Schneider
42014c9a14
Add support for asking the user to add the server to known_hosts.
2009-03-30 15:06:12 +02:00
Andreas Schneider
7d0393338c
Fix possible precedence problems.
2009-03-27 00:00:49 +01:00
Andreas Schneider
5d84518f00
Fix comment typos ;)
2009-03-26 18:23:43 +01:00
Andreas Schneider
fdadbbebab
Rename a variable.
2009-03-26 11:41:10 +01:00
Andreas Schneider
e948cf6880
Document all public functions.
2009-03-26 11:24:34 +01:00
Andreas Schneider
6863ff0255
Switch to libssh 0.3 and add userdata support.
2009-03-26 11:10:37 +01:00
Andreas Schneider
3c618a3d7d
Add possibility to pass userdata to the auth function.
2009-03-26 11:09:46 +01:00
Andreas Schneider
c826f021d6
Improve the version function.
2009-03-26 10:40:16 +01:00
Andreas Schneider
20048b238d
Cosmetic change for a define.
2009-03-26 10:27:04 +01:00
Andreas Schneider
25f83f1764
Cleanup dirname and basename code.
2009-03-18 20:19:37 +01:00
Andreas Schneider
0634e0fdea
Don't require a C++ compiler.
2009-03-18 10:55:14 +01:00
Jim McDonough
7ad9628a24
Fix build with cmake >= 2.6.3. -D does not overwrite FORCE.
...
Signed-off-by: Andreas Schneider <mail@cynapses.org >
2009-03-18 10:15:04 +01:00
Andreas Schneider
d88cffe607
Make the LIB_FOUND variable accessible in CMake.
2009-03-14 11:11:44 +01:00
Andreas Schneider
ff0341855e
Set version for CPack.
2009-02-10 12:54:41 +01:00
Andreas Schneider
467c082368
Set version to 0.42.0.
2009-02-10 12:50:26 +01:00
Andreas Schneider
adb520a3eb
Some bugfixed to the findpackage script.
2009-02-04 14:26:08 +01:00
Andreas Schneider
add8f35bef
Small text improvements.
2009-02-02 10:42:32 +01:00
Andreas Schneider
a18202744d
Change versions to 0.42.0 rc3 and add changelog entries.
2009-01-23 14:44:54 +01:00
Andreas Schneider
dd23c4ecbf
Add some comments.
2009-01-23 14:10:08 +01:00
Andreas Schneider
e69976bc88
Fix a bug where the wrong function for deletion was executed.
...
Thanks to David Wooldridge for all the testing.
2009-01-23 14:07:34 +01:00
Andreas Schneider
cc9a185bba
Use the right variables for config.h.
2009-01-22 15:21:29 +01:00
Andreas Schneider
2331568f08
Fix a segfault if we use a local path.
2009-01-22 15:21:06 +01:00
Andreas Schneider
ecca37d2a1
Normalize the path to <host>/<path> for the statedb filename.
...
This should fix problem if a user uses pam_csync and csync with different
urls (#27 ).
2009-01-22 14:44:06 +01:00
Andreas Schneider
228a19abf4
Add min and max macros.
2009-01-22 14:43:37 +01:00
Andreas Schneider
eca50e32a6
Add more documentation to the userguide.
2009-01-20 18:06:42 +01:00
Andreas Schneider
38807d09c5
Change client option to be more descriptive ( #25 ).
2009-01-20 16:57:27 +01:00
Andreas Schneider
9bab1d5951
Add some text to the README.
2009-01-20 16:52:16 +01:00
Andreas Schneider
c5104e8da3
Rename variable to unix_extensions.
2009-01-19 11:32:58 +01:00
Andreas Schneider
2ffe986dc1
Don't exclude paths.
2009-01-15 23:14:46 +01:00
Andreas Schneider
e0807cba1b
Add a check if we are operating remote on a unix filesystem.
...
This extends the exclude function. Maybe we should do this for the local
too.
2009-01-13 15:50:44 +01:00
Andreas Schneider
e86225db0e
Fix url to sqlite homepage, thanks maxxer.
2009-01-13 15:44:40 +01:00
Andreas Schneider
f95b6c0b6f
Add some comments to the logging config file.
2009-01-08 16:26:11 +01:00
Andreas Schneider
5ae1aaadb7
Fix loading of plugins.
...
The wrong directory was used.
2009-01-08 16:03:31 +01:00
Andreas Schneider
f6a956e248
Set the version numbers for 0.42.0 rc2/gmc.
2009-01-07 13:10:28 +01:00
Andreas Schneider
2d3412b0fa
More improvements to the user guide.
...
Thanks to Jim McDonough <jmcd@samba.org > for this.
2008-12-23 16:48:33 +01:00
Andreas Schneider
a9150e9e2a
Initialize some variables.
2008-12-23 13:54:57 +01:00
Andreas Schneider
69bb51d7af
Some improvement and corrections.
...
Thanks to Joe Brockmeier <zonker@opensuse.org > for proofreading.
2008-12-23 10:26:21 +01:00
Andreas Schneider
0f6a55bb23
Add more test to the userguide.
2008-12-17 18:23:32 +01:00
Andreas Schneider
2a9ac9a91a
Update the manpage to make clear which are debugging options.
2008-12-17 16:53:48 +01:00
Andreas Schneider
6d20c8b4fc
Install the modules to a version directory.
...
The directory version number is the soversion of the library.
2008-12-16 15:03:57 +01:00
Andreas Schneider
9152e25f8f
Fix the format for the inode number in the mprintf.
2008-12-14 18:27:24 +01:00
Andreas Schneider
1047431e4c
Fix a typo.
2008-12-13 23:29:16 +01:00
Andreas Schneider
1c04bb9cb7
Update ChangeLog.
2008-12-05 14:56:20 +01:00
Andreas Schneider
600b8657de
Prepare for 0.42.0 rc1.
2008-12-05 14:51:01 +01:00
Andreas Schneider
cd2b94e20b
Some more documentation.
2008-12-05 14:44:33 +01:00
Andreas Schneider
3b51103a60
Implement own function to create a random filename.
...
This removes an uneeded syscall to lstat by mktemp at this point.
2008-11-13 15:11:02 +01:00
Andreas Schneider
0681db0efe
Reduce system calls of getuid and geteuid.
2008-11-13 14:08:26 +01:00
Andreas Schneider
1e70c74037
Set the replica to destination only once.
2008-11-13 14:06:22 +01:00
Andreas Schneider
d177c57cfe
Check return value of mkdir in the mkdirs functions.
2008-11-13 10:53:24 +01:00
Andreas Schneider
17b39a78c1
Fix open and use the flags variable.
2008-11-12 21:14:35 +01:00
Andreas Schneider
4a2677a539
Add more debug output.
2008-11-05 15:51:18 +01:00
Andreas Schneider
dd52ac837e
Fix libssh connect bug cause of uninitialized port variable.
2008-11-05 15:50:09 +01:00
Andreas Schneider
db9049d198
Add missing line breaks.
2008-11-05 11:12:03 +01:00
Andreas Schneider
50929d6457
Add error message to csync_sftp module.
2008-11-05 10:46:02 +01:00
Andreas Schneider
a825dd3e14
Fix libsmbclient 3.0.x code.
2008-10-29 13:50:04 +01:00
Andreas Schneider
0cb00f266d
Remove unused variable.
2008-09-25 00:56:24 +02:00
Andreas Schneider
646de1261d
Fix a memory leak in the rbtree testcase.
2008-09-22 22:22:45 +02:00
Andreas Schneider
1b4e340565
Fix compiler warnings.
2008-09-11 14:16:04 +02:00
Andreas Schneider
674d062c21
Update the changelog
2008-09-10 11:26:42 +02:00
Andreas Schneider
7f53e66be4
Enable doxygen for developer documentation again.
2008-09-10 10:50:49 +02:00
Andreas Schneider
36d164a338
Fix the installation path of the user guide.
2008-09-10 10:39:43 +02:00
Andreas Schneider
2a532f7f24
Set version to 0.42.0 beta1.
2008-09-09 17:38:59 +02:00
Andreas Schneider
1387904c21
Add NULL check for the auth_cb function.
2008-09-09 15:09:16 +02:00
Andreas Schneider
8b3b57734e
Fix segfault in the modules if running in a pam module.
...
If csync is running in a pam module and the module isn't linked
against the cstdlib, the module segfaults.
2008-09-09 15:07:37 +02:00
Andreas Schneider
0ddd5d9e82
More work on the userguide.
2008-09-05 16:54:48 +02:00
Andreas Schneider
e25422ba3f
Fix the formating not be be longer than 80 chars.
2008-09-05 13:28:30 +02:00
Andreas Schneider
959911fa32
Only build the sftp module if libssh is found.
2008-09-04 16:08:50 +02:00
Andreas Schneider
1b8935a857
Install the userguide.
2008-09-04 10:26:53 +02:00
Andreas Schneider
2bbd66d82c
Add a new line after pkg-config stuff.
2008-09-04 10:26:27 +02:00
Andreas Schneider
1119e84d96
Add user guide.
2008-09-03 13:38:45 +02:00
Andreas Schneider
cd2ab8353d
Add some documentation for the merge algorithm.
2008-09-03 09:49:12 +02:00
Andreas Schneider
f400f1852f
Improve the update detection.
...
Document and fix a problem in getting the phash value.
2008-09-03 09:48:19 +02:00
Andreas Schneider
971e3301e3
Add some comments.
2008-09-02 11:43:29 +02:00
Andreas Schneider
6d3a7d84c1
Fix flags for the statedb tree merger.
2008-09-02 11:42:34 +02:00
Andreas Schneider
8753352e5e
Set errno for expand function of the string list.
2008-09-02 11:23:38 +02:00
Andreas Schneider
b629730fb0
Created a better function to create the file stat.
2008-09-01 14:53:26 +02:00
Andreas Schneider
55c17b6832
Fix build warning.
2008-08-22 15:28:09 +02:00
Andreas Schneider
33681552c7
Remove useless error message.
2008-08-22 15:27:27 +02:00
Andreas Schneider
ebfbcf18a5
Handle no space left on device.
2008-08-22 15:26:02 +02:00
Andreas Schneider
f607dfbefa
Add a basic implemntation for a second sftp module with libssh2.
2008-08-20 18:58:46 +02:00
Andreas Schneider
f059286e48
Update doxygen generation.
2008-08-20 18:58:17 +02:00
Andreas Schneider
56a26d8cd0
Revert "Rename the libssh sftp module to have a backup."
...
This reverts commit 12d8ba2c97 .
2008-08-20 18:48:16 +02:00
Andreas Schneider
c0f7b4546f
Add parse_uri tests.
2008-08-18 09:46:14 +02:00
Andreas Schneider
12d8ba2c97
Rename the libssh sftp module to have a backup.
2008-08-18 09:45:36 +02:00
Andreas Schneider
f984f78198
Use the uri parser of the stdlib.
2008-08-12 15:43:42 +02:00
Andreas Schneider
538d03f94e
Cleanup and reformating of the dirname and basename function.
2008-08-12 15:43:02 +02:00
Andreas Schneider
04d022f2ae
Add a function to parse an uri in stdlib.
2008-08-12 15:37:02 +02:00
Andreas Schneider
b5da50b035
Use the auth callback for ssh kbd interaction.
2008-08-12 15:36:14 +02:00
Andreas Schneider
27800adce5
Fix some visual flaws in the auth callback of the client.
2008-08-12 11:18:24 +02:00
Andreas Schneider
95f4db7c4f
Create a more generic authentication callback.
2008-08-11 13:21:15 +02:00
Andreas Schneider
ae304565af
Added password only flag or auth callback.
2008-08-08 17:28:33 +02:00
Andreas Schneider
4b03d4ff78
Linking against the stdlib isn't needed.
2008-08-08 15:58:18 +02:00
Andreas Schneider
e4fc52188d
Finalize the functions for sftp.
...
The authentication with username/password still doesn't work.
2008-08-08 15:57:19 +02:00
Andreas Schneider
d875c8a6fa
More work on the sftp module.
...
The module doesn't really work, cause the sftp functions don't
set any errno.
2008-08-07 14:24:27 +02:00
Andreas Schneider
ecf1027a54
This is a start for a sftp module.
2008-08-06 18:16:54 +02:00
Andreas Schneider
05253be461
Simplify _readdir function of the smb module.
2008-08-06 18:16:08 +02:00
Andreas Schneider
de86c0ba6b
Add more tests for the virtual io system.
2008-08-06 18:14:34 +02:00
Andreas Schneider
d9432bee61
Add no memory tests to the rbtree testcases.
2008-08-05 11:31:37 +02:00
Andreas Schneider
1315b1197f
Fix a memory leak in the rename test.
2008-08-04 17:21:32 +02:00
Andreas Schneider
fc85165f48
Mark the include dir as advanced too.
...
Thanks to Bernhard Walle.
2008-08-04 10:17:37 +02:00
Andreas Schneider
5853d67855
Use readline. Patch by Bernhard Walle.
2008-08-04 10:13:10 +02:00
Andreas Schneider
1572841ec5
Add a testcase for the update detection.
2008-08-01 15:58:28 +02:00
Andreas Schneider
9722fd0bad
Test if we have a correct path.
2008-08-01 15:57:19 +02:00
Andreas Schneider
ce6896453c
Fix check for CSYNC_NOMEMORY env variable.
2008-07-29 15:43:18 +02:00
Andreas Schneider
7143f20f95
Add memory NULL tests.
2008-07-28 11:49:56 +02:00
Andreas Schneider
bccadc7d67
Fix segfault in str(n)dup function.
2008-07-28 11:49:37 +02:00
Andreas Schneider
33aa3abd96
Add some error log messages.
2008-07-21 14:31:34 +02:00
Andreas Schneider
08eab05c29
Use the GNU version of strerror_r.
2008-07-19 12:03:48 +02:00
Andreas Schneider
8451d29d12
Replace strerror with thread safe version.
2008-07-18 11:35:02 +02:00
Andreas Schneider
7ef568d815
Mark each library as advanced.
2008-07-15 14:06:21 +02:00
Andreas Schneider
e84527ccc8
Add a valgrind suppression file to get rid of 3rdparty errors.
2008-07-10 19:08:24 +02:00
Andreas Schneider
5a7008ae53
Set the right license header in csync.{c,h}.
2008-07-10 10:25:12 +02:00
Andreas Schneider
e5286c7c8a
Rename journal functions to statedb.
2008-07-09 10:10:00 +02:00
Andreas Schneider
88690312d7
Rename the csync_journal files to csync_statedb.
2008-07-09 09:57:19 +02:00
Andreas Schneider
879680cc0c
Add some examples and more documentation to the exclude file.
2008-07-09 09:48:00 +02:00
Andreas Schneider
177bcce3ae
Use -Wextra compiler flag by default.
2008-07-09 09:47:24 +02:00
Andreas Schneider
dc964a4c9a
Only run chmod if we are root.
2008-07-03 11:34:34 +02:00
Andreas Schneider
36ae0468f6
Don't autogenerate manpages for now.
2008-07-03 11:10:12 +02:00
Andreas Schneider
bd36d85aae
Copy the file to the cmake for manpage generation.
2008-07-02 21:00:59 +02:00
Andreas Schneider
1cd21855f2
Improve the manpage, add description and example section.
2008-07-02 20:37:21 +02:00
Andreas Schneider
ea950dc870
Always compile with -fPIC if supported by the compiler.
2008-07-02 20:20:50 +02:00
Andreas Schneider
e1753fbba2
Update changelog.
2008-07-02 19:03:10 +02:00
Andreas Schneider
67efe90536
Add a manpage for the csync commandline client.
2008-07-02 19:02:27 +02:00
Andreas Schneider
f54b36fe7a
Change version to 0.42.0 alpha4 and update ChangeLog.
2008-07-02 10:59:37 +02:00
Andreas Schneider
9a96239e7c
Change the exclude list to match the directories exactly.
2008-06-28 20:46:25 +02:00
Andreas Schneider
262348c7ef
Check if a path is excluded directly in the file tree walker.
...
This improves the performace of the update detection cause it doesn't have
to walk directories which are excluded.
2008-06-28 20:44:54 +02:00
Andreas Schneider
e1b1eaa6d5
Set dirent to NULL do avoid double free corruption.
2008-06-28 19:49:37 +02:00
Andreas Schneider
70ca880a05
Set the right instruction during propagation for the journal.
2008-06-28 17:18:10 +02:00
Andreas Schneider
274c73a929
Add missing instructions.
2008-06-28 17:17:34 +02:00
Andreas Schneider
880530c079
Set instruction by default to NONE.
2008-06-28 17:14:20 +02:00
Andreas Schneider
c79c7bddc8
Implement a safe write on local file system.
...
This means that we try again if we got interrupted.
2008-06-28 15:36:30 +02:00
Andreas Schneider
259319f4f9
Stop synchronization if quota exceeded.
2008-06-28 15:33:52 +02:00
Andreas Schneider
96a933a058
More printf fixes.
...
Add debug output to insert_metadata_visitor to get printf attribute
checking.
2008-06-27 19:24:24 +02:00
Andreas Schneider
5d35a46d07
More printf fixes.
2008-06-27 19:05:54 +02:00
Andreas Schneider
bd8034170a
Fix printf attributes.
2008-06-27 18:52:09 +02:00
Andreas Schneider
d968e6f48d
Add printf attribute checking for gcc.
2008-06-27 18:51:44 +02:00
Andreas Schneider
0a4d1e41e1
Forgotten %llu fix for PPC.
2008-06-27 18:25:34 +02:00
Andreas Schneider
076c7fb819
More code cleanup for PPC.
2008-06-27 18:01:19 +02:00
Andreas Schneider
cde1a6b9cc
Fix segfault on PPC.
...
The phash (uint64_t) needs to be represented as %llu on PPC or it
segfaults.
2008-06-27 18:01:12 +02:00
Andreas Schneider
e9cfa4e610
Remove accidently commited debug message.
2008-06-27 16:12:26 +02:00
Andreas Schneider
f52114e043
Fix typo.
2008-06-25 14:46:01 +02:00
Andreas Schneider
867b8252ad
Update changelog and files for 0.42.0 alpha3.
2008-06-25 13:55:03 +02:00
Andreas Schneider
9934a2842c
Fix disabling the journal in the commandline client.
2008-06-25 13:44:11 +02:00
Andreas Schneider
bcbf4f02f5
Fix debug output and add more output.
2008-06-25 13:43:47 +02:00
Andreas Schneider
e795539137
Create files and directories with a default mode again and run chmod.
...
The chmod function is only called if the file we synchronize has a
different mode set.
2008-06-24 18:02:00 +02:00
Andreas Schneider
75c22fce6c
Improve debug and error messages.
2008-06-24 18:01:43 +02:00
Andreas Schneider
d7d397ab63
Change options of the client.
2008-06-24 17:39:46 +02:00
Andreas Schneider
8aed1cef83
Disable journal completely instead of writing and removing it.
2008-06-24 13:36:47 +02:00
Andreas Schneider
d7309c4ff9
Rename the callback function.
2008-06-24 13:36:27 +02:00
Andreas Schneider
aee15d55ee
Improve debug message.
2008-06-24 13:34:27 +02:00
Andreas Schneider
c4f87bf519
Add missing NULL check.
2008-06-24 11:13:56 +02:00
Andreas Schneider
d9821b9780
Add getter and setter for the journal exists check.
2008-06-24 11:13:17 +02:00
Andreas Schneider
5496d868ca
Restructure code and add some comments.
2008-06-24 10:20:13 +02:00
Andreas Schneider
b73684cc80
Use a static variable for krb5.
2008-06-24 10:19:53 +02:00
Andreas Schneider
4c345d5a80
Allocate memory directly in the module.
...
This fixes a segfault in pam_csync.
2008-06-20 14:39:58 +02:00
Andreas Schneider
cdda179203
Fix kerberos support.
...
libsmbclient calls always the authentication function. So what we have to
do is to try to authenticat with the current credentials.
2008-06-20 14:06:36 +02:00
Andreas Schneider
8f52348315
Improve the authentication calls.
...
Enter will use the old username so you don't have to type it.
2008-06-20 10:10:38 +02:00
Andreas Schneider
4ef93cdf17
Add more debug output.
2008-06-20 10:10:19 +02:00
Andreas Schneider
35284ff09e
Set all smbc options before we call smbc_init.
2008-06-19 16:08:53 +02:00
Andreas Schneider
a6b2a4b47d
Add more debug messages.
2008-06-19 15:36:02 +02:00
Andreas Schneider
0f5541ba9a
Initialize global variables in csync_smb module.
2008-06-19 15:35:41 +02:00
Andreas Schneider
ef6633a130
libsmbclient doesn't provide a chown function so disable it.
...
It would be possible to use smbc_setxattr.
2008-06-19 10:32:59 +02:00
Andreas Schneider
902b588d60
Close the files after copy.
2008-06-18 16:30:00 +02:00
Andreas Schneider
8fa73bb8dd
Temporary fix for Samba cause smbc_chown is missing.
2008-06-18 16:29:14 +02:00
Andreas Schneider
9d6706493e
Add a sysconfdir option to the build script.
2008-06-18 14:14:32 +02:00
Andreas Schneider
183f16c386
Add a function to merge the trees.
...
This is needed to be able to write a complete journal.
2008-06-18 13:16:45 +02:00
Andreas Schneider
5a05f17187
Fix update detection. Don't sync special files.
2008-06-18 11:52:57 +02:00
Andreas Schneider
8f427a8ccb
Set instruction to UPDATED for newly created files.
...
This is needed that csync knows which file stats need to be updated. We
need the new inode number for the journal.
2008-06-18 10:44:40 +02:00
Andreas Schneider
51728fdd25
Rename visitor function to _insert_metadata_visitor.
2008-06-18 10:43:57 +02:00
Andreas Schneider
5824c4ba1e
Add some comments.
2008-06-18 10:43:28 +02:00
Andreas Schneider
7935d63098
Don't add deleted files to the journal.
2008-06-18 09:56:08 +02:00
Andreas Schneider
4246190524
Set O_NOATIME if we are the owner of the file or a superuser.
2008-06-16 17:49:45 +02:00
Andreas Schneider
8a9a4b18fb
Improve debug output if open fails.
2008-06-16 16:42:46 +02:00
Andreas Schneider
0eb0842e0a
Fix return code of open which was always 1.
2008-06-16 16:41:19 +02:00
Andreas Schneider
9c9faebd0e
Fix open on the original file in propagation.
...
O_NOATIME can only be set by the owner of the file or root.
2008-06-16 16:40:25 +02:00
Andreas Schneider
8682bab7f2
Set version string for alpha2.
2008-06-16 14:05:47 +02:00
Andreas Schneider
8b3deb105e
Add a ChangeLog.
2008-06-16 12:27:43 +02:00
Andreas Schneider
262a179c68
Add a strreplace function to stdlib.
2008-06-16 12:12:06 +02:00
Andreas Schneider
72174b6c82
Fix journal query test case.
...
The remote directory must exist for testing.
2008-06-16 11:53:59 +02:00
Andreas Schneider
c24411e5e5
Don't create the remote directory if it doesn't exist.
2008-06-13 18:44:15 +02:00
Andreas Schneider
afa3bd7b80
Fix the exclude list test.
2008-06-13 09:39:17 +02:00
Andreas Schneider
1608edb5cb
Add beagle dir to default exclude list.
2008-06-12 10:15:13 +02:00
Andreas Schneider
3ec18e0746
Load the right exclude file in the user directory.
2008-06-12 09:31:50 +02:00
Andreas Schneider
35d32c045a
Add .snapshot dir to default exclude list.
2008-06-11 18:16:20 +02:00
Andreas Schneider
c1b9dffd12
Remove unused CMake module.
2008-06-09 18:16:46 +02:00
Andreas Schneider
9606865383
Add CPack support for source tarball generation.
2008-06-09 18:14:25 +02:00
Andreas Schneider
914f0e5628
Define _GNU_SOURCE only if not defined.
2008-06-09 17:19:12 +02:00
Andreas Schneider
bac6f7d7b6
Set the right owner and group if possible.
2008-06-09 17:16:44 +02:00
Andreas Schneider
971e85871a
Move count var to the function stack and add O_NOCTTY to open().
2008-06-09 16:44:49 +02:00
Andreas Schneider
7f003c1277
Make sure that we can't run in an infinite loop.
2008-06-06 13:23:42 +02:00
Andreas Schneider
4adb536048
Create the missing directory only in the error case.
2008-06-06 10:28:53 +02:00
Andreas Schneider
212defd763
Create a new temporary file name if the file already exists.
2008-06-06 10:28:44 +02:00
Andreas Schneider
e756830696
Use open and fail if the file already exists.
2008-06-06 10:17:58 +02:00
Andreas Schneider
0e499d0b30
Remove the temporary file if an error occurs.
2008-06-06 10:17:37 +02:00
Andreas Schneider
aec3f4440c
Use a random generated temporary file name.
2008-06-06 10:15:58 +02:00
Andreas Schneider
1255c46668
Add some FIXME's.
2008-06-05 14:44:14 +02:00
Andreas Schneider
ed3073ba13
Move the chmod command before we call utimes.
2008-06-05 14:43:28 +02:00
Andreas Schneider
13f82f25ff
Set the right mode during open.
...
This gives us a speedup about 60 seconds copying the linux kernel sources.
2008-06-05 13:32:23 +02:00
Andreas Schneider
34e59bae46
We shouldn't follow symlinks and don't change the access time.
...
This gives a small speedup of the read command.
2008-06-05 13:31:23 +02:00
Andreas Schneider
e5180d19d4
Only create paths when needed.
2008-06-05 12:02:37 +02:00
Andreas Schneider
364a9015d3
Improve the speed of the push_file function.
...
The stat() calls in mkdirs() slows down the execution of this
function. Now we spend the most time for asprintf().
2008-06-04 18:19:14 +02:00
Andreas Schneider
dddfe5ac79
Disable check for C++ compiler.
2008-06-03 11:00:50 +02:00
Andreas Schneider
4eb9965046
Revert "Improve the check for if we have the same hash really found."
...
This reverts commit 247aaeaacb .
Conflicts:
src/csync_update.c
2008-06-02 18:07:25 +02:00
Andreas Schneider
24d76f3e20
Revert "Improve the check for the inode."
...
This reverts commit 92bf414e4c .
2008-06-02 18:06:17 +02:00
Andreas Schneider
b8aeec4428
Revert "Sync on mtime and ctime changes if possible."
...
This reverts commit 575ca39e8b .
Conflicts:
src/csync_update.c
2008-06-02 18:03:24 +02:00
Andreas Schneider
b5334402b9
Fix the remove-journal paramater and add new functions for it.
2008-06-02 17:02:22 +02:00
Andreas Schneider
057f72471f
Remove non-working function.
2008-06-02 17:01:48 +02:00
Andreas Schneider
5168e3ee70
Change name of the buffersize so that they can't conflict.
2008-06-02 16:05:40 +02:00
Andreas Schneider
e2b049c935
Static functions should all start with an underscore.
...
For better readablity...
2008-06-02 15:11:45 +02:00
Andreas Schneider
2ccbaa05b6
Change version number for alpha1 release.
2008-06-02 12:55:59 +02:00
Andreas Schneider
247aaeaacb
Improve the check for if we have the same hash really found.
2008-05-29 19:05:24 +02:00
Andreas Schneider
92bf414e4c
Improve the check for the inode.
2008-05-29 18:55:49 +02:00
Andreas Schneider
356da661d7
Cleanup after tests.
2008-05-27 15:47:56 +02:00
Andreas Schneider
bbbf5ed13e
Fix the csync_remove_config_dir() function to remove the journal.
2008-05-27 15:46:15 +02:00
Andreas Schneider
64b35453ec
Improve the csync test, use other config dir and delete it.
2008-05-27 14:40:27 +02:00
Andreas Schneider
575ca39e8b
Sync on mtime and ctime changes if possible.
2008-05-27 14:31:57 +02:00
Andreas Schneider
cce81bc154
Use a better name for the status defines.
2008-05-27 14:15:44 +02:00
Andreas Schneider
64a8a911d3
Remove the backup mode bug add a mode to remove the journal.
2008-05-27 14:11:46 +02:00
Andreas Schneider
7921b88467
Don't output on error if we remove a dir and errno is ENOTEMPTY.
2008-05-27 13:51:58 +02:00
Andreas Schneider
158ff9eba5
Create the journal depending on the name of the remote replica.
2008-05-27 13:48:07 +02:00
Andreas Schneider
d5aced82ca
Disable sync of symlinks cause they need a lot of work.
2008-05-26 17:09:42 +02:00
Andreas Schneider
66fd0e2de0
Add basic support for symbolic links.
...
A test to ensure that it is working is still needed.
2008-05-26 15:58:40 +02:00
Andreas Schneider
c16abe8a7b
Add error message in csync_vio_mkdir.
2008-05-21 16:43:08 +02:00
Andreas Schneider
0da1133bdb
Return an error if basename fails on uri in stat command.
2008-05-21 16:06:45 +02:00
Andreas Schneider
3137967714
Add basename and dirname test with a uri.
2008-05-21 16:05:45 +02:00
Andreas Schneider
49e10b7e6a
Add debug message if mkdirs fails.
2008-05-21 15:50:27 +02:00
Andreas Schneider
a46a39ce0e
Fix typo in config and config parser.
2008-05-21 15:22:45 +02:00
Andreas Schneider
2ee63f24aa
Better description for backup mode.
2008-05-21 15:11:26 +02:00
Andreas Schneider
0304353e2e
Merge branch 'master' of git://git.csync.org/csync
2008-05-21 14:47:28 +02:00
Andreas Schneider
d720975617
Fix backup mode.
2008-05-21 14:46:42 +02:00
Andreas Schneider
3da8b33143
Rename the sqlite3 module.
2008-05-20 21:55:57 +02:00
Andreas Schneider
0a6cf13caf
Fix typo.
2008-05-20 19:16:47 +02:00
Andreas Schneider
b1c0cc7f58
Fix variables in sqlite find module.
2008-05-20 19:07:15 +02:00
Andreas Schneider
abba4b5e84
Merge branch 'master' of git://git.csync.org/csync
2008-05-20 19:06:38 +02:00
Andreas Schneider
b7a0983c75
Add backup mode to the client.
2008-05-20 16:33:34 +02:00
Andreas Schneider
465d9f07bc
Add function to remove config dir and improve other getter and setter.
2008-05-20 16:33:03 +02:00
Andreas Schneider
bf9fdfeac0
Check for NULL values.
2008-05-20 16:31:10 +02:00
Andreas Schneider
b68aad2b70
Improve testcase for journal close function.
2008-05-20 16:29:45 +02:00
Andreas Schneider
6601a2e49e
Always remove the temporary journal.
2008-05-20 16:14:14 +02:00
Andreas Schneider
dddb81c5cd
Add the possibility to load an additional exclude file.
2008-05-20 15:50:02 +02:00
Andreas Schneider
891827a48a
Add test with 3 and 5 seconds.
2008-05-20 14:26:37 +02:00
Andreas Schneider
5a77997d55
Rename static functions to start with an underscore.
2008-05-20 14:01:04 +02:00
Andreas Schneider
235b817de0
Add a directory cleanup function to the propagator.
2008-05-20 13:56:43 +02:00
Andreas Schneider
8fe1cb54b5
Add c_list to standard lib header file.
2008-05-20 13:56:19 +02:00
Andreas Schneider
7837076f84
Include the right header file.
2008-05-20 12:08:22 +02:00
Andreas Schneider
8dd91e1e56
Add test for c_list functions.
2008-05-20 12:05:53 +02:00
Andreas Schneider
49c4ad76e1
Add missing NULL test.
2008-05-20 12:05:27 +02:00
Andreas Schneider
b54cb0fd66
Rename c_list_previous to c_list_prev.
2008-05-20 11:24:09 +02:00
Andreas Schneider
679927b5a9
Fix c_list_length() function.
2008-05-20 11:14:16 +02:00
Andreas Schneider
287a37d447
Initialize variables in c_list functions.
2008-05-20 10:19:53 +02:00
Andreas Schneider
6ef53dd1a4
Improve the c_list functions.
2008-05-20 10:08:59 +02:00
Andreas Schneider
9968e364d4
Add doubly-linked list.
2008-05-19 18:09:39 +02:00
Andreas Schneider
4831dd9cd9
Use new function names in csync.c.
2008-05-19 18:07:39 +02:00
Andreas Schneider
55467248a8
Add tests for c_time functions.
2008-05-19 17:31:59 +02:00
Andreas Schneider
c6b2b46710
Move the functions to diff the time to the stdlib.
2008-05-19 17:30:17 +02:00
Andreas Schneider
476fd5d00e
Add a test for csync_vio_mkdirs().
2008-05-19 17:05:39 +02:00
Andreas Schneider
1712447252
Check return values and errno of functions.
2008-05-19 16:29:01 +02:00
Andreas Schneider
05c938b0ae
Fix typo in the build script.
2008-05-19 16:28:34 +02:00
Andreas Schneider
c01d75d026
Split up the propagation visitor in file and dir propagator.
2008-05-19 11:39:11 +02:00
Andreas Schneider
d3f8e4aa7d
Add more functions to the propagation visitor.
2008-05-19 11:30:41 +02:00
Andreas Schneider
c325f7d5e1
Add new file to propagator.
2008-05-19 11:21:44 +02:00
Andreas Schneider
702265920f
Fix csync_push_file.
2008-05-19 11:20:46 +02:00
Andreas Schneider
432c87b335
Fix typo use mkdirs.
2008-05-19 11:20:08 +02:00
Andreas Schneider
e2bc2031cd
Improve error messages.
2008-05-19 11:19:31 +02:00
Andreas Schneider
d68ac512e0
Fix warning and initialize the replica values.
2008-05-19 11:16:51 +02:00
Andreas Schneider
0be9a1e02b
Add reconciler.
...
Currently only new directories are created. Other functions are prepared
bug not tested yet.
2008-05-16 17:30:57 +02:00
Andreas Schneider
84bb336e8e
Add the file size to the file info struct.
2008-05-16 17:30:22 +02:00
Andreas Schneider
cfd587a260
Move the ftw type flags to the csync private header.
2008-05-16 14:12:00 +02:00
Andreas Schneider
43aaa78a18
Add a vio mkdirs function.
2008-05-16 14:11:17 +02:00
Andreas Schneider
08e6be673b
Fixed bug where we remove file which is newer on other replica.
2008-05-15 20:15:17 +02:00
Andreas Schneider
fce3fd8d46
Move debug message to the right position.
2008-05-15 20:09:07 +02:00
Andreas Schneider
6c177c6cff
Fix modtime comparsion should check for smaller modtime.
2008-05-15 20:04:12 +02:00
Andreas Schneider
e85647f2bc
Fix typo.
2008-05-15 20:01:30 +02:00
Andreas Schneider
cf545797a3
Get a more equalent debug output or trace.
2008-05-15 20:00:01 +02:00
Andreas Schneider
0081e44647
Remove accidently commited printf.
2008-05-15 19:51:53 +02:00
Andreas Schneider
f2b1d0d85e
Add some blank lines for readability.
2008-05-15 19:42:03 +02:00
Andreas Schneider
f8ca5c30fd
Fix typo.
2008-05-15 19:41:06 +02:00
Andreas Schneider
1dcb48ad8f
Don't sync equal files.
2008-05-15 19:20:01 +02:00
Andreas Schneider
83fdb412ad
Add more accurate time measurement.
2008-05-15 19:18:41 +02:00
Andreas Schneider
977f5562e4
Improve the debug output a bit.
2008-05-15 17:57:14 +02:00
Andreas Schneider
b08c361527
Use the right mkdir function.
2008-05-15 17:56:51 +02:00
Andreas Schneider
f89333c3c8
Fix unlink of the temporary file to determine the timediff.
2008-05-15 17:26:26 +02:00
Andreas Schneider
db839ef5d3
Try to create remote directory if it doesn't exists or throw an error.
2008-05-15 17:17:48 +02:00
Andreas Schneider
4489fbfa2b
Implement the reconciler.
2008-05-15 13:50:34 +02:00
Andreas Schneider
49543390e2
Fix synchronizer instruction on update detection for changed files.
2008-05-15 12:04:09 +02:00
Andreas Schneider
320f07f631
Show stats on error during update detection too.
2008-05-15 12:03:05 +02:00
Andreas Schneider
92396e614c
Fix testsetup for journal query test.
2008-05-14 13:46:01 +02:00
Andreas Schneider
1cc7c7541d
Fix testsetup for journal query test.
2008-05-14 00:59:43 +02:00
Andreas Schneider
63e823778b
Print error if opendir fails.
2008-05-13 16:06:11 +02:00
Andreas Schneider
4f81a8adc2
Fix typo. Wrong uri was used for remote replica.
2008-05-13 16:05:11 +02:00
Andreas Schneider
1d61cb9a51
Add error if callback ist set after init.
2008-05-13 16:04:29 +02:00
Andreas Schneider
ac8243c445
Fix status check.
2008-05-13 16:04:00 +02:00
Andreas Schneider
711f8ff78d
Fix abort, don't free dirent.
2008-05-13 16:02:59 +02:00
Andreas Schneider
7284461931
Don't segfault if the callback is NULL.
2008-05-13 16:02:24 +02:00
Andreas Schneider
349d924126
Remove unnessesary newlines.
2008-05-13 16:00:57 +02:00
Andreas Schneider
2c8f1fb667
Merge branch 'master' of git://git.csync.org/csync
2008-05-13 13:40:42 +02:00
Andreas Schneider
b13fba29da
Add a text based callback function to the client.
2008-05-13 13:40:06 +02:00
Andreas Schneider
4e6a65ab9d
Use the auth callback in the modules.
2008-05-13 13:39:34 +02:00
Andreas Schneider
e76495a5cc
Add a module auth callback function.
...
This allows the client to create an authentication callback function and
let the module call it. This makes it independent from gui or commandline.
2008-05-13 13:38:03 +02:00
Andreas Schneider
988591491a
Install needed header files.
2008-05-13 13:36:50 +02:00
Andreas Schneider
c5c01998c5
Cleanup comments.
2008-05-09 13:34:46 +02:00
Andreas Schneider
3401972613
Fix build script.
2008-05-09 11:31:03 +02:00
Andreas Schneider
87a2805a91
Fix a build warning.
2008-05-09 11:30:53 +02:00
Andreas Schneider
7f3cba1517
Add missing tests for journal functions.
2008-05-09 11:25:21 +02:00
Andreas Schneider
738bd55231
Add test for c_rbtree_dup().
2008-05-09 11:10:00 +02:00
Andreas Schneider
1b223a355c
Fix build warnings.
2008-05-09 10:57:40 +02:00
Andreas Schneider
917f369e67
Use the dummy module to test csync_init() with module loading.
2008-05-09 10:57:08 +02:00
Andreas Schneider
e6f4a4cf4b
Add a module dummy for testing.
2008-05-09 10:56:38 +02:00
Andreas Schneider
029a6679da
Add journal load and query tests.
2008-05-09 10:00:10 +02:00
Andreas Schneider
364b8038e6
Split up journal tests in test which needs init and just create.
2008-05-09 09:59:26 +02:00
Andreas Schneider
9c245073c0
Split csync tests into two tests.
2008-05-09 09:54:08 +02:00
Andreas Schneider
16ae13d095
Remove standard csync test.
2008-05-09 09:53:48 +02:00
Andreas Schneider
9f887635b2
Add tests for the csync_util functions.
2008-05-09 09:26:12 +02:00
Andreas Schneider
be57b79d6c
Add test for csync_difftime().
2008-05-09 09:25:50 +02:00
Andreas Schneider
9a440d4501
Respect return values in tests.
2008-05-08 17:28:12 +02:00
Andreas Schneider
804e5adee6
Add more warnings.
2008-05-08 16:17:17 +02:00
Andreas Schneider
8fc9e93ee0
Respect return value of fscanf.
2008-05-08 16:16:55 +02:00
Andreas Schneider
393c3ce9db
Initialize variables.
2008-05-08 16:07:15 +02:00
Andreas Schneider
46bedd6285
Remove obsolete definition.
2008-05-08 15:07:32 +02:00
Andreas Schneider
e76c2db9f6
Fix directories for exclude tests.
2008-05-08 10:56:08 +02:00
Andreas Schneider
9dbd938791
Set the default buildtype to RelWithDebInfo.
2008-05-07 15:38:04 +02:00
Andreas Schneider
d0a6e9221b
Fix tests and remove developer mode.
...
This allows to run all tests without the need for a special developer
mode.
2008-05-07 15:33:55 +02:00
Andreas Schneider
c7b77fab5b
Add stackprotector flag and check for fourtify source.
2008-05-07 11:42:45 +02:00
Andreas Schneider
b1f8ab38c9
Fix null termination.
2008-05-07 11:29:48 +02:00
Andreas Schneider
e41e8e1610
Add commandline parsing to all tests.
2008-05-07 11:09:56 +02:00
Andreas Schneider
7b6be113ea
Add commandline options support for testcases.
...
This adds a simple possibility to run the test not in the fork mode.
2008-05-07 10:56:36 +02:00
Andreas Schneider
97c951e531
Use c99 syntax for structs.
2008-05-07 10:55:08 +02:00
Andreas Schneider
c9745ab851
Add csync.time logging category.
2008-05-06 17:48:26 +02:00
Andreas Schneider
014346f2bb
Fix typo.
2008-05-06 15:41:52 +02:00
Andreas Schneider
6af37010cd
Fix a stack smash.
2008-05-06 14:31:36 +02:00
Andreas Schneider
de0a689b12
Fix build script.
...
/bin/bash must be the first line.
2008-05-06 11:18:56 +02:00
Andreas Schneider
1f48d22f24
Add cmake 2.6 compatible FindCheck module.
2008-05-06 11:18:20 +02:00
Andreas Schneider
93df0adc08
Fix bug in generate_findpackage_file script.
2008-05-06 11:17:53 +02:00
Andreas Schneider
a1116b0e00
Add a module to find libdl.so.
2008-05-06 10:54:15 +02:00
Andreas Schneider
fc6a5ce222
Add CMake 2.6 compatible FindSqlite3 module.
2008-05-06 10:53:42 +02:00
Andreas Schneider
7e9cf16825
Fix CMake 2.6 warnings.
2008-05-06 10:51:12 +02:00
Andreas Schneider
c9b34b8aae
Add cmake 2.6 support for generate_findpackage_file.
2008-05-06 10:50:25 +02:00
Andreas Schneider
a472014d8b
Install the client binary.
2008-05-05 17:52:19 +02:00
Andreas Schneider
c08ec25f5b
Add a new version for the sqlite3 find module.
2008-05-05 17:32:11 +02:00
Andreas Schneider
dce6278a1d
Change set right version.
2008-05-05 13:53:07 +02:00
Andreas Schneider
4fb4ff84a8
Add a journal testing mode to the client.
2008-05-05 11:09:16 +02:00
Andreas Schneider
ad67b21062
Use always the same path for testing.
2008-05-05 10:55:05 +02:00
Andreas Schneider
cfe0888771
Initialize the variables and create remote uri.
2008-05-05 10:48:34 +02:00
Andreas Schneider
c318daed7f
Add time difference check to the init function.
2008-05-05 10:48:05 +02:00
Andreas Schneider
20da2351cf
Add function to calculate the time difference between the replicas.
2008-05-05 10:35:38 +02:00
Andreas Schneider
94fbdc1d04
Remove in source iniparser library and require system lib.
2008-05-01 10:01:34 +02:00
Andreas Schneider
5a2fa7f563
Fix a segfault if we don't find an exlcude list.
2008-04-30 16:36:54 +02:00
Andreas Schneider
25e300c462
Implement detection of updates.
2008-04-30 16:24:50 +02:00
Andreas Schneider
b9c3009445
Add function to get file info by hash or inode.
2008-04-30 16:23:42 +02:00
Andreas Schneider
648c93ba7d
Add a function to get a string from an instruction code.
...
This needed for human readable debugging messages.
2008-04-30 16:22:48 +02:00
Andreas Schneider
12764c6778
Call the shutdown function of the plugin before closing.
2008-04-30 13:10:18 +02:00
Andreas Schneider
2fe557af62
Change the debug message.
2008-04-30 13:09:44 +02:00
Andreas Schneider
f1078daa08
Create indexes.
2008-04-30 12:45:03 +02:00
Andreas Schneider
8ffce13e0e
Check return value of result and free it.
2008-04-30 12:44:40 +02:00
Andreas Schneider
f2145a0e92
Fix testcase for insert metadata.
2008-04-30 12:33:18 +02:00
Andreas Schneider
d57b2fed12
Always close the db, sqlite3_close() has to free memory.
2008-04-30 12:32:35 +02:00
Andreas Schneider
ea9819da6c
Add missing log categories.
2008-04-30 10:42:36 +02:00
Andreas Schneider
6ba2a31f04
Add missing tests for journal.
2008-04-30 10:39:23 +02:00
Andreas Schneider
dc5b9853a7
Add missing return value check.
2008-04-30 10:39:08 +02:00
Andreas Schneider
8503dcbb1d
Adapt exclude list for updated csync_exclude.conf.
2008-04-29 15:54:41 +02:00
Andreas Schneider
bb5694ea9b
Add a line to the README :)
2008-04-29 14:32:41 +02:00
Andreas Schneider
997ec6db98
Speedup the journal creation and adapt the testcases.
2008-04-29 14:21:16 +02:00
Andreas Schneider
3df40b205e
Fix return value of csync_journal_load and add sqlite3 optimization.
2008-04-29 14:19:50 +02:00
Andreas Schneider
669c2f8478
Check for the right value in the database.
2008-04-29 14:19:10 +02:00
Andreas Schneider
c502634107
Measure time of the journal creation.
2008-04-29 14:07:18 +02:00
Andreas Schneider
27fb5d9128
Fix several bugs in the journal query function.
2008-04-29 11:42:20 +02:00
Andreas Schneider
cc5c87068e
Write the journal.
2008-04-29 11:22:06 +02:00
Andreas Schneider
f8434dd780
Add function to write and close the journal.
2008-04-29 11:21:43 +02:00
Andreas Schneider
3bf6fc7e82
Fix test to check for status flag.
2008-04-29 11:21:22 +02:00
Andreas Schneider
eadbaa76d5
Use the status flag for the synchronizer.
2008-04-29 11:20:52 +02:00
Andreas Schneider
fb55788e2e
Add support for new libsmbclient interface.
2008-04-29 09:54:29 +02:00
Andreas Schneider
0377c034f6
Check if journal exists to do update detection.
2008-04-29 09:27:49 +02:00
Andreas Schneider
0ff11694e9
Move ignore exclude files and check link count of files.
2008-04-29 09:26:42 +02:00
Andreas Schneider
cc4c636ed4
Add function to create tables in the journal.
2008-04-29 09:24:28 +02:00
Andreas Schneider
98962337c4
Use a struct for the journal.
2008-04-29 09:23:51 +02:00
Andreas Schneider
69a4f9f1c1
Change name of link_count to nlink.
2008-04-29 09:07:30 +02:00
Andreas Schneider
2ea310ab54
Fill stat and add it to the red black tree.
...
Update detection needs still to be done.
2008-04-28 16:50:25 +02:00
Andreas Schneider
fac0ba914f
Print out memory usage between update detection.
2008-04-28 16:49:21 +02:00
Andreas Schneider
48a4ad8400
Add function to print out the status of the memory usage.
2008-04-28 16:47:35 +02:00
Andreas Schneider
ef0f29f561
Add more directories to exclude.
2008-04-28 16:47:09 +02:00
Andreas Schneider
80ee481af3
Add a type field to csync_file_stat.
2008-04-28 14:34:58 +02:00
Andreas Schneider
cf505c38a5
Add uid and gid fields to csync_vio_file_stat.
2008-04-28 14:22:04 +02:00
Andreas Schneider
a1d32a2c8b
Rename pathid to phash and add current replica info.
2008-04-28 14:08:51 +02:00
Andreas Schneider
98efb19509
Set replica types.
2008-04-28 14:08:07 +02:00
Andreas Schneider
c6c6e9cbf0
Create the red-black trees for local and remote replica.
2008-04-28 13:42:10 +02:00
Andreas Schneider
8e815bffad
Check which module we have to load.
2008-04-28 12:40:32 +02:00
Andreas Schneider
bae5bf798a
Remove trailing slashed fo the uris.
2008-04-28 12:35:29 +02:00
Andreas Schneider
745e264f26
Add null pointer check to the c_rbtree_size function.
2008-04-28 12:19:01 +02:00
Andreas Schneider
59ab78ed57
Add instructions and file structure for internal rbtree.
2008-04-28 10:16:31 +02:00
Andreas Schneider
3eeb70ea94
Add replica type to the replica structs.
2008-04-28 10:05:40 +02:00
Andreas Schneider
6d1e843c1a
Restructure csync_vio_file_stat and add checksum field.
2008-04-28 10:03:39 +02:00
Andreas Schneider
e0691bfe4c
Free memory earlier to reduct the calls of free to one.
2008-04-26 21:06:19 +02:00
Andreas Schneider
2d8214aa31
Use better expression for asprintf.
2008-04-26 20:56:46 +02:00
Andreas Schneider
e8b4f4c5e1
Fix memory leak in vio test.
2008-04-26 20:48:12 +02:00
Andreas Schneider
f62366b2ed
Fix typo.
2008-04-26 10:45:38 +02:00
Andreas Schneider
f71aea17a1
Fix a segfault in csync_destroy if a null pointer is passed.
2008-04-26 10:44:37 +02:00
Andreas Schneider
2a53561b2b
Call the tree walker for local system for now.
2008-04-26 10:43:22 +02:00
Andreas Schneider
488b784dcf
Change name of dfs to dirent to be more clear.
...
Add hash testing too for now.
2008-04-26 10:42:20 +02:00
Andreas Schneider
7bb4091787
Define test mode for logging.
2008-04-26 10:13:09 +02:00
Andreas Schneider
6820819c1e
Add a null csync_destroy test.
2008-04-26 10:12:16 +02:00
Andreas Schneider
bc54165b13
Add missing testcases for csync_vio.
2008-04-25 17:13:27 +02:00
Andreas Schneider
0e0317c27e
Fix segfaults if NULL is passed to some functions and set errno.
2008-04-25 17:12:48 +02:00
Andreas Schneider
817dc1c2a4
Add csync_vio_local_close test will NULL.
2008-04-25 17:12:19 +02:00
Andreas Schneider
5a13a0ee5a
Add the missing tests for csync_vio_local.
2008-04-25 16:49:14 +02:00
Andreas Schneider
be53c0762d
Use a pointer in the utimes functions.
2008-04-25 16:48:28 +02:00
Andreas Schneider
17faefbffe
Add test for file functions of csync_vio_local.
2008-04-25 15:10:01 +02:00
Andreas Schneider
1892d73537
Fix segfaults for read, write and lseek and set errno.
2008-04-25 14:36:24 +02:00
Andreas Schneider
ce1debedb6
Add needed include files for flags needed by open.
2008-04-25 11:27:11 +02:00
Andreas Schneider
b59fec14e8
Fix output of non log4c logging.
2008-04-25 11:26:20 +02:00
Andreas Schneider
dd6cc1f83c
Fix a segfault if we try to close a nullpointer.
...
Same local or in the smb plugin.
2008-04-25 10:57:35 +02:00
Andreas Schneider
e6b45181f3
Add the possibility to disable log4c in testcases.
2008-04-25 10:56:23 +02:00
Andreas Schneider
23b40250ef
Fix the exclude list test.
2008-04-24 09:39:20 +02:00
Andreas Schneider
335b97242c
Add some tests for csync_vio_local.
2008-04-23 17:54:53 +02:00
Andreas Schneider
282c915290
Fix a segfault if you pass NULL to closedir.
2008-04-23 17:37:39 +02:00
Andreas Schneider
fcb55722ab
Make the first argument of the hash algorithm const.
2008-04-23 17:36:36 +02:00
Andreas Schneider
f24524dd2a
Fix the default exclude lists.
2008-04-23 17:33:22 +02:00
Andreas Schneider
6d11fbd3c6
Fix remote tree name and free the memory of the replicas.
2008-04-23 13:05:40 +02:00
Andreas Schneider
6a2f1f0add
Add a file tree walker for the update detection.
2008-04-23 12:12:48 +02:00
Andreas Schneider
c281a720b0
Fix the directory handling.
2008-04-23 12:12:02 +02:00
Andreas Schneider
d3c92bbf60
Use the right type for the csync_vio_method_handle_t.
2008-04-23 11:48:17 +02:00
Andreas Schneider
40f21cc369
Don't free a NULL pointer at csync_vio_file_stat_destroy().
2008-04-23 11:47:32 +02:00
Andreas Schneider
dc72b7397c
Add the local and remote uri at creation time.
2008-04-22 17:23:26 +02:00
Andreas Schneider
5a37fd9b6d
Load and shutdown smb plugin for now.
...
This needs to be implemented later.
2008-04-22 15:58:06 +02:00
Andreas Schneider
9a97f52e4f
Add missing vio functions.
...
This is the last step to get the vio framework working.
2008-04-22 12:12:23 +02:00
Andreas Schneider
8b31bb70b7
Fix typo.
2008-04-22 12:09:30 +02:00
Andreas Schneider
26bf60720c
Use the right dhandle type of closedir in vio.
2008-04-22 11:27:04 +02:00
Andreas Schneider
61c4be6c23
Don't initialize the synchronizer in the vio test.
2008-04-22 11:05:16 +02:00
Andreas Schneider
63dddf8f78
Fix memory leak in vio handle test.
2008-04-22 10:46:52 +02:00
Andreas Schneider
8fb079ae60
Add local functions for the vio plugin system.
2008-04-21 14:55:59 +02:00
Andreas Schneider
22513d07f2
Add test for loading the module.
2008-04-21 09:45:55 +02:00
Andreas Schneider
96efd606b0
Add missing parameter to the vio functions.
2008-04-21 09:43:20 +02:00
Andreas Schneider
d2b7c2f0c6
Add vio module loading test.
2008-04-18 19:16:54 +02:00
Andreas Schneider
aa9d97c953
Call the right shutdown function in the module.
2008-04-18 19:15:40 +02:00
Andreas Schneider
4644c39f5a
Implement module init and shutdown functions.
2008-04-17 18:02:41 +02:00
Andreas Schneider
cb14a9aaa5
Fix build warning for shadowed variable.
2008-04-17 15:02:52 +02:00
Andreas Schneider
9c90b113e8
Add config.h to csync_private.h and add plugin_handle.
2008-04-17 14:54:21 +02:00
Andreas Schneider
dca5625249
Fix typos.
2008-04-17 14:45:13 +02:00
Andreas Schneider
396e3b50fa
Change the name of the BLOCK_SIZE field.
2008-04-16 15:02:32 +02:00
Andreas Schneider
0b7dde4934
Complete the smb plugin.
2008-04-16 14:05:13 +02:00
Andreas Schneider
beccc5f1bd
Add missing include file.
2008-04-16 10:57:50 +02:00
Andreas Schneider
c1bd966c5c
Make csync_vio_file_stat functions public.
2008-04-16 10:54:53 +02:00
Andreas Schneider
7bd9c7753d
Add test for csync_vio_file_stat.
2008-04-16 10:32:33 +02:00
Andreas Schneider
ec5d3afea0
Fix warning about shadowed variables.
2008-04-16 10:32:01 +02:00
Andreas Schneider
269f5f5403
Add readdir function and add some debug messages.
2008-04-10 15:46:17 +02:00
Andreas Schneider
c7a3afecfa
Fix a compile warning.
2008-04-10 15:46:01 +02:00
Andreas Schneider
241a38c8f2
Add csync_vio_file_stat functions to (de)allocate memory.
2008-04-10 15:45:23 +02:00
Andreas Schneider
59eff42dc4
Fix includes.
2008-04-10 15:44:41 +02:00
Andreas Schneider
ee657149b1
Change variables to new name.
2008-04-10 14:18:25 +02:00
Andreas Schneider
fd1045f913
Add a strndup function to c_stdlib.
2008-04-10 14:17:36 +02:00
Andreas Schneider
a465f28037
Fix the build.
2008-04-07 18:13:46 +02:00
Andreas Schneider
ab39159607
Add virtual IO plugin system.
...
This is the initial commit of the vio plugin system. The idea is based on
gnomevfs.
2008-04-07 17:16:41 +02:00
Andreas Schneider
3e33f5d52c
Run tests in fork mode.
2008-04-07 17:16:00 +02:00
Andreas Schneider
5ba9432548
Free memory of the exclude list in the csync destroy function.
2008-03-26 11:11:20 +01:00
Andreas Schneider
2e85f56393
Add support for global and user exclude lists.
2008-03-25 16:22:51 +01:00
Andreas Schneider
335d07e0b8
Add a exclude list.
2008-03-25 16:13:44 +01:00
Andreas Schneider
5257f277a4
Config test should run in fork mode.
2008-03-25 16:08:39 +01:00
Andreas Schneider
10ec516dce
The string we add should be const for strlist.
2008-03-25 16:07:58 +01:00
Andreas Schneider
d2c3e0734f
Add exclude config
2008-03-25 16:07:06 +01:00
Andreas Schneider
4e8844f1bb
Use POSIX functions for journal check.
2008-03-20 10:45:05 +01:00
Andreas Schneider
b4811c36bc
Add a stringlist expand function.
2008-03-20 10:34:58 +01:00
Andreas Schneider
1dc975ad9d
Don't leak memory.
...
Found by nightly build on http://testing.csync.org/ .
2008-03-07 11:07:12 +01:00
Andreas Schneider
2e34b51373
Load the config file.
2008-03-06 17:43:58 +01:00
Andreas Schneider
57b74f8ce3
Copy config to the build directory.
2008-03-06 17:42:39 +01:00
Andreas Schneider
17ffc9d1e4
Add developer option to the build script.
2008-03-06 17:41:49 +01:00
Andreas Schneider
2f73648239
Add DEVELOPER options.
...
With this option you can work with the files in the build directory.
2008-03-06 17:41:27 +01:00
Andreas Schneider
2982193ee9
Add a false testcase for csync_journal_check.
2008-03-06 16:59:19 +01:00
Andreas Schneider
7c47d9cb59
Add more test cases for csync_journal functions.
2008-03-04 11:29:58 +01:00
Andreas Schneider
8ee1252276
Fix a deadlock if we pass an empty string to the journal insert.
2008-03-04 11:29:43 +01:00
Andreas Schneider
7415bb1ea3
Add more testcases for csync_journal.
2008-03-04 10:42:02 +01:00
Andreas Schneider
c8b641ac98
Fix build warnings.
2008-03-04 09:01:58 +01:00
Andreas Schneider
a98377dbd4
Fix gcc warnings.
2008-03-03 14:11:14 +01:00
Andreas Schneider
5b858683f5
Add a custom ctest config to ignore the jhash check.
2008-03-03 13:43:12 +01:00
Andreas Schneider
a262be870a
Add a macro to copy a file if it is different.
2008-03-03 13:42:26 +01:00
Andreas Schneider
c394ea1c90
Fix memleaks in rbtree test.
2008-03-03 13:22:36 +01:00
Andreas Schneider
c29132d612
Fix indentation.
2008-03-03 13:20:45 +01:00
Andreas Schneider
0f6516931f
Update CTestConfig for CDash.
...
http://testing.csync.org/
2008-03-03 12:28:58 +01:00
Andreas Schneider
c51ab886e8
Enable unit testing by default in the build script.
2008-03-03 12:28:32 +01:00
Andreas Schneider
5b3f0aad3d
Add option to enable unit testing.
...
Unit testing is disabled by default.
2008-03-03 12:27:52 +01:00
Andreas Schneider
1692ef49ae
Change version to 0.42.
2008-03-03 10:20:31 +01:00
Andreas Schneider
2d52e459bb
Fix a typo and move ensure_out_of_source_build above the macros.
2008-03-03 10:18:59 +01:00
Andreas Schneider
2dbba9d1f8
Document the csync handle and remove the struct forward declaration.
2008-02-29 18:04:51 +01:00
Andreas Schneider
2d0de78d1f
Add missing documentation for the public API.
2008-02-29 17:57:49 +01:00
Andreas Schneider
6900fe13b9
Add license file.
2008-02-29 17:50:52 +01:00
Andreas Schneider
ff7e28f82c
Completly hide the csync structure for the user of the library.
...
So it easier to change the API/ABI.
2008-02-29 11:41:15 +01:00
Andreas Schneider
600fbe8740
Add two-phase commit for the journal.
2008-02-29 11:24:14 +01:00
Andreas Schneider
b00a3fa491
Add sqlite3 to the requriements and suggest version numbers.
2008-02-28 14:30:06 +01:00
Andreas Schneider
4f109c4460
Add a gitignore file
2008-02-28 11:56:09 +01:00
Andreas Schneider
1b29a420bc
Initial commit
2008-02-27 18:56:47 +01:00