Klaas Freitag
38ef525d5e
Push version to final 1.8.0
2015-03-16 15:28:58 +01:00
Jenkins for ownCloud
367b1fcc33
[tx-robot] updated from transifex
2015-03-16 02:18:44 -04:00
Jenkins for ownCloud
f5c930968e
[tx-robot] updated from transifex
2015-03-14 02:18:44 -04:00
Jocelyn Turcotte
5264a8c7f6
shell_integration: Fix disappearing context menus on Windows #2898
...
Since each new connection to the socket API would trigger a broadcast
of REGISTER_PATH to all existing connections, opening the context menu
would trigger a SHChangeNotify call of the root directory through
the overlay icon extension, which is currently also connected to the
socket API, waiting for changes.
Fix the issue by sending the initial REGISTER_PATH automatic response
only to the connecting socket.
2015-03-13 20:53:59 +01:00
Markus Goetz
6c4b7f1479
OS X: Always return 0 from pre_install.sh
2015-03-13 16:35:44 +01:00
Markus Goetz
c42c9f0002
Propagator: Add comment
2015-03-13 15:48:35 +01:00
Christian Kamm
95f299f865
Remote folder wizard: Add optional manual entry #2613
2015-03-13 09:52:21 +01:00
Jenkins for ownCloud
09749e2c7f
[tx-robot] updated from transifex
2015-03-13 02:18:46 -04:00
Carla Schroder
dc33784a76
spelling corrections
2015-03-12 09:48:00 -07:00
Carla Schroder
961df1fc44
fix server side permissions table
2015-03-12 09:46:27 -07:00
Jocelyn Turcotte
e93c1ccb73
Install the crash handler earlier during startup
...
This moves the crash handler installation during the OCC::Application
contruction. This still leaves a window where crashes wouldn't be
caught, leaving the QtSingleApplication and theme initialization
code unreported, but isn't requiring any refactoring for now.
Issue #2952
2015-03-12 17:16:05 +01:00
Klaas Freitag
286ad0c478
Doc: Formatting fixes
2015-03-12 16:59:12 +01:00
Klaas Freitag
e30970ff90
Some ChangeLog corrections.
2015-03-12 16:49:41 +01:00
Daniel Molkentin
14e0e4a072
Win32: More reserved file names to ignore, including Recycle Bin
...
Addresses #2955
2015-03-12 16:25:32 +01:00
Jocelyn Turcotte
60da0a15e6
shell_integration: Remove the incorrect usage of the MIIM_BITMAP flag
...
This flag should only be specified if the hbmpItem member of the
MENUITEMINFO has been set.
2015-03-12 15:22:29 +01:00
Jocelyn Turcotte
0f84510e6f
Fix the build with GCC 4.7
...
Disable bitfields completely in SyncFileItem with that compiler.
2015-03-12 14:54:11 +01:00
Christian Kamm
1dd3488973
Uploads: Fix big seeks on Windows. #2954
2015-03-12 13:18:08 +01:00
Klaas Freitag
12e5306947
Set version postfix to rc1
2015-03-12 11:21:23 +01:00
Christian Kamm
9249d6c2f9
Logging: Print instruction when job completed.
2015-03-12 10:26:44 +01:00
Christian Kamm
d0f07ee3a9
FolderMan: fix folderSyncStateChange emission. #2896
...
It was not emitted when a removed folder finished its sync,
and that left the UI in an old state sometimes.
Removing the Folder explicitly is unnecessary as a QSignalMapper
will automatically remove mappings for deleted QObjects.
2015-03-12 10:00:45 +01:00
Christian Kamm
3992fba168
Activity: Set a message for conflicts. #2792
...
Also show size when conflicting files are downloaded.
2015-03-12 10:00:45 +01:00
Daniel Molkentin
4601ac8b0e
Remove unused (and partly binary!) NSIS artifacts
2015-03-12 09:29:48 +01:00
Jenkins for ownCloud
a81b0db2a8
[tx-robot] updated from transifex
2015-03-12 02:18:36 -04:00
Jocelyn Turcotte
d88751bb8b
shell_integrations: Fix the precompiled headers usage in OCUtil
...
Enable it in all configurations and add the missing include.
2015-03-11 22:17:46 +01:00
Markus Goetz
f13dfc19a0
OS X: Fix UI glitches related to sync folder
...
For #2113 and #2947
2015-03-11 16:42:12 +01:00
Jocelyn Turcotte
0fccf5e50d
Completely disable the crash handler if the user disabled it
...
The config currently only disable the reporter, but still leaves
the crash handler installed on startup. This causes conflicts
when running those builds in lldb.
Work around the issue by requiring the crash reporter to be
disabled in the settings before owncloud can be run in lldb.
This has the negative side-effect of not covering the
initial ConfigFile loading with the crash handler.
Issue #2946
2015-03-11 15:49:49 +01:00
Klaas Freitag
a2aab28ba6
ShareDialog: Connect the proper DateEdit signal.
2015-03-11 15:46:05 +01:00
Klaas Freitag
8e7b7caf04
ShareDialog: If the password is empty, disable button
2015-03-11 14:57:55 +01:00
Klaas Freitag
8cc5ff0e70
ShareDialog: Consider if resharing is not allowed on a share.
...
If a file or directory is shared without resharing permission, the
share dialog displays an error. This is not the optimal solution, but
best for now, as we do not have the permissions available for the file
manager plugin.
This fixes #2923
2015-03-11 14:12:08 +01:00
Klaas Freitag
9086f09fe2
SocketAPI: If filename has a trailing slash, remove it.
...
The SyncJournal stores the the names of directories without trailing slash.
2015-03-11 14:11:18 +01:00
Klaas Freitag
5a6eecd694
doc: Added snippet about custom WebDAV properties.
2015-03-11 14:11:18 +01:00
Christian Kamm
efe9f1b442
Lnk: Work around QFile::rename() #2792
...
QFile::rename() fails if the source file is a shortcut to a file
or directory that does not exist.
2015-03-11 12:29:33 +01:00
Jocelyn Turcotte
db7919dc2f
Shrink sizeof(SyncFileItem) by 20%
...
Move all small fields together in the struct and make them use bitfields.
Also remove the unused log::_other_remotePerm field.
2015-03-11 11:49:11 +01:00
Olivier Goffart
4a01644625
Disable parallel uploads for server versions <= 8.0.2
...
Issue #2938
2015-03-11 11:31:51 +01:00
Jenkins for ownCloud
1ca68140f6
[tx-robot] updated from transifex
2015-03-11 02:18:42 -04:00
Klaas Freitag
071177cee2
Output a more sensible error message for auth errors
2015-03-10 12:14:14 +01:00
Klaas Freitag
c88742fad3
Revert "SetupW: Display proper error messages if password or user was wrong."
...
This reverts commit 396f38598f .
This adds redundant code and potentially breaks Shibboleth
2015-03-10 11:17:35 +01:00
Jenkins for ownCloud
791a0fd01e
[tx-robot] updated from transifex
2015-03-10 02:18:50 -04:00
Markus Goetz
3b12b9d81d
Revert "Propagator: Delete job on finish"
...
Needs a bit more thinking.
This reverts commit 8746914f3b .
2015-03-09 16:19:16 +01:00
Markus Goetz
31e4009737
Propagator: Use QBA for responseTimestamp instead of QString
2015-03-09 15:52:52 +01:00
Markus Goetz
8746914f3b
Propagator: Delete job on finish
2015-03-09 15:41:43 +01:00
Klaas Freitag
2fa6839ac7
Make win32 build work again.
2015-03-09 15:14:55 +01:00
Klaas Freitag
b09e08c06f
ShareDialog: Made it less "webbish" for better usability.
...
- Check the share checkbox automatically on open of the dialog
- Use the date picker with popping up calendar
- Proper initial size
- no resizing and appearing and disappearing.
Fixes probably #2917 , also #2764
2015-03-09 14:33:02 +01:00
Jenkins for ownCloud
659f5ad301
[tx-robot] updated from transifex
2015-03-09 02:18:47 -04:00
Jenkins for ownCloud
6fe7f01a8d
[tx-robot] updated from transifex
2015-03-07 02:18:24 -05:00
Jocelyn Turcotte
99f51998f2
Fix a crash in the crash reporter on OSX
...
The install_name of dependent libraries need to be updated
like we do for cmd and gui.
2015-03-06 19:28:53 +01:00
Jocelyn Turcotte
4c13992f5d
Add a gen_sym_files script for OSX
...
This attempts to replicate what i686-w64-mingw32-gen_sym_files
is doing for us with MinGW by parsing the output of otool -L
to get the library name actually used by the executable.
2015-03-06 19:28:53 +01:00
Klaas Freitag
396f38598f
SetupW: Display proper error messages if password or user was wrong.
...
If the password or user was wrong during setup, the client showed a
ConnectionClosed error instead of a proper Username or password wrong
message. This was because in HTTPCredentials::slotAuthentication, the
reply is closed, and a property is set to indicate the auth problem.
This patch now checks at all occurences of networkErrors if it might
have been an authentication problem, and displays something useful.
There is a good chance that this is a sufficient fix for
owncloud/enterprise#556
2015-03-06 16:41:59 +01:00
Klaas Freitag
b6e24cbd45
Push version to beta3
2015-03-06 16:41:59 +01:00
Klaas Freitag
d2848b9c26
Theme: Return the correct version string from version()
2015-03-06 16:41:59 +01:00
Daniel Molkentin
227ed8ae07
win32: libproxy is not needed
2015-03-06 15:47:15 +01:00
Markus Goetz
b622981b23
SyncEngine: Show a debug msg only when relevant
2015-03-06 09:28:50 +01:00
Jenkins for ownCloud
36e14cfc69
[tx-robot] updated from transifex
2015-03-06 02:18:35 -05:00
Markus Goetz
668de9bf31
Propagate: Don't retry direct download on abort
2015-03-05 21:56:39 +01:00
Markus Goetz
3f712dce02
ETags: For Folder and RequestEtagJob, always use Concatenation
2015-03-05 17:49:12 +01:00
Markus Goetz
2eaeaf33fa
Discovery: Change abort code a bit
...
Now pressing pause in the UI will not show an error to the user.
2015-03-05 16:50:33 +01:00
Jenkins for ownCloud
8e21d612d8
[tx-robot] updated from transifex
2015-03-05 02:18:52 -05:00
Klaas Freitag
398bca9fe4
Add OWNCLOUDSYNC_EXPORT prefix to make windows build.
2015-03-04 13:50:55 +01:00
Klaas Freitag
07e60b9161
Bump version to 1.8.0 beta2.
2015-03-04 12:29:17 +01:00
Olivier Goffart
46d5d22f72
PropagateUpload: also read the OC-ErrorString header from the poll job
2015-03-04 12:01:41 +01:00
Olivier Goffart
97c221d860
PropagateUpload: add a few comments
2015-03-04 12:00:55 +01:00
Jocelyn Turcotte
a5d29e6d56
Fix missing symbols on XP
...
Import a fix from libcrashreporter-qt that should remove
usage of symbols not available in XP's msvcrt.dll
This should help solving #2907 with the crash reporter enabled.
2015-03-04 09:51:54 +01:00
Jenkins for ownCloud
4662f59577
[tx-robot] updated from transifex
2015-03-04 02:18:30 -05:00
Markus Goetz
131cf63d8d
Propagator: Don't use 0,0 progress signals.
...
They seemed to have messed up the calculation sometimes for
the last chunk.
2015-03-03 17:46:57 +01:00
Olivier Goffart
4d85f1daec
setup wizard: use a PROPFIND instead of a GET on the webdav url
...
In order to initiate the conneciton, we should not send a GET on the
webdav URL because that is not a valid webdav command on a collection.
Issue #2911
2015-03-03 16:03:53 +01:00
Klaas Freitag
f913cd97ee
DiscoveryJob: Fix progress display.
...
This fixes #2909
2015-03-03 16:01:17 +01:00
Olivier Goffart
ccbeb86140
Fix build of the legacy propagator
2015-03-03 10:05:38 +01:00
Olivier Goffart
b43e0f5ebd
Do not ask for the password when the check server job times up
...
QNetworkReply::OperationCanceledError may be both because of anthentication
error (because the HTTPCredentials abort the reply) or because of a timeout
(the timer abort the reply). We should only ask for the password if the
reply was canceled because the password was wrong.
2015-03-03 09:21:24 +01:00
Jenkins for ownCloud
b3c82fd7b6
[tx-robot] updated from transifex
2015-03-03 02:18:28 -05:00
Jenkins for ownCloud
15a60bb359
[tx-robot] updated from transifex
2015-03-03 01:15:17 -05:00
Markus Goetz
fe574dbbf9
Discovery: Free some memory before propagate ( #2902 )
2015-03-02 15:08:21 +01:00
Markus Goetz
7595c7e697
Discovery: Free some memory on VIO dir close ( #2902 )
2015-03-02 14:09:01 +01:00
Olivier Goffart
bd6769a3fd
LsColJob: one must now specify the properties
...
So the discovery phase don't ask for the quota, and the selective sync
don't ask for all the other properties
Issue #2906
2015-03-02 11:03:25 +01:00
Jenkins for ownCloud
dc2a919e75
[tx-robot] updated from transifex
2015-03-01 02:18:29 -05:00
Jenkins for ownCloud
c20fc24f4d
[tx-robot] updated from transifex
2015-02-28 02:18:39 -05:00
Daniel Molkentin
5f8af4527e
Update Windows cross build instructions for 1.8
2015-02-27 17:13:14 +01:00
Markus Goetz
80f3c7584b
libowncloudsync: Don't link to Qt SQL and Qt XML
...
For issue #2901 ..
2015-02-27 16:20:25 +01:00
Klaas Freitag
05624e3fc8
FileSystem: Remove QFileInfo based implementations.
...
QFileInfo has to be refreshed if the underlying file has been
modified in between. That is dangerous so ckamm and me decided
to eliminate the QFileInfo based implementations.
This was triggered by a bug that the client uploaded files that
it should not have.
2015-02-27 15:27:49 +01:00
Christian Kamm
e381143a8f
Ensure good sync state if in-progress folder is deleted. #2896
...
The slotFolderSyncFinished() didn't reliably trigger because
the folder was being deleted before the syncFinished signal could
fire.
2015-02-27 12:39:19 +01:00
Christian Kamm
b03209ccef
Inform user about ignored long files. #2882
2015-02-27 12:12:39 +01:00
Markus Goetz
ec03ebd69f
Token Auth: Allow empty token
...
Just username/password. The received token will automatically be stored
inside the QNetworkCookieJar.
2015-02-27 11:58:18 +01:00
Daniel Molkentin
ff68caac24
Merge pull request #2900 from rullzer/qt-4.8-fix
...
static member QFileInfo::exists is not available on 4.8
2015-02-27 08:56:40 +01:00
Roeland Jago Douma
51c617801d
static member QFileInfo::exists is not available on 4.8
2015-02-27 08:43:33 +01:00
Jenkins for ownCloud
e53290088f
[tx-robot] updated from transifex
2015-02-27 02:18:29 -05:00
Klaas Freitag
4f7c062f3f
csync_exclude: Ignore files where the filename length is > 254 chars.
...
This is for example HFS+ and others. It fixes #2882
2015-02-26 17:09:49 +01:00
Klaas Freitag
8507aba9f8
SocketAPI: Append trailing slash for directories in UPDATE_VIEW.
...
This fixes #2233
2015-02-26 16:41:55 +01:00
Olivier Goffart
d8b6e00fe7
Propagator: Let network propagator job understand a new header OC-ErrorString
...
This allows the server to send a readable error string in many cases
2015-02-26 15:53:09 +01:00
Christian Kamm
c8167b77c9
Remove mention of allprop #2865
2015-02-26 12:36:11 +01:00
Christian Kamm
c37792f58f
Propagator: Upload files with future timestamps. #2880
2015-02-26 11:00:06 +01:00
Christian Kamm
842e5ba5e0
Sharing: Fix for folders containing &. #2892
2015-02-26 09:58:09 +01:00
Jenkins for ownCloud
10d28292c6
[tx-robot] updated from transifex
2015-02-26 02:18:35 -05:00
Klaas Freitag
506cc3908a
Add proper copyright headers to some files, fixes #2869
2015-02-25 17:00:27 +01:00
Klaas Freitag
ca00b02b0a
ShareDialog: Improve some GUI, fix #2850
...
This improves some wording and fixes some show/hide issues with password
setting.
2015-02-25 13:44:27 +01:00
Klaas Freitag
201075827f
Sharedialog: Add a Share button.
2015-02-25 13:44:27 +01:00
Daniel Molkentin
961623d388
Crash Reporter: fix submit URL
2015-02-25 12:33:16 +01:00
Jocelyn Turcotte
a98ab6f51d
shell_integration: Remove OwnCloud from public strings on OSX
...
Also removed it from commented out logs just in case.
2015-02-25 12:13:28 +01:00
Christian Kamm
5c7fd24ea8
Handle 503 due to maintenance more gracefully. #2884
2015-02-25 12:02:10 +01:00
Christian Kamm
76ac628153
Discovery: Distinguish 503 Storage not available. #2884
2015-02-25 12:02:10 +01:00
Christian Kamm
6f71bd9353
SocketAPI: Don't mark .lnk files as ignored on windows. #2447
2015-02-25 11:55:48 +01:00
Christian Kamm
f88398e776
lnk files: Fix exists() calls. #2792
2015-02-25 11:50:32 +01:00
Jenkins for ownCloud
ed315f54e3
[tx-robot] updated from transifex
2015-02-25 02:18:31 -05:00
Christian Kamm
08c33cd1dc
Discovery: Fix handling of 503 on a folder. #2884
2015-02-25 08:09:07 +01:00
Christian Kamm
0464947610
Remove extra ; to silence warning.
2015-02-25 07:14:05 +01:00
Klaas Freitag
1929040bb7
Discovery: Preserve the error message.
2015-02-24 22:02:31 +01:00
Klaas Freitag
3af936c8a1
Some minor cleanups.
2015-02-24 22:02:29 +01:00
Jenkins for ownCloud
3bd48c1b3f
[tx-robot] updated from transifex
2015-02-24 02:18:32 -05:00
Jenkins for ownCloud
298ca552c8
[tx-robot] updated from transifex
2015-02-24 01:15:20 -05:00
Jenkins for ownCloud
5dcc6a16ee
[tx-robot] updated from transifex
2015-02-23 02:18:25 -05:00
Jenkins for ownCloud
318b858ce6
[tx-robot] updated from transifex
2015-02-22 02:18:23 -05:00
Jenkins for ownCloud
6c09764b35
[tx-robot] updated from transifex
2015-02-22 01:15:16 -05:00
Jenkins for ownCloud
96501322fa
[tx-robot] updated from transifex
2015-02-21 02:18:23 -05:00
Jenkins for ownCloud
b1e9a74cc2
[tx-robot] updated from transifex
2015-02-21 01:15:14 -05:00
Daniel Molkentin
f38aa698eb
Don't translate dummy strings
2015-02-20 10:12:31 +01:00
Daniel Molkentin
366f3f68b8
Activity view: Always add date
...
Fixes #2223
2015-02-20 10:12:19 +01:00
Olivier Goffart
276dd50650
Update GetGitRevisionDescription.cmake
...
From https://github.com/rpavlik/cmake-modules
2015-02-20 10:11:30 +01:00
Jenkins for ownCloud
defd6180c6
[tx-robot] updated from transifex
2015-02-20 02:18:35 -05:00
Jocelyn Turcotte
03e23da6a3
Show the settings also when no arguments are passed
...
sendMessage would only be called if there were options to
be sent to the running application.
Fix the issue by having explicitly named messages and always
send the show settings message.
Issue #2374
2015-02-19 16:57:16 +01:00
Jocelyn Turcotte
2ddaf5a06a
Add a NO_MSG_HANDLER cmake option
...
This allows QDebug to output to stdout or OutputDebugString
to ease development.
2015-02-19 16:57:16 +01:00
Olivier Goffart
5e1aa7d383
SyncEngine: Fix move would re-upload the file
...
Because SyncJournalDb::postSyncCleanup was deleting the entries in the database
2015-02-19 15:00:37 +01:00
Olivier Goffart
e1871eb325
libsync: Fix qWarning in SyncEngine::slotJobCompleted saying we cannot find the sync item when moving
...
We need to compare against the original file name, that's why it's there
2015-02-19 13:13:45 +01:00
Olivier Goffart
66fc8e9e27
Merge branch 'master' into 1.8
2015-02-19 11:32:16 +01:00
Jenkins for ownCloud
3259cf59f5
[tx-robot] updated from transifex
2015-02-19 02:19:25 -05:00
Jocelyn Turcotte
c6442f67c1
shell_integration: Fix a crash on explorer startup
...
There is a race condition that can initialize the RemotePathChecker
instance concurrently on the same address and cause a crash when locking
the mutex. The reason is that local static initialization is not
thread-safe with MSVC2013.
Fix the issue by using call_once to initialize a static unique_ptr
instead.
This could be related to some reports of issue #2836 .
2015-02-18 17:33:46 +01:00
Olivier Goffart
1998b602b9
SyncEngine: better merge of the renames node
...
The same file is on the two sync trees under different names in case of a rename
We must therefore use the rename target as the key in the _syncItemMap to ensure
that the trees are correctly merged.
Also use the same UTF-8 decoding for the target than for the actual file in order
to catch invalid utf-8 in the rename target
2015-02-18 12:41:06 +01:00
Olivier Goffart
193fca4a8b
SyncFileItem::operator<: must return false when two items are equal
...
Fixes #2852
2015-02-18 12:41:06 +01:00
Jenkins for ownCloud
9659d0bdc7
[tx-robot] updated from transifex
2015-02-18 02:18:34 -05:00
Jocelyn Turcotte
ccf4298c81
shell_integration: Cleanup our uses of NSLog
...
Remove info messages and make sure that error messages
have an OwnCloud prefix since they will be reported by
Finder's process.
2015-02-17 18:23:30 +01:00
Jocelyn Turcotte
0b461e2275
shell_integration: Fix the overlay icons in the column view
...
Based on 79a713ea643e13e95f52bfe2adbbaf4a5ca92f8a in upstream liferay-nativity.
2015-02-17 18:20:16 +01:00
Jocelyn Turcotte
4f4ae5861a
Enable c++11 regardless of the compiler detection
...
CMake is using "c++" as the compiler and the clang detection fails.
Since we require C++11 at this point, enable it in all cases.
Removed the MSVC todos since we don't plan supporting it yet.
2015-02-17 18:20:15 +01:00
Daniel Molkentin
fedf368c7a
Merge pull request #2849 from owncloud/nsis_shortcuts_all_users
...
Install shortcuts for all users
2015-02-17 18:13:11 +01:00
Daniel Molkentin
c5f78fab51
Make NSIS installer with /S fully silent
...
Addresses #2006
2015-02-17 17:59:14 +01:00
Daniel Molkentin
56a907128a
Install shortcuts for all users
...
Implements #2413
2015-02-17 17:17:39 +01:00
Olivier Goffart
fb77cd5f7e
SyncEngine: Fix detection of the server reconfiguration
...
Some files might be kept (like the default files)
The files should be considered as NONE only if they are NONE on both trees
issue #2847
2015-02-17 16:44:13 +01:00
Daniel Molkentin
99d674c346
Default shiboolethwebview to 900x700, remember last size
...
Also add host to the title
Addresses #2285
2015-02-17 15:28:14 +01:00
Daniel Molkentin
9690ca0198
Explain the "crash now" button to translators
2015-02-17 14:03:09 +01:00
Olivier Goffart
9351c7485f
Try another way to fix the build
2015-02-17 14:04:16 +01:00
Olivier Goffart
d43b82dc82
Fix compilation with clang
...
The compilation error was
account.h:140:113: error: expected ')'
const QList< QPair<QString, QString> > &queryItems = QList< QPair<QString, QString> >());
^
followed by more errors.
The problem is because the compiler has hard time disambiguiating the comma
int foo(const QPair<int, int> &p = QPair<int, int>());
^
It is indeed quite hard for the compiler to know if this comma is a separation
between complate arguments or the separation between arguments of the functions.
Use the C++11 construct instead which does not need commas
2015-02-17 11:09:45 +01:00
Olivier Goffart
ce195bd599
SyncEngine: add an getter to the journal
2015-02-17 11:08:16 +01:00
Olivier Goffart
c0c8a22fa3
SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate
...
That way, users of the library can change the contents of the sync item vector.
2015-02-17 11:08:16 +01:00
Jenkins for ownCloud
93717c95fb
[tx-robot] updated from transifex
2015-02-17 02:18:24 -05:00
Jocelyn Turcotte
a955defae5
Raise the share window to make sure that the user sees it
2015-02-16 16:47:00 +01:00
Jocelyn Turcotte
9579102541
shell_integration: Generate a .pdb in Release for OCContextMenu_x64.dll
2015-02-16 16:47:00 +01:00
Daniel Molkentin
2423aa592f
Add new icons by Jan
2015-02-16 14:47:32 +01:00
Olivier Goffart
151228b2a6
Fix build when compiling libsync without QtGui
...
Utility must stay QtGui-free, move the hidpiFileName to the theme which
is the only part in libsync which uses it, and already has #ifdefs
2015-02-16 10:24:42 +01:00
Jenkins for ownCloud
025d74bbcd
[tx-robot] updated from transifex
2015-02-16 02:18:23 -05:00
Jenkins for ownCloud
7626478165
[tx-robot] updated from transifex
2015-02-15 02:18:23 -05:00
Daniel Molkentin
3dea1eb173
Merge pull request #2785 from owncloud/typos
...
some typos, grammar and sentence fixes
2015-02-14 23:56:10 +01:00
Volkan Gezer
bd4f68233f
some typos, grammar and sentence fixes
2015-02-14 23:47:07 +01:00
Olivier Goffart
d6bdbf9f34
Logger: use qFormatLogMessage with Qt 5.4 so it respects the Qt logging preferences
2015-02-14 14:23:01 +01:00
Jenkins for ownCloud
2ccfb8671e
[tx-robot] updated from transifex
2015-02-14 02:18:27 -05:00
Olivier Goffart
04bb67ef45
Fix Qt4 build
...
The automatic registration of metatype only came with qt5
2015-02-13 21:41:09 +01:00
Jocelyn Turcotte
4b67429234
shell_integration: Wait longer for the Share menu title
...
50ms is sometimes not enough when the client is busy synchronizing.
Wait up to 500ms for the client to answer before we give up and show an
empty menu title.
Ideally we should request the title before the watched directory list, but
the list is currently sent implicitly on connect.
2015-02-13 17:18:39 +01:00
Jocelyn Turcotte
23e248b5d1
shell_integration: Fetch the share menu title from the client on Windows
...
The context menu will now show "Share with ownCloud" instead of "Share" as
it does on other platforms.
This also updates the submodule to point to matching binaries.
2015-02-13 16:08:39 +01:00
Christian Kamm
40dbc78407
concatUrl: Remove manual parsing, add test. #2817
2015-02-13 14:53:55 +01:00
Klaas Freitag
b159018f51
Changelog edited for 1.8.0
2015-02-13 12:54:27 +01:00
Klaas Freitag
17570acab2
Bump version to 1.8.0beta1
2015-02-13 11:57:05 +01:00
Klaas Freitag
4710609cb9
Tests: Removed C++11 Hokuspokus to not confuse and kill elderly compilers.
2015-02-13 11:07:53 +01:00
Klaas Freitag
d297580d26
Tests: Fix compile if NEON is absent.
2015-02-13 10:04:28 +01:00
Jenkins for ownCloud
b50f1d0318
[tx-robot] updated from transifex
2015-02-13 02:18:28 -05:00
Daniel Molkentin
957c9f060d
GeneralSettings: Add OpenSSL version number to about text
2015-02-12 23:23:47 +01:00
Daniel Molkentin
0bf0bab1eb
One more Qt4 compile fix
2015-02-12 22:13:58 +01:00
Olivier Goffart
a7c97388a9
Fix Qt4 build for another error
2015-02-12 20:16:02 +01:00
Olivier Goffart
86c480ee09
Fix Qt4 build
2015-02-12 20:10:31 +01:00
Olivier Goffart
0184a00151
PropagateDirectory: make the code a bit more readable
...
Do not call slotSubJobFinished when there is are no sub jobs because
no sub jobs were finished. Instead just call a finalize method
2015-02-12 20:00:04 +01:00
Olivier Goffart
b9161aa06c
libsync: Fix a case in which canceling the sync would result in some folder never being sync'ed
...
The problem occurs because of the sorting of items when we have things like
bigfolder
bigfolder/bigsubfolder
bigfolder-2
Then, because dashes come before slash in ascii, the bigfolder-2 would come before its content
and the propagator would thinkg bigfolder is empty and save the etag before it is processed
Should fix issue #2832
2015-02-12 20:00:04 +01:00
Daniel Molkentin
00e42d1177
More HIDPI support
...
Except for the non-native activity tab
icon in settings, this should fix #11
2015-02-12 19:44:40 +01:00
Klaas Freitag
d37dd040d0
Sharedialog: Use new share link from ownCloud Server 8 on.
...
This is derived from pull request https://github.com/owncloud/client/pull/2813
2015-02-12 17:04:03 +01:00
Christian Kamm
a2aef04f21
ConValidator: Avoid a double auth check during startup. #2801
2015-02-12 15:25:44 +01:00
Christian Kamm
8f75434558
QuotaInfo: Ensure only one QuotaJob during startup. #2801
2015-02-12 15:25:44 +01:00
Daniel Molkentin
3dd6bcc323
Disable GUI support for TLS client certificates
...
The feature needs mor work
2015-02-12 15:17:59 +01:00
Olivier Goffart
063271e978
propagateupload: Disable parallel chunk upload for owncloud < 8
...
Issue #2743
2015-02-12 14:50:42 +01:00
Olivier Goffart
438c4fe72e
Account: put the server version in the account
2015-02-12 14:50:42 +01:00
Klaas Freitag
f4144d6d38
Merge pull request #2827 from rullzer/fix_2812
...
Added push button to sharedialog to set password
2015-02-12 13:49:56 +01:00
Klaas Freitag
eada70ba44
Sharedialog: Removed Thumbnail retrieval.
...
It uses an unstable API that the server does not really support.
We need to postpone that. Removed for now.
2015-02-12 13:47:07 +01:00
Jocelyn Turcotte
bed34b1ddd
Fix an infinite loop when unregistering OCContextMenu without admin rights
...
That mistake was introduced when changing the bool return value to an
HRESULT in the imported RegDelnode code.
2015-02-12 13:35:44 +01:00
Daniel Molkentin
3439ea395b
Remove one more mention of certDate
2015-02-12 12:43:41 +01:00
Daniel Molkentin
ba3bab8f49
Remove certificateDate property and other superfluous code
2015-02-12 12:37:42 +01:00
Christian Kamm
9ba88f6baf
Windows: Sync .lnk files correctly. #2792
2015-02-12 11:27:58 +01:00
Klaas Freitag
6be0b2b6c3
cmake: Lets do not explicitely set a APPLICATION_SHORTNAME.
...
That makes it defaulting to the APPLICATION_NAME which is ownCloud.
That is what we want and expect to read the system exclude file from
on linux.
How we find the system exclude file linux:
ConfigFile::excludeFileFromSystem()
-> Theme::instance()->appName()
-> OwncloudTheme::appName() returns "ownCloud"
-> default Theme::appName() returns APPLICATION_SHORTNAME
-> cmake installs to ${SYSCONFDIR}/${APPLICATION_SHORTNAME}
2015-02-12 11:12:10 +01:00
Christian Kamm
e4fce1250b
Progress: Ensure overall progress is between 0 and 100. #2648
...
This should *already* be the case - but @dahan1999 reported that
it fixed #2648 .
2015-02-12 10:09:07 +01:00
Jenkins for ownCloud
926bc56b3a
[tx-robot] updated from transifex
2015-02-12 02:18:27 -05:00
Roeland Jago Douma
8523803d94
Added push button to sharedialog to set password
...
Added button to explicitly set the password (makes is clear the user has to do
somethign!). Patch for #2812
2015-02-11 22:14:51 +01:00
Olivier Goffart
4f202e5f4c
Fix TokenCredentials compilation
2015-02-11 18:10:01 +01:00
Jocelyn Turcotte
7e211ef3d9
Update the binary submodule to include the fix for #2680
2015-02-11 17:04:08 +01:00
Jocelyn Turcotte
dc85ee3f0a
shell_integration: Fix hangs on Windows Vista
...
It seems like verclsid.exe hangs on our class IDs when invoked
through explorer.exe for 5-10 seconds. It doesn't hang if I
invoke the same command line from cmd.exe, so there could be some
process parameters that don't play well with our extra thread
or to the pipe connection that we do in it.
Delay creating the RemotePathChecker thread until the first
IsMemberOf call. verclsid.exe only seems to instantiate a object
of each registered class, without actually using them, so we
can use this as a workaround.
This should be fixing issue #2680 .
2015-02-11 16:45:11 +01:00
Christian Kamm
91ae912373
ShareDialog: Don't crash with bad response. #2811
2015-02-11 16:02:50 +01:00
Christian Kamm
9aeda891c3
Nautilus integration: clean up, fix bugs #2820
...
* Fix various spaces vs tabs issues
* Rewrite
- to use instance variables consistently
- to not make shared state explicit instead of relying on
class variables of a common base
* Fix reconnecting to an oC client.
2015-02-11 14:53:17 +01:00
Christian Kamm
5cdf448693
SyncJournal: Use DELETE journal mode on FAT filesystems. #2693
2015-02-11 14:03:55 +01:00
Christian Kamm
89c69250ef
Fix crash in discovery thread dtor.
...
Occasionally on Windows ~DiscoveryMainThread() triggered a crash.
Probably because the QMutableLinkedListIterator was destroyed after
it's underlying data had been removed (from the map).
Cleaning up the map and lists was redundant anyway, so the
destructor is changed to only explicitly destroy the vio_file_stat
objects.
2015-02-11 14:00:23 +01:00
Christian Kamm
5b6a6319c2
Nautilus integration: Fix invalid member access #2819
2015-02-11 11:31:07 +01:00
Christian Kamm
e79e2b80c8
SocketApi: Fix crash on exit. #2798
...
The _listeners list is destroyed before the _localServer.
And since _localServer is the parent of all generated QLocalSockets,
they get destroyed in turn - which triggers onLostConnection() and
thus accessed the destroyed _listeners list.
To avoid that, delete all active QLocalSockets in SocketApi before
its members are destructed.
We also now delete sockets when we're done with them. I think
disconnected sockets would otherwise linger until SocketApi destruction.
2015-02-11 09:50:10 +01:00
Christian Kamm
f8b24ac34d
Fix reconnection after long network outage #2321
...
The problem was that StatusNotFound can indicate either a transient
network problem or a permanent server configuration problem.
2015-02-11 09:24:56 +01:00
Jenkins for ownCloud
4ff0d6635c
[tx-robot] updated from transifex
2015-02-11 02:18:26 -05:00
Christian Kamm
51b9ec30a9
Remove connect to removed slot.
...
This seems to have slipped back in, probably during a complex merge
in ba8b1bbe06 .
2015-02-11 08:12:09 +01:00
Jenkins for ownCloud
377887871c
[tx-robot] updated from transifex
2015-02-11 01:15:14 -05:00
Klaas Freitag
d45d3892cb
Account: Fix path assembling with QUrl, add query items separately.
...
Otherwise Qt does encode the delimiter between path and query items.
This fixes bug #2804
2015-02-10 17:13:27 +01:00
Klaas Freitag
0bf6a220ae
Merge pull request #2807 from rullzer/sharedialog_force_password_multshare
...
Reset _public_share_id after we delete the share, thanks
2015-02-10 12:18:10 +01:00
Klaas Freitag
04a4d7c2c9
Merge pull request #2805 from rullzer/sharedialog_thumbnail
...
Sharedialog: retrive thumbnail from server for shares - thanks!
2015-02-10 12:16:28 +01:00
Jenkins for ownCloud
209d93ac05
[tx-robot] updated from transifex
2015-02-10 02:18:25 -05:00
Roeland Jago Douma
c44abf4918
Reset _public_share_id after we delete the share
2015-02-10 07:53:35 +01:00
Roeland Jago Douma
d7f5e89a1d
Sharedialog: retrive thumbnail from server for shares
...
Initial patch for #2726 . Request a thumbnail from the server if files are to be
shared.
2015-02-09 22:17:37 +01:00
Daniel Molkentin
72ec7ccde2
FF binary to current master
2015-02-09 11:58:15 +01:00
Daniel Molkentin
13aaa46a55
OCContextMenu: Also export modules for x86
2015-02-09 11:56:52 +01:00
Jenkins for ownCloud
3121546fb6
[tx-robot] updated from transifex
2015-02-09 02:18:27 -05:00
Olivier Goffart
51337a10af
LSCOL job: Fix getting the list of folders when there are non-ascii
...
Task #2795
2015-02-08 12:23:47 +01:00
Jenkins for ownCloud
5f3104786a
[tx-robot] updated from transifex
2015-02-08 02:18:23 -05:00
Jenkins for ownCloud
faec7362fe
[tx-robot] updated from transifex
2015-02-08 01:15:15 -05:00
Daniel Molkentin
adfb216325
Merge pull request #2793 from glensc/patch-1
...
use touch from path
2015-02-08 00:43:03 +01:00
Elan Ruusamäe
e0656af1fc
use touch from path
...
on some systems touch(1) is in /bin, not /usr/bin.
instead hardcoding another path, take it from $PATH, like other commands used here (rm, echo)
2015-02-08 01:27:46 +02:00
Daniel Molkentin
07fe077f7f
More Mirall -> Client renaming to make l10n work again
2015-02-07 23:28:20 +01:00
Daniel Molkentin
d3103adbd8
Ship translations on Windows again after rename
2015-02-07 22:32:42 +01:00
Markus Goetz
d4132072d8
OS X: Send notification natively
...
For #2728
2015-02-07 18:23:40 +01:00
Jenkins for ownCloud
b8e9dd587d
[tx-robot] updated from transifex
2015-02-07 02:18:26 -05:00
Jenkins for ownCloud
c48ab4830d
[tx-robot] updated from transifex
2015-02-07 01:15:14 -05:00
Olivier Goffart
eedb5d0dae
Revert "cmake: Clearly Define qtmain.lib link policy on Windows"
...
It make jenkins fail with the error:
CMake Error at CMakeLists.txt:3 (cmake_policy):
Policy "CMP0020" is not known to this version of CMake.
This reverts commit 6d380c8548 .
2015-02-06 17:46:57 +01:00
Jocelyn Turcotte
07849537cf
Fix Windows building documentation issues
...
Add missing words and clear up why qtkeychain must be built in-source.
2015-02-06 17:10:35 +01:00
Klaas Freitag
4849c31add
Sharing: Handle "Enforce password" for public shares properly.
...
If a 403 is received from the attempt to create a public link, the
dialog shows the password field, as this is server enforced.
This fixes #2774
2015-02-06 16:27:11 +01:00
Daniel Molkentin
9a4f4854de
Some fixes for favlink manual test
2015-02-06 15:29:36 +01:00
Jenkins for ownCloud
9ff48e6bb5
[tx-robot] updated from transifex
2015-02-06 09:20:10 -05:00
Daniel Molkentin
01bca39138
s/mirall/client in transifex & translations
...
Last part of #2470
2015-02-06 15:16:55 +01:00
Olivier Goffart
6e8527e66d
Wizard: Show the remote folder name when the theme has one
...
Relates to issue #2788
2015-02-06 14:50:52 +01:00
Jocelyn Turcotte
0d2b7967bc
Windows: Fix opening activity entries with a space in the name
...
This fixes #2601
2015-02-06 13:44:06 +01:00
Olivier Goffart
70c8803a79
SelectiveSync: show a message in case of error or if there is no subfolder
...
Usefull when the folder does not exist (for example in case the theme
has a defaultServerFolder that does not yet exist, #2788 )
But also to avoid confusion (issue #2663 )
2015-02-06 12:27:54 +01:00
Olivier Goffart
0d2fb0754c
Wizard: Fix the advanced setup page when the theme has a defaultServerFolder
...
Especially the selective sync dialog
Task #2788
2015-02-06 12:27:54 +01:00
Klaas Freitag
dbca7469f2
Enable the SHA sum in linux when build from source tar.
2015-02-06 12:18:09 +01:00
Markus Goetz
1e57432aae
Propagator: Fix crash
...
This crash was uncovered when testing parallel chunks when one chunk
finished the upload. The propagate was then finished with the other
UploadDevices still being in-flight in the QNAM.
2015-02-06 11:19:41 +01:00
Markus Goetz
7c0d3b8485
Sharing: tr()s added
2015-02-06 11:11:09 +01:00
Daniel Molkentin
46abd47bfe
Merge pull request #2787 from cmeh/patch-1
...
Orthography: "an folder" corrected to "a folder"
2015-02-06 10:31:57 +01:00
Olivier Goffart
2a88f5083c
t6.pl: Add a test that re-upload a chunked file with lot of chunks
2015-02-06 10:23:20 +01:00
Olivier Goffart
5ec793e045
propagateupload: Save the mtime given by the server in the reply to GET
...
There could be a race condition if the file was updated on the server
between the discovery and the propagate phase. By taking the mtime from
the server, we make sure that we do not have a race.
This is tested by t6.pl with BIG3.file because the script was modifying
the file between the two phases
2015-02-06 10:23:20 +01:00
cmeh
1554f41441
Orthography: "an folder" corrected to "a folder"
2015-02-06 10:22:49 +01:00
Daniel Molkentin
9e945eb471
Settings dialog: better color for separator line
2015-02-06 08:30:51 +01:00
Jenkins for ownCloud
b5212c4467
[tx-robot] updated from transifex
2015-02-06 02:06:13 -05:00
Daniel Molkentin
c4dd1cfb69
Mac Settings Dialog: Native icons for account
2015-02-06 07:54:25 +01:00
Jenkins for ownCloud
00774b95a1
[tx-robot] updated from transifex
2015-02-06 01:25:20 -05:00
Jenkins for ownCloud
7de559f351
[tx-robot] updated from transifex
2015-02-05 19:11:07 -05:00
Volkan Gezer
eaa9c4fdf8
json capital
2015-02-05 20:41:08 +01:00
Jenkins for ownCloud
6050d5873c
[tx-robot] updated from transifex
2015-02-05 13:58:32 -05:00
Markus Goetz
94e61c3205
Notifications: Fix creation of notification (fixup2)
...
For #2728
2015-02-05 17:20:52 +01:00
Markus Goetz
c4cf13bd97
Notifications: Fix creation of notification (fixup)
...
For #2728
2015-02-05 16:55:32 +01:00
Markus Goetz
71e22ffe2c
Notifications: Fix creation of notification
...
For #2728
2015-02-05 16:46:40 +01:00
Olivier Goffart
3169a6f170
SelectiveSync: change the wording of the dialog on the wizard
...
Have different wording depending on the wizardSelectiveSyncDefaultNothing theme option
Relates to #2580
2015-02-05 16:22:04 +01:00
Daniel Molkentin
e7b190404a
FF binary submodule to include the XP build fix
2015-02-05 16:16:42 +01:00
Markus Goetz
446e2b27d7
OS X Sparkle: Fix warning
2015-02-05 15:49:46 +01:00
Olivier Goffart
856df4c5f6
libsync: Get the capabilities and store it in the account
2015-02-05 15:42:56 +01:00
Olivier Goffart
34237f604e
JsonApiJob: Refactor out of the shibbolethuserjob
2015-02-05 15:42:01 +01:00
Daniel Molkentin
6d380c8548
cmake: Clearly Define qtmain.lib link policy on Windows
2015-02-05 15:37:22 +01:00
Jocelyn Turcotte
af0001a149
[shell_integration] Remove the usage of Win32 APIs not available on XP
2015-02-05 15:15:05 +01:00
Jocelyn Turcotte
2debd5a198
[shell_integration] Setup precompiled headers properly with MSVC
...
This also fixes a minor compile error when using VS Express.
2015-02-05 15:14:42 +01:00
Daniel Molkentin
59bdda6226
Require OpenSSL > 1.0.0, remove obsolete dep from csync
2015-02-05 13:08:28 +01:00
Olivier Goffart
21345b81f1
wizard: fix the EntityExistJob URL
...
We need to add the davPath in there.
Otherwise there will be a redirect which will break shiboleth
(We want to only enter the password once)
Issue #2739 and #2780
2015-02-05 12:53:04 +01:00
Jenkins for ownCloud
4f03234487
[tx-robot] updated from transifex
2015-02-05 02:06:15 -05:00
Olivier Goffart
3dd8ce08b8
Parallel chunk upload: Fix a off-by-one while saving the done chunk in the DB
...
We should assume that the chunk currently uploading is NOT done (hence the -1)
il task 405
2015-02-04 18:52:26 +01:00
Markus Goetz
f233af04f6
Windows XP: Possible fix for #2648
2015-02-04 18:49:04 +01:00
Markus Goetz
3a1501dea4
OS X: Connect to newest possible overlay icon socket
...
This is for branded ownCloud clients which use a different file name.
2015-02-04 18:44:00 +01:00
Olivier Goffart
11f1229c31
Fix Qt4 build
2015-02-04 18:04:50 +01:00
Olivier Goffart
acb7e972ea
Merge pull request #2778 from jturcotte/master
...
Allow building natively on Windows with MinGW
2015-02-04 17:11:56 +01:00
Jocelyn Turcotte
667665b809
Add documentation to build on Windows directly with MinGW
...
This doesn't link to the Generic Build Instructions section like other
platforms documentation does since the cmake and make commands are
different.
2015-02-04 16:57:56 +01:00
Jocelyn Turcotte
1ac523ec01
Output libocsync and libowncloudsync in the bin directory
...
Windows finds DLLs using PATH or the directory of the process'
executable. By outputing those dependend DLLs together with
owncloud.exe, the developer only need to have OpenSSL's bin
and the qtkeychain build directory in his PATH to let the
dynamic linker find them.
As the documentation of RUNTIME_OUTPUT_DIRECTORY points out,
this only affects windows as other platforms don't consider
libraries as runtime targets.
2015-02-04 15:00:22 +01:00
Olivier Goffart
ca56e5d9ca
SyncEngine: Fix crash
...
We must check if 'it' is not == to begin() before doing it-1
Also i believe the logic was reversed if it was begin()
Task #2765
2015-02-04 14:52:41 +01:00
Jocelyn Turcotte
43a51c1bef
Fix the MinGW build
...
- qtkeychain isn't necessarily in a qt5keychain subdirectory.
- Explicitly add OpenSSL to the include directories
- Make sure that the USE_OUR_OWN_SQLITE3 code is initialized
for csync by calling find_package.
2015-02-04 14:50:38 +01:00
Olivier Goffart
68ec24797b
Add some define.
...
Since Qt5.4, on release build, qDebug do not provide anymore the line
number unless we define QT_MESSAGELOGCONTEXT
Also define QT_USE_QSTRINGBUILDER while i'm on it (free optimisation)
2015-02-04 13:43:02 +01:00
Olivier Goffart
26132fd14e
owncloudconnectionmethoddialog: typo
2015-02-04 13:42:49 +01:00
Jenkins for ownCloud
5fdf9bb7d2
[tx-robot] updated from transifex
2015-02-04 02:06:17 -05:00
Olivier Goffart
ca68ccd76a
Fix Qt4 build
2015-02-03 20:04:04 +01:00
Olivier Goffart
1f9d7c41e8
owncloudconnectionmethoddialog: Change order of buttons, fix wording, and add the URL
2015-02-03 17:55:01 +01:00
Olivier Goffart
52d330d8e5
csync: add neon include directories
2015-02-03 16:00:55 +01:00
Klaas Freitag
17eb509c4e
Merge pull request #2771 from rullzer/sharedialog_copybtn
...
Sharedialog: add copy button text and actually connect the button
2015-02-03 13:56:05 +01:00
Roeland Jago Douma
48254579a2
Sharedialog: add copy button text and actually connect the button
2015-02-03 13:02:52 +01:00
Markus Goetz
9d93642102
Update CONTRIBUTING.md
...
Fix broken links
2015-02-03 12:04:51 +01:00
Daniel Molkentin
a3106b1771
Client Dialog Support: Fix certificate dialog
2015-02-02 23:35:39 +01:00
Daniel Molkentin
d2670b8473
Merge pull request #2767 from jdhoek/feature/choose-connection-method
...
Add dialog to connection wizard for client-side TLS certificates
2015-02-02 23:22:19 +01:00
Jeroen Hoek
227b7ccabd
Add dialog to connection wizard
...
When connecting to a https:// URL fails, present the user with three
choices:
* Try again with a http:// URL
* Configure client-side TLS certificates
* Go back and enter a different URL
This allows users connecting with an ownCloud server secured with
client-side TLS certificates to start the certificate import wizard
manually instead of relying on a custom server error message.
2015-02-02 22:29:21 +01:00
Jenkins for ownCloud
6c3e19e531
[tx-robot] updated from transifex
2015-02-02 02:06:11 -05:00
Jenkins for ownCloud
ed49a708d0
[tx-robot] updated from transifex
2015-02-01 02:06:12 -05:00
Jenkins for ownCloud
e04300a01c
[tx-robot] updated from transifex
2015-01-31 02:06:13 -05:00
Carla Schroder
65cebe7edd
Merge pull request #2759 from owncloud/desktopsync
...
remove obsolete account setup page
2015-01-30 14:08:49 -08:00
Carla Schroder
63cda04b56
remove obsolete account setup page
2015-01-30 14:05:47 -08:00
Carla Schroder
acda7bddb8
Merge pull request #2758 from owncloud/install
...
updated installation page 1.8 client
2015-01-30 13:00:14 -08:00
Carla Schroder
6ffc04808d
typo fixes 1.8 install
2015-01-30 12:58:42 -08:00
Carla Schroder
c932e26f83
markup and typo fixes 1.8 install page
2015-01-30 12:54:49 -08:00
Carla Schroder
682ce2e1e2
New page on installing 1.8 client
2015-01-30 12:48:12 -08:00
Carla Schroder
9873204be6
replace references to "Mirall" with "client"
2015-01-30 09:14:42 -08:00
Christian Kamm
49021fd96d
SyncJournal: Reset all prepared statements. #2757
...
Makes closing of the database actually release file locks.
2015-01-30 15:35:42 +01:00
Klaas Freitag
5dc2871e2b
Nautilus plugin: Fix broken indentation (python).
2015-01-30 14:27:15 +01:00
Klaas Freitag
481d4f3478
CMake: Changed message about compiling against Qt4.
2015-01-30 13:21:38 +01:00
Jenkins for ownCloud
5cf8726e60
[tx-robot] updated from transifex
2015-01-30 02:06:17 -05:00
Olivier Goffart
db6214e090
SyncEngine: Do not assert when the neon session is 0
...
It can now be 0 if neon is not in used
Issue #2755
2015-01-30 01:05:46 +01:00
Markus Goetz
bb215ad095
OS X: Don't show menu item outside sync folder
...
As per #2732
2015-01-29 21:13:09 +01:00
Markus Goetz
df214cd6c1
Folder: Make debug message clearer
...
The thread was actually already started in the discovery phase.
2015-01-29 20:47:45 +01:00
Markus Goetz
ea72d7bb11
CMake: Remove FIXME
2015-01-29 20:47:33 +01:00
Klaas Freitag
d2f1e6e03e
ShareDialog: Disable sharing of external files.
...
See https://github.com/owncloud/client/issues/2732 for discussion.
2015-01-29 18:11:04 +01:00
Klaas Freitag
37f19dd0fe
nautilus menu: Do not show entry on external files.
2015-01-29 18:11:04 +01:00
Daniel Molkentin
0c987f58e6
FF binary submodule
2015-01-29 16:43:07 +01:00
Daniel Molkentin
f84758eaac
Add Resource File for OCContextMenu, adjust (c) dates.
2015-01-29 16:37:51 +01:00
Daniel Molkentin
8c58236e7c
Remove template file
2015-01-29 16:13:36 +01:00
Daniel Molkentin
027328d3a6
Windows Integration: Don't use size_t in StringUtil, it's unsigned
2015-01-29 16:11:42 +01:00
Daniel Molkentin
332601ed26
Remove noisy debug output
2015-01-29 15:37:21 +01:00
Daniel Molkentin
6c0a449ebe
NSIS: Fix c&p error
2015-01-29 15:25:14 +01:00
Daniel Molkentin
b1d2e1fa10
More translation adjustments
2015-01-29 14:44:48 +01:00
Daniel Molkentin
44e1d33faa
Further string fixes
2015-01-29 13:35:48 +01:00
Daniel Molkentin
183b3c61e4
Update NSIS installer to install ContextMenu Extension
2015-01-29 13:19:54 +01:00
Daniel Molkentin
a199f2ba40
Update binary to reflect state of last commit
2015-01-29 13:13:43 +01:00
Daniel Molkentin
d6c4f749a6
Windows Shell Integration: Also ensure correct TargetName on x86/release
2015-01-29 13:03:38 +01:00
Daniel Molkentin
8af2c6c397
Update MSVC Project files to a consistent state
2015-01-29 13:00:30 +01:00
Daniel Molkentin
367ef7195a
Windows Shell Integration: Fix warnings
2015-01-29 13:00:29 +01:00
Christian Kamm
43d6dbb0f2
SQL: Add debugging options. #2693
...
OWNCLOUD_SQLITE_JOURNAL_MODE: To use something else than WAL
OWNCLOUD_SQLITE_TEMP_STORE: To test with storing temporaries in memory.
2015-01-29 11:02:01 +01:00
Christian Kamm
cd0ad21132
SQL: Improve error reporting of failed exec(). #2693
2015-01-29 09:47:48 +01:00
Daniel Molkentin
6fa73e073f
Certificate Wizard: Remove dead code, cleanup style
2015-01-28 17:38:38 +01:00
Christian Kamm
5fc231cda4
Shib: Fix fetching of 'user'. #2751
2015-01-28 15:15:35 +01:00
Daniel Molkentin
1ca8ab81c7
Fix for non C++11 compilers
2015-01-28 14:19:37 +01:00
Olivier Goffart
22d3a4a48f
csync_owncloud: don't deref null pointer
2015-01-28 14:16:33 +01:00
Olivier Goffart
d70e146c1f
Merge remote-tracking branch 'origin/ssl_client_cert'
...
Conflicts:
CMakeLists.txt
csync/src/CMakeLists.txt
csync/src/csync_owncloud.c
2015-01-28 14:13:40 +01:00
Klaas Freitag
3888a461f3
Set APPLICATION_SHORTNAME correctly, fixes prev. commit
2015-01-28 13:55:09 +01:00
Klaas Freitag
4df2c8d872
cmake: Have a defined APPLICATION_SHORTNAME again.
...
The most scripts expect the APPLICATION_SHORTNAME to be a lowercase
APPLICATION_NAME. Is needed in package building.
2015-01-28 13:53:06 +01:00
Daniel Molkentin
989005d616
Clientcert support: Explictly link libsync against openssl
2015-01-28 13:31:17 +01:00
Daniel Molkentin
ed05a24cc4
Merge pull request #2749 from vtsingaras/patch-1
...
Update Toolchain-mingw32-openSUSE.cmake
2015-01-28 13:10:42 +01:00
Christian Kamm
2cee591b0e
Merge branch 'sharedialog_fixes' of git://github.com/rullzer/client
...
Fix missing OcsShareJob constructor.
Conflicts:
src/gui/sharedialog.cpp
2015-01-28 12:19:40 +01:00
ckamm
8a71d7d254
Merge pull request #2730 from rullzer/filebrowser_integration
...
Sharedialog: 404 is also an acceptable response when retriving shares
2015-01-28 12:09:33 +01:00
Christian Kamm
7950eb8ed6
sqlite: Update to version 3.8.8.1. #2750
2015-01-28 11:52:04 +01:00
Christian Kamm
f59515883d
FolderMan: Require 2s minimum delay.
...
Otherwise we run into "can't upload because it's too recent" issues
when the folder watcher triggers a sync.
We used to do this, but my recent refactoring started counting the
time since the last sync against this minimum delay, leading to
1ms delays in practice. This fixes the regression.
2015-01-28 11:24:47 +01:00
Daniel Molkentin
2c432e0b97
Remove socketapiclient
2015-01-28 11:13:38 +01:00
Daniel Molkentin
524f04f34e
Wizard: Give useful error message when server access is forbidden
...
Final fix for #2607
2015-01-28 11:06:41 +01:00
Daniel Molkentin
9e7ee42eb7
Wizard Remove unused pointer
2015-01-28 11:06:41 +01:00
Daniel Molkentin
6f82e80698
Remove debug
2015-01-28 11:06:41 +01:00
Christian Kamm
37680a0909
ShareDialog: Prepare for multiaccount. #43
...
Also fix a possible bug with the share dialog when no account
is configured.
2015-01-28 10:52:55 +01:00
Christian Kamm
350ad98c27
Folderwizard: Prepare for multiaccount. #43
...
Avoid accessing the global account instance and instead pass it in
from the outside.
2015-01-28 10:40:32 +01:00
Daniel Molkentin
2a3df5562c
Add new Qt 5.4 dependencies, remove neon ones
2015-01-28 08:34:09 +01:00
Olivier Goffart
b0dbb49ca8
Shib: fix broken signal/slot connections
2015-01-26 16:23:43 +01:00
Vyronas Tsingaras
4603798996
Update Toolchain-mingw32-openSUSE.cmake
...
Fix cross-compiling for windows. change qt4 to qt5 since windows and OSX require Qt5 now.
2015-01-26 15:53:44 +02:00
Olivier Goffart
3169833cd7
gui: Still give a decent experience if there is no system tray
...
Helps for tasks #1138 , #2023 , #2123
2015-01-26 13:00:45 +01:00
Jenkins for ownCloud
75540e8a4c
[tx-robot] updated from transifex
2015-01-25 02:06:12 -05:00
Joachim Schiele
9abc3e1333
fixes required by upstream
2015-01-23 19:22:56 +00:00
Olivier Goffart
fb79211514
Merge remote-tracking branch 'remotes/origin/win_context_menu'
2015-01-23 18:02:55 +01:00
Olivier Goffart
502e7081cf
Make it compile with neon
2015-01-23 17:59:07 +01:00
Olivier Goffart
dcba129a98
Make it compile without neon
2015-01-23 17:56:46 +01:00
Olivier Goffart
b856266e91
Remove neon link flag when not required
2015-01-23 17:35:17 +01:00
Markus Goetz
7f1f62e14a
CSync: Clean some more
2015-01-23 17:26:30 +01:00
Olivier Goffart
fe51ada1e8
Don't require NEON with Qt 5.4
2015-01-23 17:11:34 +01:00
Markus Goetz
6708c959d9
CSync: Remove c_list
2015-01-23 17:09:13 +01:00
Markus Goetz
af9daaeff7
CSync: Remove memory checks
...
We will get OOMed before this fails.
2015-01-23 16:59:51 +01:00
Olivier Goffart
a999884adf
osx integration: adapt to socket api changes
2015-01-23 16:13:16 +01:00
Olivier Goffart
807277c0ae
Socket API: Do not broadcast the shared menu entry on all socket when one connects to the socket API
...
Now we reply to the command SHARE_MENU_TITLE
2015-01-23 16:09:38 +01:00
Olivier Goffart
0af97156c9
Windows shell integration: Make the share entry work by adding a Sleep
...
Timeouts don't work with named pipe, so wait for 50ms to let time
for the client to answer
2015-01-23 15:43:03 +01:00
Markus Goetz
12ac9f9aa9
Discovery: Fix broken signal/slots
2015-01-23 15:37:36 +01:00
Markus Goetz
3885d5d706
Discovery: Report root etag from engine to folder
...
For #2352
2015-01-23 15:30:44 +01:00
Daniel Molkentin
f284786749
Fix typo
2015-01-23 14:44:53 +01:00
Markus Goetz
c54621eb19
OS X: Share menu for Finder
2015-01-23 12:00:31 +01:00
Klaas Freitag
2943b4a85a
CMake: Fixed the rpath settings to make the nighlies build again.
2015-01-23 11:50:42 +01:00
Klaas Freitag
ed4d31ebc5
Nautilus overlay: Use branded program name for menu item.
2015-01-23 11:50:42 +01:00
Klaas Freitag
ed0b4e48d5
Sharedialog: Fix some error display.
2015-01-23 11:50:42 +01:00
Roeland Jago Douma
f9938c90ff
Sharedialog: 404 is also an acceptable response when retriving shares
...
When we try to get the shares for a file/dir that has no shares yet 404 is an
acceptable response from the server.
2015-01-23 10:29:12 +01:00
Roeland Jago Douma
bcdc19f0e3
Sharedialog: Moved more logic to OcsShareJob
...
To make the Sharedialog a bit cleaner and to only have the logic in one place.
The postdata is now passed as a QList<QPair<QString, QString>> to the
OcsShareJob.
2015-01-23 09:41:10 +01:00
Roeland Jago Douma
fb967427e8
Sharedialog: We always want json return format
...
Cleanup the code a bit and set that we want json as return format for all
replies.
2015-01-23 09:17:00 +01:00
Roeland Jago Douma
0b10761291
Sharedialog: emit proper error code, only show error label if there is one
2015-01-23 09:10:02 +01:00
Daniel Molkentin
316c476bbd
Revert "Revert "Windows Shell Integration: Show status icon for root folder""
...
This reverts commit 176413d312 .
2015-01-22 19:13:12 +01:00
Daniel Molkentin
081cc0b9e8
WiP: Add Win32 Context menu integration
2015-01-22 18:45:20 +01:00
Olivier Goffart
560759ede8
Windows shell integration: Reduce the timeout time of WaitNamedPipe
...
This is maybe what causes the troubles of task #2576
2015-01-22 16:30:02 +01:00
Olivier Goffart
0f98a90858
Wizard: Add an option in the theme to default to nothing selected in the selective sync
...
Issue #2580
2015-01-22 15:57:55 +01:00
Christian Kamm
094da51d82
FolderWatcher: Fix ignore list usage.
...
All patterns with started with a ] were not working correctly.
2015-01-22 15:42:47 +01:00
Daniel Molkentin
39097980b0
Deployment: Accessiblewidgets no longer exists in Qt 5.4
...
Part of #2699
2015-01-22 15:27:19 +01:00
Olivier Goffart
3c26bfa618
Propagate Remote mkdir: save the fileid to the database early
...
It's important so that if we delete or rename a diectory that is being
uploaded, this is properly detected
2015-01-22 15:11:04 +01:00
Olivier Goffart
168c89aba7
Wizard: fix spacing
2015-01-22 15:11:03 +01:00
Markus Goetz
0502f684e9
Discovery: Even less qDebug
2015-01-22 14:45:08 +01:00
Markus Goetz
45cb679ea7
Discovery: Less verbose debug
2015-01-22 14:37:35 +01:00
Markus Goetz
c9f9d55658
Merge branch 'qnam_csync_update'
...
Conflicts:
src/libsync/networkjobs.cpp
2015-01-22 14:34:36 +01:00
Markus Goetz
d285db653e
CMake: Check for Qt version
...
This is still WiP, we need to compile without neon if possible
2015-01-22 14:27:49 +01:00
Markus Goetz
dde8e35785
Discovery: Put results into proper place in map
...
The map is for memory management.
It can later be used as a cache for the recursive PROPFIND
(if we decide to activate it again)
2015-01-22 14:25:24 +01:00
Olivier Goffart
5860e5a46b
Exclude *.tmp (as requested in #2424 )
2015-01-22 14:08:31 +01:00
Christian Kamm
fa4e6d8261
Exponential backoff for rapid follow up syncs. #2355
2015-01-22 08:55:52 +01:00
Christian Kamm
145df8ec67
Pause between sync runs (particularly long ones) #2355
2015-01-22 08:55:52 +01:00
Christian Kamm
af5cbdbed8
Folder: Add timer for sync duration.
2015-01-22 08:55:52 +01:00
Nourredine
ba8b1bbe06
adds 'SSL client certificate' support from n.octeau with qknight changes as:
...
* removed broken QSsl::SslV3 default
* rewrote slotHandleErrors(): no longer claim errors which are none.
* hack reverted: lib64 was not the cause for NixOS issues related to libraries.
* refactored csync/src/csync_owncloud.c and discovered+fixed why the dav_connect was never getting the certPath+certPassoword
* cleanup of code but seems this crushed the ssl client certificate support
* fixes the https://github.com/owncloud/client/issues/69#issuecomment-69358377 issue
* lots of cleanup
* From TODO list : translate all french comments into english
* changed _pemCertificate type from QString to QByteArray
2015-01-21 23:55:11 +00:00
Klaas Freitag
82e5e36c57
Nautilus: Display context menu for files that are not yet synced.
2015-01-21 17:41:57 +01:00
Olivier Goffart
f2a7e0b28f
Selective sync dialog: give a proper size by default
2015-01-21 15:37:00 +01:00
Olivier Goffart
0e86ceff73
Connection Validator: let the user cancel the password dialog
...
And don't ask for the password again if this happens
2015-01-21 15:33:51 +01:00
Olivier Goffart
c91de092e5
Setup wizard: Fix the http fallback logic
...
Also don't allow to go back from the advanced settings page because
this break everything
2015-01-21 15:33:51 +01:00
Markus Goetz
7a173f6e62
OS X: Fix path rewrite for owncloudcmd
...
It was broken after the folder restructuring (cmd/ and client/)
2015-01-21 15:17:40 +01:00
Klaas Freitag
95f7e83c5c
Sharedialog: Some more refinements after the merge of the branch.
...
- Some dialog changes: Made it less vertical space comsuming
- Some variable cleanups
- Allow to share files that are not within the synced dir by
copying them to the root of a sync dir first.
2015-01-21 15:05:23 +01:00
Olivier Goffart
d8b621d05f
LsColJob: fix getting the sizes when the path contains %-encoded chars
2015-01-21 12:04:54 +01:00
Markus Goetz
fb87ad1442
OS X: Fix path rewrite for owncloudcmd
...
It was broken after the folder restructuring (cmd/ and client/)
2015-01-20 19:03:56 +01:00
Markus Goetz
c580275a01
Discovery: Delete file entries on destruction
2015-01-20 18:49:27 +01:00
Olivier Goffart
5c2298fa37
Discovery phase: fix a few warnings
2015-01-20 18:50:03 +01:00
Olivier Goffart
08043bed21
csync_update: Leave a margin of 1sec when comparing the time for the timezone changes
...
Because FAT has a bad resolution, when the timezone is changed, there may be
one second of difference.
Issue #2438
2015-01-20 18:34:24 +01:00
Markus Goetz
906779c4b1
SyncEngine: Use QNAM for csync_update
...
This is for #2507
2015-01-20 18:27:25 +01:00
Klaas Freitag
bd80c034ba
Merge pull request #2723 from rullzer/filebrowser_integration
...
Sharedialog: link sharing from desktop
2015-01-20 17:45:34 +01:00
Markus Goetz
fd69f60a49
Update CONTRIBUTING.md
2015-01-20 11:01:55 +01:00
Daniel Molkentin
00ed37dd02
Merge pull request #2709 from rullzer/monochrome-state-info-icon
...
Resepct theming when no syncs are configure
2015-01-20 08:21:42 +01:00
Daniel Molkentin
4de815ad67
Merge pull request #2710 from rullzer/sort_folder_order
...
Manged folder list in the tray icon is now sorted
2015-01-19 18:56:55 +01:00
Daniel Molkentin
86eed7cb81
Fix SSL button icons
2015-01-18 15:34:48 +01:00
Roeland Jago Douma
63f18a7ebb
Sharedialog: Pass QDate around instead of QString
...
Now pass a QDate object around so we only do the conversion in one place in
case the API changes.
2015-01-17 09:57:17 +01:00
Roeland Jago Douma
233f0423fa
Sharedialog: Also reply on delete should be checked
2015-01-17 09:48:18 +01:00
Roeland Jago Douma
d5bddca01d
Sharedialog: More Q_FOREACH
2015-01-17 09:29:13 +01:00
Roeland Jago Douma
00cb6f71da
Sharedialog: Set correct minimum date
...
The minimum date should always be the current date + 1 day.
2015-01-17 09:10:42 +01:00
Roeland Jago Douma
9ac35d5869
Sharedialog: Use arg instead of append
2015-01-17 09:01:24 +01:00
Roeland Jago Douma
bd1db30eea
Sharedialog: Minor fixes
...
The server generates a new share when a password is set/deleted so we need to
refetch the shares once that is done.
It is not possible to set an expiration date in the past for a share. So do not
allow the user to select a date in the past.
2015-01-17 08:50:28 +01:00
Roeland Jago Douma
6c3a5b1d69
Sharedialog: Do not hard code error reply messages
...
The server provides error messages in the json return code. Use those error
messages.
2015-01-17 08:29:20 +01:00
Roeland Jago Douma
c233baab5b
Sharedialog: grouped sharelink stuff in one widget
...
A bit of grouping in the UI requiring less ->hide() and ->show() calls
2015-01-17 08:10:18 +01:00
Christian Kamm
aa6a5e4ac2
Credentials: Use the bound account everywhere.
...
This is preparation for multiaccount.
2015-01-16 15:22:56 +01:00
Roeland Jago Douma
71560ace71
Sharedialog: Show general info about a share
...
A start with some general share info in the share dialog.
2015-01-16 14:48:56 +01:00
Roeland Jago Douma
0fba4eee98
Sharedialog: Removed user/group sharing
2015-01-16 14:06:34 +01:00
Christian Kamm
91fce3ea73
Make public API explicit about blacklist kind. #2301
...
'blacklist' can mean the selective sync blacklist or the error
blacklist. Names in public API are now explicit about which
blacklist is meant.
2015-01-16 10:17:19 +01:00
Christian Kamm
b50475bc17
SQL: Fix error reporting on prepare fail. #2697
2015-01-16 09:12:25 +01:00
Klaas Freitag
40c802b148
Download: Handle locking problems as soft errors, enterprise #455
2015-01-15 20:51:30 +01:00
Klaas Freitag
7d9f917810
Filesystem: Check more return values and more logging.
2015-01-15 20:51:30 +01:00
Klaas Freitag
a5ae1a9734
Folder: Only count error free downloads for the gui notification.
2015-01-15 20:51:30 +01:00
Klaas Freitag
506360716a
FolderMan: Removed too explicit logging that scares users.
2015-01-15 20:51:30 +01:00
Olivier Goffart
22ad34fa0e
Merge branch '1.7'
...
Conflicts:
admin/win/nsi/l10n/French.nsh
src/mirall/propagator_qnam.cpp
2015-01-15 17:58:43 +01:00
Olivier Goffart
ce0e7e4a5d
Propagator download: Do not assume the server do not support ranges if we cannot parse the Content-Range header
...
There are several reason why start==0
* The Content-Range header was not present
* We can't parse it
* Or it is actually 0
If we can't parse it, we cannot assume anything and must error out.
So only in the first case we should discard the temporary file and continue.
Issue #2708
2015-01-15 17:56:49 +01:00
Olivier Goffart
907b79d3b8
Utility: Use appropriate unit when converting from bytes to human readable units
...
We must not use the SI units if we use power of 2
I believe that we should use SI units and power of 10
But since the server still use power of 2, we need to show the same numbers
But at least we use the proper standard IEC unit that are explicit
2015-01-15 14:06:17 +01:00
Olivier Goffart
863731fd6a
Revert "Utility: Use SI units"
...
This reverts commit 7445fa7ef7 .
and commit f654c53c35 .
The server still use wrong powers, so we still need to use the same
2015-01-15 13:56:51 +01:00
Olivier Goffart
c9f1b3229b
Add Folder Wizard: fix wording
...
(Relates #2663 )
2015-01-15 13:55:48 +01:00
Olivier Goffart
2b8b204cfc
SelectiveSyncDialog::estimatedSize: return qint64 because -1 in case of error
2015-01-15 13:07:16 +01:00
Olivier Goffart
264471af43
csync: cleanup some unused error code
2015-01-15 12:19:06 +01:00
Olivier Goffart
e31514f769
csync propfind: Rename the directDownload property
...
The owncloud server has a different name because if it was named the same
it would break the 1.7 client
Issue #2614
2015-01-15 11:52:55 +01:00
Olivier Goffart
08d3ae9f02
csync_statedb: Have more granular error reporting when the loaddb fails
...
In order to distiguish error from sqlite_open or from the integrity check
Issue #2673
2015-01-15 11:36:24 +01:00
Olivier Goffart
f654c53c35
fixing testOctetsToString
2015-01-15 09:58:40 +01:00
Jenkins for ownCloud
7121b64c59
[tx-robot] updated from transifex
2015-01-15 01:25:25 -05:00
Roeland Jago Douma
cd0c9b2ddb
Sharedialog: More error checking
2015-01-14 19:47:25 +01:00
Roeland Jago Douma
b80bbe6587
Sharedialog: more const
2015-01-14 19:36:42 +01:00
Roeland Jago Douma
879d41bf2d
Sharedialog: Fix spinners and passwordfield
...
The password field now show correct info when a password is entered etc.
Maybe we should have an extra info part where we state that the user needs to
press enter to submit the password
2015-01-14 19:08:04 +01:00
Roeland Jago Douma
7b1cfd69d7
Sharedialog: use QProgressIndicator
...
This is a merge from the movie in the original commit (which was local) to the
QProgressIndicator. However, on all connections I tested it, it did not add
much since the API is in gernal pretty quick. So maybe we can just remove this.
2015-01-14 18:42:56 +01:00
Daniel Molkentin
ff695f08f7
Merge pull request #2704 from remixtj/master
...
Fix for issue #2703
2015-01-14 17:48:08 +01:00
Luca Lorenzetto
ef9f2a965d
Fix for issue #2703
2015-01-14 17:39:14 +01:00
Olivier Goffart
ac0e8b1fe1
Qt 4 fix
2015-01-14 16:30:10 +01:00
Olivier Goffart
da0f7317b4
Wizard: Show the size of the folders that will be downloaded
...
Part of #2580
2015-01-14 16:11:07 +01:00
Roeland Jago Douma
3e81839af5
Sharedialog: Removed duplicted code
...
Handling of updated shares is identical from users and groups
2015-01-14 15:27:15 +01:00
Christian Kamm
0af5574951
Propagate upload: code cleanup
2015-01-14 15:20:02 +01:00
Olivier Goffart
0ae9055ea6
Propagator upload: Fix UploadDevice::seek
2015-01-14 15:08:09 +01:00
Olivier Goffart
885aafcea3
SelectiveSync dialog: Show the sizes of the folder
2015-01-14 15:08:09 +01:00
Olivier Goffart
7445fa7ef7
Utility: Use SI units
2015-01-14 15:08:09 +01:00
Markus Goetz
a544133d73
Propagator: Guard access to BandwidthManager
...
Shouls fix #2623
2015-01-14 14:28:47 +01:00
Christian Kamm
b3c02798a3
Propagator: Use FILE_SHARE_DELETE on Windows. #2070 #2597
2015-01-14 14:16:05 +01:00
Roeland Jago Douma
0bd6eb1792
Sharedialog: fix changes due to rebase
2015-01-14 13:51:02 +01:00
Olivier Goffart
3ec19ee355
Propatage upload: Preload the chunk in memory and close the file
...
This should solve #2675 and #1981
By preloading the chunks in memory before sending them, we don't keep the
file open and therefore we let other program open the file for writing.
If the file is modified between two chunks, we detect that and abort anyway
2015-01-14 13:46:51 +01:00
Olivier Goffart
0215b250af
UploadDevice: mark overrided method as Q_DECL_OVERRIDE
2015-01-14 13:46:51 +01:00
Olivier Goffart
6a0c9fdd34
Propagate upload: Change the default chunk size to 5MiB and make chunk upload parallel
...
The server is slow to process each chunk. As a result the time between
the chunks is not neglectible. Therefore we gain a lot of time by
uploading the chunks in parallel. So the bandwitdh is used when the
server is waiting between chunks.
2015-01-14 13:46:51 +01:00
Olivier Goffart
7f1593c5d7
PropagateUpload: The PUTJob owns the chunk device, so make it a QScopedPointer instead of a QSharedPointer
2015-01-14 13:46:51 +01:00
Roeland Jago Douma
e420a689dc
Sharedialog: More reply checking and removing some duplicated code
2015-01-14 13:43:01 +01:00
Roeland Jago Douma
9addd56f9b
Sharedialog: follow correct behavior for files when editing permissions
2015-01-14 13:43:01 +01:00
Roeland Jago Douma
a7e69a5dc5
Sharedialog: Started parsing server replies
2015-01-14 13:43:01 +01:00
Roeland Jago Douma
f6a83d5de2
ShareDialog: UI is different for files/dirs
...
Bunch of if statements to make sure that we do not display delete/create on
files.
2015-01-14 13:43:01 +01:00
Roeland Jago Douma
d1d8a40acf
Sharedialog: fix unused var compiler warnings
2015-01-14 13:39:07 +01:00
Roeland Jago Douma
cb18dfaaef
Sharedialog: Of course users can also have create and delete privileges
2015-01-14 13:39:07 +01:00
Roeland Jago Douma
a22a03e501
ShareDialog: Group sharing is now also possible
...
Basically the same functionality as for user sharing. Maybe it would be wise to
merge the two functionalities. Should be rather straight forward if we also
merge the UI parts.
2015-01-14 13:39:06 +01:00
Roeland Jago Douma
9a35b5670e
ShareDialog: Allow sharing with users
...
This commit needs a lot of cleaning up. And a lot of error checking needs to be
added. However it is now possible to change and add new shares with users.
Sharing with groups should be just copy paste.
Also the UI needs some love.
2015-01-14 13:39:06 +01:00
Roeland Jago Douma
017b54f9a8
Sharedialog: Allow modifications of permission for users
2015-01-14 13:39:06 +01:00
Christian Kamm
9b7e6cc5c1
Fix warnings.
...
* remove Unused variable
* zorder for spacers makes no sense
2015-01-14 11:28:53 +01:00
Klaas Freitag
209276efa8
ShareDialog: Moved open slot from Application object to Gui object.
...
Also set auto delete flag for the dialog explicitely.
2015-01-13 13:50:41 +01:00
Jenkins for ownCloud
d2fc3e8023
[tx-robot] updated from transifex
2015-01-13 02:06:12 -05:00
Jenkins for ownCloud
1afdeb7216
[tx-robot] updated from transifex
2015-01-13 01:25:24 -05:00
Klaas Freitag
b754ffb047
Nautilus: Add a context menu that opens the sharing dialog.
2015-01-12 14:49:22 +01:00
Klaas Freitag
89eb4727b4
Nautilus overlays: Add a script to patch the branding name into pyhton script.
2015-01-12 14:49:22 +01:00
Daniel Molkentin
5619947685
Relocate Windows shell extensions
...
The directory was redundant
2015-01-12 14:40:42 +01:00
Daniel Molkentin
31e584e3e3
Fix win32 build
2015-01-12 13:53:40 +01:00
Klaas Freitag
ad09f6491b
ShareDialog: Fix const ref for arguments.
2015-01-12 11:35:11 +01:00
Klaas Freitag
efbe033bfb
Sharedialog: Fix merge problem (use AccountPtr) plus cleanup.
2015-01-12 11:30:02 +01:00
Klaas Freitag
2c6f0950f6
Merge pull request #2674 from rullzer/filebrowser_integration
...
Add Sharing from the desktop, SocketAPI and Dialog.
2015-01-12 11:16:28 +01:00
Roeland Jago Douma
b680788f48
Sharedialog: Allow setting and retrieving of experiation data for public urls
2015-01-12 10:14:45 +01:00
Daniel Molkentin
5e0d4ab31d
Further Windows compile fix
2015-01-12 09:50:37 +01:00
Daniel Molkentin
488f993f45
Fix compilation on Windows
2015-01-12 09:40:11 +01:00
Jenkins for ownCloud
876407e2e7
[tx-robot] updated from transifex
2015-01-12 01:25:23 -05:00
Roeland Jago Douma
811cbc27c0
Sharedialog: Construct correct public url for existing shares
2015-01-11 14:16:49 +01:00
Daniel Molkentin
214f925b2f
Merge pull request #2692 from owncloud/typo
...
fix typo
2015-01-11 14:12:43 +01:00
Volkan Gezer
cefa31eb82
fix typo
...
suggested by transifex translator
2015-01-11 14:07:04 +01:00
Roeland Jago Douma
25e90ff658
Sharedialog: use Q_FOREACH
2015-01-11 13:56:23 +01:00
Roeland Jago Douma
fa390299f9
Added Q_FUNC_INFO at several places
2015-01-11 13:41:15 +01:00
Roeland Jago Douma
accb036507
Removed some unused outcommented code
2015-01-11 13:36:45 +01:00
Roeland Jago Douma
44690ff596
ShareDialog: fixed "" -> QString
2015-01-11 13:27:32 +01:00
Roeland Jago Douma
e20f819c1d
Sharedialog: QString("") -> QString()
2015-01-11 13:24:40 +01:00
Roeland Jago Douma
1d011a2f9a
ShareDialog: make visible text translatable
2015-01-11 13:22:48 +01:00
Roeland Jago Douma
bc84a78b0f
ShareDialog: Made slot arguments const
2015-01-11 11:19:12 +01:00
Daniel Molkentin
6034bd0946
Wizard: Never attempt to hide server page
...
The wizard code used to call hide() on hardcoded wizards.
This means that for a brief moment, the first page with the URL
(disabled line edit) may be seen. I think that's completely
legitimate from a feedback perspective. The alternative would
be to unhide on error, but this is rather unelegant...
2015-01-11 07:38:09 +01:00
Jenkins for ownCloud
6abe714dff
[tx-robot] updated from transifex
2015-01-11 01:25:22 -05:00
Jenkins for ownCloud
37606dab4b
[tx-robot] updated from transifex
2015-01-10 01:25:25 -05:00
Markus Goetz
f9b98d6d1d
OS X: Fix exclude file install
2015-01-09 14:38:27 +01:00
Klaas Freitag
786a877986
SocketAPI: Some cleanups plus added some consts
2015-01-09 11:44:01 +01:00
Jenkins for ownCloud
b637ae1e53
[tx-robot] updated from transifex
2015-01-09 04:26:16 -05:00
Jenkins for ownCloud
cc8a54d314
[tx-robot] updated from transifex
2015-01-09 01:25:28 -05:00
Daniel Molkentin
c86d8e5acf
Clean up BSD support patch
2015-01-08 22:40:47 +01:00
Daniel Molkentin
4a819026df
Merge pull request #2634 from ryo-on/netbsd-support
...
Support NetBSD like FreeBSD or Linux.
2015-01-08 22:35:44 +01:00
Olivier Goffart
7671ae8df7
Application: Initialize the folderman after we checked for existance
...
So we don't start the SocketAPI if we are going to quit.
We also do not log any message anymore before we install the hooks
Should solve #2666
2015-01-08 16:52:23 +01:00
Daniel Molkentin
94d0c28f69
Merge pull request #2629 from owncloud/accountstate
...
Refactor Account in preparation for multi account feature
2015-01-08 15:39:09 +01:00
Daniel Molkentin
df555d5321
Merge remote-tracking branch 'origin/master' into accountstate
...
Conflicts:
src/cmd/cmd.cpp
2015-01-08 15:38:41 +01:00
Daniel Molkentin
c3468b7ed6
Merge remote-tracking branch 'origin/master' into accountstate
...
Conflicts:
src/gui/owncloudsetupwizard.cpp
src/gui/owncloudsetupwizard.h
src/libsync/propagatedownload.cpp
src/libsync/propagatedownload.h
2015-01-08 15:33:39 +01:00
Olivier Goffart
bbf0e7c0a5
owncloudcmd: add --unsyncedfolders to test selective sync
2015-01-08 15:27:02 +01:00
Daniel Molkentin
3f5c1d2ade
Merge pull request #2678 from chrodan/master
...
Hide Ignored files in context menu
2015-01-08 14:29:36 +01:00
Daniel Molkentin
dd063d0207
Add hack to make old themes work
2015-01-08 14:21:58 +01:00
Christoph Dann
309ff2997c
potential fix for #1865
...
Do not show ignored files in context menu
2015-01-08 11:42:14 +01:00
Daniel Molkentin
8e8ca97eec
Fix build
2015-01-08 09:42:26 +01:00
Jenkins for ownCloud
b734958ab9
[tx-robot] updated from transifex
2015-01-08 01:25:22 -05:00
Daniel Molkentin
51d7559a2c
Simplify checkDowngradeAdvised logic
...
Also, show() and back() belong into slotConnectionCheck only
2015-01-07 18:22:44 +01:00
Daniel Molkentin
5c4f706fe4
Setup Wizard: Make sure to reset auth type when URL changes
2015-01-07 18:01:18 +01:00
Daniel Molkentin
7ac32a19b5
Do not show the HTTP-reconnect popup when its not warranted
...
Fixes usability issues in the workaround of #2607
2015-01-07 18:01:11 +01:00
Daniel Molkentin
6e4da53e31
Merge pull request #2638 from owncloud/add-slash-as-ignored-character
...
fix link and add slash as bad character
2015-01-07 15:36:09 +01:00
Olivier Goffart
8e3dbcb7c0
SocketAPi: use absoluteFilePath unstead of canonicalFilePath
...
Because canonicalFilePath is way too slow.
Issue #2671
2015-01-07 14:37:05 +01:00
Jenkins for ownCloud
5287984307
[tx-robot] updated from transifex
2015-01-07 01:25:23 -05:00
Jenkins for ownCloud
5539f1d498
[tx-robot] updated from transifex
2015-01-06 02:06:11 -05:00
Jenkins for ownCloud
e8cce4d1a1
[tx-robot] updated from transifex
2015-01-06 01:25:30 -05:00
Olivier Goffart
ab0bc75e43
PropagateUploadFileQNAM::slotUploadProgress: Fix inverted condition
...
( Apply this commit 2d8053a9df )
2015-01-05 17:32:12 +01:00
Olivier Goffart
2d8053a9df
Dolphin plugin for KF5
2015-01-05 17:23:36 +01:00
Markus Goetz
c4dd64940e
Update VERSION.cmake
2015-01-05 15:47:27 +01:00
Olivier Goffart
414ac5433d
Merge branch '1.7'
...
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
2015-01-05 14:40:53 +01:00
Olivier Goffart
b2c01ffe21
SyncEngine: Show an error when a file name is not encoded with valid UTF-8
...
... instead of uploading the file with replacement character, and asserting
on the next sync.
Issue #2649
If the file or folder on the file system has a name with invalid UTF-8,
We would convert the name to utf-8, and the conversion would result in
replacement character placeholder. And we would upload that file on the server
with that name, and save it with this name on the database.
Fix this issue by showing an error to the user for invalid files.
2015-01-05 13:54:31 +01:00
Olivier Goffart
517dea6958
accountsettings: Use right palette when using reversed palette
...
Issue #2654
The problem is that the WindowsVistaStyle does something wierd with the palette
when drawing the text, and we should do the same then.
2015-01-05 12:17:05 +01:00
Jenkins for ownCloud
225e6c6b9f
[tx-robot] updated from transifex
2015-01-05 01:25:21 -05:00
Jenkins for ownCloud
1dd4fecffb
[tx-robot] updated from transifex
2015-01-04 02:06:13 -05:00
Jenkins for ownCloud
5f2645b84a
[tx-robot] updated from transifex
2015-01-04 01:25:22 -05:00
Jenkins for ownCloud
fc4b11e224
[tx-robot] updated from transifex
2015-01-03 01:25:19 -05:00
Jenkins for ownCloud
cf3383dd59
[tx-robot] updated from transifex
2015-01-02 01:25:21 -05:00
Jenkins for ownCloud
ead6ba50e7
[tx-robot] updated from transifex
2015-01-01 01:25:23 -05:00
Carla Schroder
7127b989c6
Update navigating.rst
2014-12-31 14:50:54 -08:00
Carla Schroder
3fc755d92f
Markup fixes
2014-12-31 14:48:17 -08:00
Carla Schroder
0dc43e5211
Markup corrections
2014-12-31 14:46:22 -08:00
Carla Schroder
4ddbb17a11
Update architecture.rst
...
Markup corrections
2014-12-31 14:37:28 -08:00
Carla Schroder
bfe31645ab
Markup fixes
2014-12-31 14:34:45 -08:00
Carla Schroder
09f843727d
Update and correct desktop client manual
...
Conflicts:
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
2014-12-31 14:31:35 -08:00
Carla Schroder
191a6b7d2b
Merge pull request #2656 from owncloud/clienttweaks
...
Update and correct desktop client manual
2014-12-31 11:29:52 -08:00
Carla Schroder
096511fc89
Update and correct desktop client manual
2014-12-31 11:27:52 -08:00
Jenkins for ownCloud
85687ce4a2
[tx-robot] updated from transifex
2014-12-31 01:25:23 -05:00
Carla Schroder
a6bfb23d20
Update troubleshooting.rst
...
Markup corrections
2014-12-30 18:41:50 -08:00
Carla Schroder
c2f3413dc5
Merge pull request #2652 from RealRancor/fix_typos
...
Fixed typos in docs
2014-12-29 13:41:22 -08:00
Carla Schroder
755daeb024
Update troubleshooting.rst
...
More markup fixes
2014-12-29 10:09:42 -08:00
Carla Schroder
26233ac078
Update troubleshooting.rst
...
Markup fixes
2014-12-29 10:07:52 -08:00
RealRancor
2ee2876855
Fixed typos in docs
2014-12-29 18:11:12 +01:00
Roeland Jago Douma
ee2e6e5dce
Also allow sharing if we only sync a part
2014-12-28 20:13:11 +01:00
Roeland Jago Douma
facb6b2e81
Check box public link now works multiple times
...
When deleting a share (public link) and recreating it we need to store the new
id.
2014-12-28 20:13:11 +01:00
Roeland Jago Douma
ec3c83c0c9
Minor sharedialog.ui fixes
2014-12-28 20:13:10 +01:00
Roeland Jago Douma
0ad4fb7273
Create valid poststring
2014-12-28 20:13:10 +01:00
Roeland Jago Douma
763d5f67cd
Some error checking on SHARE sockeAPI command
2014-12-28 20:13:10 +01:00
Roeland Jago Douma
b7d4c997a3
Fix rebase of branch
2014-12-28 20:13:10 +01:00
Alfie "Azelphur" Day
bd7f45e398
Everything works now, albeit without error checking.
2014-12-28 20:13:10 +01:00
Alfie "Azelphur" Day
748440ced3
Initial push for filebrowser integration, not finished yet but it's a start :)
2014-12-28 20:13:10 +01:00
Carla Schroder
5c7795bb63
Merge pull request #2646 from owncloud/notefix
...
Markup correction
2014-12-26 08:18:57 -08:00
Carla Schroder
f7ebd2e793
Markup correction
2014-12-26 08:17:15 -08:00
Jenkins for ownCloud
9298891d00
[tx-robot] updated from transifex
2014-12-25 01:25:22 -05:00
Jenkins for ownCloud
3a1dc6f23e
[tx-robot] updated from transifex
2014-12-24 01:25:22 -05:00
Morris Jobke
e250153204
fix link and add slash as bad character
2014-12-23 11:25:55 +01:00
Daniel Molkentin
a2e5a6628d
v1.7.1
2014-12-22 11:38:07 +01:00
Daniel Molkentin
6b3278cd8e
Amend and edit ChangeLog for 1.7.1
2014-12-22 11:38:07 +01:00
Ryo ONODERA
16c4864e67
Support NetBSD like FreeBSD or Linux.
2014-12-21 23:00:56 +09:00
Jenkins for ownCloud
11f225aada
[tx-robot] updated from transifex
2014-12-21 01:25:21 -05:00
Roeland Jago Douma
cd8affc255
Resepct theming when no syncs are configure
2014-12-19 15:08:49 +01:00
Roeland Jago Douma
8677fb18bb
Manged folder list in the tray icon is now sorted
...
We are using a QHash to store all the folder objects. This does not allow for
easy sorting and looks weird to the user. Now they are first inserted into a
temp QMap to sort them properly.
2014-12-19 13:59:50 +01:00
Jenkins for ownCloud
8979981553
[tx-robot] updated from transifex
2014-12-19 01:25:31 -05:00
Christian Kamm
4fa212c43b
CSync callbacks: Don't use global account.
2014-12-18 15:39:51 +01:00
Christian Kamm
a9da5ebff6
Wizard: Sometimes preserve folders when folder config is skipped.
...
* When folder config is used, other folder definitions are always
removed.
* Fix a bug with the wizard becoming stuck when 'skip folder config'
is used.
2014-12-18 15:39:51 +01:00
Christian Kamm
38ebfec1fb
Use global Account/AccountState less.
...
* Use a shared pointer to Account everywhere to ensure
the instance stays alive long enough for a sync to terminate
* Folder is now tied to an AccountState
* SyncEngine and OwncloudPropagator tie to an Account and use that
for all jobs they run
Issue: Since the setup wizard currently always replaces the
account, it will always wipe all folder definitions, even when
the actual changes to the account were minor.
2014-12-18 15:39:51 +01:00
Christian Kamm
6c7acd585e
Account: Split into libsync/Account and gui/AccountState.
...
This allows all the account state information to live in gui
while the sync-relevant data stays in libsync.
I also moved quotainfo to gui since it depends on the account state.
2014-12-18 15:39:51 +01:00
Olivier Goffart
e8efaa5ed8
Direct download URL: Fix resuming
...
The server might support resuming, so don't always erase the temporary file
and pass the startSize, so the temporary file will be remove if the server
does not support it after all (because it is not sending the "bytes" header
Also pass the expected etag for consistency even if it's not used in this case.
2014-12-18 12:13:12 +01:00
Jenkins for ownCloud
5a83b30303
[tx-robot] updated from transifex
2014-12-18 01:25:29 -05:00
Daniel Molkentin
986b23856f
Make setup page usable from shibboleth
...
Second patch to address #2607
2014-12-17 18:13:59 +01:00
Olivier Goffart
96872e2b3b
Download: When direct URL don't work, retry through webdav
2014-12-17 14:28:13 +01:00
Daniel Molkentin
42ffed3f57
Wizard: Show server errors when coming from shibboleth
...
The wizard needs to be restored and rewound to the first page
First patch to address #2607
2014-12-17 14:24:07 +01:00
Christian Kamm
a006c6962c
Move account state related logic into Account.
...
The account state is now managed mostly by the Account itself
instead of through Application. The gui can still control whether
an account is signed out or not.
2014-12-17 12:01:10 +01:00
Jenkins for ownCloud
cc3f7995fb
[tx-robot] updated from transifex
2014-12-17 02:06:12 -05:00
Jenkins for ownCloud
3f399225fa
[tx-robot] updated from transifex
2014-12-17 01:25:22 -05:00
Markus Goetz
dc5d0e367c
OS X: Improve installer
...
This should mostly fix #2105 and #2044
2014-12-16 19:08:12 +01:00
Olivier Goffart
a2803e4f5f
csync_update: do not force writing on the db for directory with a changed date
...
Fixes #2584
2014-12-16 13:02:32 +01:00
Olivier Goffart
b1d392e415
Download job: allow redirect on direct download link
...
Issue #2614
2014-12-16 11:51:25 +01:00
Olivier Goffart
cbf00e9378
Connection Validator: Fix connection warning
...
The timeout signal does not exist.
Timeout is handled as a normal network arror.
2014-12-16 11:48:15 +01:00
Olivier Goffart
414838cae8
Settings dialog: remove the code that was updating the account icon
...
I just wanted to fix the warning:
QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108
It turns out we don't need anymore the signal or any of the code that
was updating the account icon in the settings dialog since it we now have a fixed icon
2014-12-16 11:36:52 +01:00
Olivier Goffart
3ee14164db
network jobs: Refactor the redirect handling in AbdtractNetworkJob
...
Move the redirect handling from CheckServerJob to AbstractNetworkJob, so we can
later use it in any job (in preparation for task #2614 )
2014-12-16 11:27:02 +01:00
Daniel Molkentin
63712de170
1.7.1 rc1
2014-12-16 07:30:23 +01:00
Jenkins for ownCloud
43673d6694
[tx-robot] updated from transifex
2014-12-16 01:25:24 -05:00
Markus Goetz
f195648b90
OS X: Fix overlay icons
...
a3e7f513e6 broke them.
2014-12-15 11:34:44 +01:00
Jenkins for ownCloud
06f77acfa1
[tx-robot] updated from transifex
2014-12-15 01:25:23 -05:00
Jenkins for ownCloud
f04a693fbe
[tx-robot] updated from transifex
2014-12-14 01:25:21 -05:00
Jenkins for ownCloud
c012711763
[tx-robot] updated from transifex
2014-12-13 01:25:29 -05:00
Klaas Freitag
c6daa8e59b
Overlays: In case of folders, make sure to append slashes at end.
...
This fixes #2373
2014-12-12 16:38:07 +01:00
Klaas Freitag
7cc6c1a10f
Theme: Add a missing dot.
2014-12-12 13:37:02 +01:00
Klaas Freitag
7f73cc1694
Theme: split the about string apart to have small translation units.
2014-12-12 13:33:38 +01:00
Jenkins for ownCloud
87973ac692
[tx-robot] updated from transifex
2014-12-12 01:25:26 -05:00
Daniel Molkentin
9a13ec736d
Fix OS X compilation
2014-12-11 15:08:13 +01:00
Christian Kamm
1a3041690f
ConValidator: Simplify and cleanup.
...
* This way using it with multiple accounts will be easier.
* Timeouts on the authed requests are handled.
2014-12-11 14:48:01 +01:00
Christian Kamm
84e5ad7346
FolderMan: Delete old journal file when adding folder. #2606
2014-12-11 12:28:01 +01:00
Christian Kamm
4559bb5553
Fix counting of affected files. #1132
...
* Also ensure the maximum is always >= the current value.
* Take care to handle the ULLONG_MAX value that's sometimes used
as _completedFileCount.
2014-12-11 11:33:42 +01:00
Jenkins for ownCloud
2d51a78ee7
[tx-robot] updated from transifex
2014-12-11 01:25:23 -05:00
Carla Schroder
95a380ae9e
fix typos
2014-12-10 08:24:12 -08:00
Christian Kamm
d8c59fcb73
Use connection validator to ping the server. #2485
...
* Stop the quota job from having an effect on account status
as it can sometimes take a long time to reply. See #2485 and
owncloud/core#12744 .
* Instead of indirectly using the quota job, use the connection
validator to regularly ping the server with a basic PROPFIND for
'getlastmodified' on /.
This request was usually fast for users even when the quota PROPFIND
was slow.
2014-12-10 13:40:11 +01:00
Christian Kamm
8dff17d78b
Rename: Fix icon location in theme.qrc.
2014-12-10 13:12:06 +01:00
Christian Kamm
53d5de685c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
Jenkins for ownCloud
f0ce8b8fd4
[tx-robot] updated from transifex
2014-12-10 01:25:29 -05:00
Daniel Molkentin
aeb1f10621
NSIS: Reload shell after registering shellextension, use blackslashes
...
It also registers and unregisters the shell extensions properly and
forces explorer to reload/unload the DLLs so they can be removed.
This obsoletes #2377 .
Fixes #2487
Fixes #2377
2014-12-09 23:52:07 +01:00
Olivier Goffart
a3e7f513e6
SocketAPI: use the canonical path
...
Issue #2591
2014-12-09 20:48:51 +01:00
Klaas Freitag
8b63a6f29b
Adding changelog
2014-12-09 20:27:38 +01:00
Klaas Freitag
133a8ec225
Added a fixme for an edge case detected by QuickCheck.
2014-12-09 17:02:51 +01:00
Klaas Freitag
131747ea4b
Bumped version to 1.7.1 beta1
2014-12-09 15:25:37 +01:00
Daniel Molkentin
e982790ad5
Mirall--
2014-12-09 09:27:47 +01:00
Jenkins for ownCloud
a7f1f886d3
[tx-robot] updated from transifex
2014-12-09 01:25:28 -05:00
Daniel Molkentin
d034f10af3
Fix compilation
2014-12-08 19:25:57 +01:00
Daniel Molkentin
a2b817f0c0
mirall.qrc -> client.qrc
2014-12-08 18:00:29 +01:00
Daniel Molkentin
bce6d44e06
README: Fix typo
2014-12-08 17:57:09 +01:00
Daniel Molkentin
d5f2c36abd
Mirall -> (Desktop) Client
2014-12-08 17:54:32 +01:00
Daniel Molkentin
d86b3f04b1
Merge branch 'master' into rename_client
2014-12-08 17:44:04 +01:00
Klaas Freitag
72a90199db
Wizard: Removed superflous text, as it is already in the header.
...
This fixes mirall#2358
2014-12-08 11:12:15 +01:00
Jenkins for ownCloud
e69702799f
[tx-robot] updated from transifex
2014-12-08 01:25:21 -05:00
Jenkins for ownCloud
118aead9b9
[tx-robot] updated from transifex
2014-12-07 01:25:25 -05:00
Klaas Freitag
49bb861045
Removed useless debug output
2014-12-06 12:37:53 +01:00
Klaas Freitag
1d6661e7e4
Fix the number of displayed items in progress display for removes.
...
This fixes mirall#1132
A variable that counts the affected items of the propagator operation
done on a item was added to SyncFileItem. Usually that is 1 because
most operations affect only the item itself. But for removes, the
number can be higher for directories (one remove removes a whole tree).
Some rearrangements were needed.
2014-12-06 12:31:45 +01:00
Jenkins for ownCloud
a43173fa90
[tx-robot] updated from transifex
2014-12-06 01:25:23 -05:00
Jenkins for ownCloud
d2a24b5186
[tx-robot] updated from transifex
2014-12-05 01:25:29 -05:00
Christian Kamm
40f44c2389
DB: Delete corrupt database. #2547
...
* Also use readonly DB access for SocketAPI.
2014-12-04 15:35:55 +01:00
Olivier Goffart
441b5bd1dc
Setup Wizard: remove all folder definition before starting a new sync
...
Issue #1989
2014-12-04 15:18:27 +01:00
Christian Kamm
dc2f0d59cb
FolderWizard: Clean up naming of 'add folder' button. #2371
2014-12-04 10:47:26 +01:00
Christian Kamm
4dcfacf2d5
Fix compile. :/
2014-12-04 09:59:24 +01:00
Christian Kamm
b7485106ef
NetworkJobs: Set timeout to 5 minutes everywhere.
2014-12-04 09:54:17 +01:00
Christian Kamm
f82893496b
Fix typo.
2014-12-04 09:54:15 +01:00
Christian Kamm
c418e58f88
Etag job scheduling: Silence warnings, make prettier.
2014-12-04 09:52:13 +01:00
Jenkins for ownCloud
054e557531
[tx-robot] updated from transifex
2014-12-04 02:06:11 -05:00
Jenkins for ownCloud
3020dc75ab
[tx-robot] updated from transifex
2014-12-04 01:25:22 -05:00
Klaas Freitag
9ea359de52
GUI: Check if there are sync folders configured and how proper msg.
...
This fixes #2264
2014-12-03 17:11:42 +01:00
Klaas Freitag
c5daf7d1b6
Mac installer: Make the installer background brandable for MacOSX.
2014-12-03 14:37:59 +01:00
Christian Kamm
b7d7f424c5
FolderMan: only touch _currentSyncFolder when done #2407
...
Also simplity terminateSyncProcess() to always terminate the
*current* sync run. Only one can be running at a time anyway.
2014-12-03 13:46:37 +01:00
Daniel Molkentin
e1fa6f1a0d
fix_frameworks is no longer required
...
This is taken care of by macdeployqt.py, which is
run during "make install"
2014-12-03 13:41:12 +01:00
Olivier Goffart
a23e0fef8d
Update binary submodule
2014-12-03 11:18:01 +01:00
Olivier Goffart
0fd0b08c09
Windows shell integration: Always release the lock before calling win32 API
...
May help for 2515
2014-12-03 09:11:38 +01:00
Jenkins for ownCloud
ce1690b450
[tx-robot] updated from transifex
2014-12-03 01:25:27 -05:00
Markus Goetz
46bd473664
Folders: Move ETag check scheduling to FolderMan
...
Only 1 check per time is able to run now.
For #2553
Might improve #2479 #2485 #2534
2014-12-02 22:32:54 +01:00
Daniel Molkentin
6030fec6cb
Fix typo
2014-12-02 15:08:15 +01:00
Daniel Molkentin
b7323dc403
Merge branch 'master' into rename_client
2014-12-02 14:33:28 +01:00
Daniel Molkentin
c6d74d6c12
Fix typo
2014-12-02 14:33:17 +01:00
Daniel Molkentin
a42709f814
Namespace fixes
2014-12-02 14:20:13 +01:00
Daniel Molkentin
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
Olivier Goffart
8fbb55a0c8
Wizard: Fix escaping of error message.
...
An url can contains % signs, so if it does, the errors formating was wrong
because of the use of QString::args
Also, the error is in html format, and we need to let the message box know
that, otherwise we will just see <br/>
2014-12-02 10:22:46 +01:00
Olivier Goffart
f046a7e7fe
Wizard: Attempts to really close the database when starting the backup
...
Still for issue #1989
2014-12-02 10:22:46 +01:00
Markus Goetz
92ce707268
Bandwidth: Fix issue with removed download jobs
...
The measuring broke when a job that is currently measuring was removed.
2014-12-02 09:37:48 +01:00
Daniel Molkentin
3f5887cc03
Merge pull request #2565 from owncloud/accountsettings_itemsontop
...
Refactor generic settings dialog
2014-12-01 15:01:45 +01:00
Olivier Goffart
fb3f5d86cf
Fix compilation after merge
2014-12-01 14:41:39 +01:00
Olivier Goffart
512492bf30
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/propagatedownload.cpp
2014-12-01 14:37:47 +01:00
Olivier Goffart
2477c3914e
csync_update: Ignore a difference of time of exactly one hour
...
Issue #2438
2014-12-01 13:53:30 +01:00
Daniel Molkentin
afee1ee1c0
Make all ptr-based members either const or check for their existance
2014-12-01 13:08:49 +01:00
Daniel Molkentin
f233593909
Add missing accounts icon
2014-12-01 13:07:44 +01:00
Olivier Goffart
3253cc38b2
Propagator upload: Mark error while opening the file as SoftError
...
Because otherwise a lot of error are shown to the user when
the user deletes a directory that is syncing
Task #1981
2014-12-01 12:22:52 +01:00
Olivier Goffart
b154e1baa1
Nautilus shell integration: Use fallback when XDG_RUNTIME_DIR is not defined
...
Same fallback as in Qt5
Task #2477
2014-12-01 12:06:09 +01:00
Daniel Molkentin
714599aeaa
Refactor generic settings dialog
...
- move items on top like on Mac OS (right is free for accounts now)
- The account icon no longer reflects the current status (in prep for multi-account)
2014-12-01 11:37:06 +01:00
Jenkins for ownCloud
119a9983a9
[tx-robot] updated from transifex
2014-11-30 01:25:22 -05:00
Jenkins for ownCloud
8866494c94
[tx-robot] updated from transifex
2014-11-29 02:06:10 -05:00
Jenkins for ownCloud
2e06b4be66
[tx-robot] updated from transifex
2014-11-29 01:25:23 -05:00
Jenkins for ownCloud
0ec2e71f58
[tx-robot] updated from transifex
2014-11-28 01:25:25 -05:00
Olivier Goffart
fc3a8b944e
Propagator: Don't forget to mark the direcotry as finished if its first job fails
...
Otherwise we would go ahead and propagate the content of the directory
2014-11-27 15:36:13 +01:00
Olivier Goffart
2ed2ef3b28
Propagator QNAM: Fix resuming
...
We forgot to account the fact that we could have been resuming when
comparing the size of the Content-lenght to the size of the temporary file
2014-11-27 14:50:49 +01:00
Markus Goetz
a3c5da90d2
Update issue_template.md
2014-11-27 13:10:14 +01:00
Olivier Goffart
e7e91b6931
Revert "Folder: Don't blindly trigger sync on first EtagJob result"
...
We need to do a sync even if the etag was empty because we do not know
if this is because the etag really changed or because it was new.
Also, some part of the code rely on this fact to schedule a sync.
The fact that there is two sync with 30 sec at the beginning is not
a big problem, because we also need to do the sync the put the directory
etag in the db.
This reverts commit 1c001ee138 .
2014-11-27 12:50:36 +01:00
Olivier Goffart
1f9d02e7fa
Shibboleth: Fix our implemtnation of CookieJar::deleteCookie
...
It was deleting too many cookies.
That function is virtual in Qt5 and is used when adding cookie.
But some Shibboleth have several cookies with the same name, and we need to keep them.
Our implementaiton was meant to delete all the shiboleth cookies when we want to log out
2014-11-27 12:26:59 +01:00
Markus Goetz
0895ca3e4a
Update issue_template.md
2014-11-27 12:09:06 +01:00
Jenkins for ownCloud
2ee70db7cd
[tx-robot] updated from transifex
2014-11-26 01:25:24 -05:00
Olivier Goffart
c9c1547813
Compile with Qt4
...
(QSharedPointer::reset is only in Qt5)
2014-11-25 16:24:47 +01:00
Olivier Goffart
9a8c868793
Propagator upload: Remove debug output
2014-11-25 15:34:06 +01:00
Olivier Goffart
13ec5da84e
neon jobs: Start them in their thread.
2014-11-25 15:08:32 +01:00
Klaas Freitag
3e34d000f2
Propagator: Add the chunk size to PUT requests.
2014-11-25 10:21:33 +01:00
Olivier Goffart
12203461f0
Import the dolphin plugin
2014-11-24 15:06:08 +01:00
Olivier Goffart
a337564864
shell_integration/windows/OCShellExtensions/OCUtilTest: remove
...
We do not need it anymore
2014-11-24 14:53:37 +01:00
Olivier Goffart
734db6f932
propagate Upload: Let the poll job count for a job
...
In order to avoid that there are many concurrent poll jobs that takes
all the QNAM channel and causes timeouts of queued jobs
2014-11-24 13:33:13 +01:00
Olivier Goffart
d76e3c0488
Parallel chunk upload: abort all chunks if one of them errors out
2014-11-24 12:05:25 +01:00
Olivier Goffart
c0de20dda0
UploadDevice: reduce debug verbosity
2014-11-24 12:05:25 +01:00
Markus Goetz
79c37f9fe4
Poll Jobs: Properly use DB index
...
Why do we sometimes use 0-based, sometimes 1-based indices?
2014-11-24 11:35:39 +01:00
Jenkins for ownCloud
7f520a6f28
[tx-robot] updated from transifex
2014-11-24 01:25:22 -05:00
Jenkins for ownCloud
23f72ecf7b
[tx-robot] updated from transifex
2014-11-23 01:25:22 -05:00
Jenkins for ownCloud
8c57e7621b
[tx-robot] updated from transifex
2014-11-22 01:25:37 -05:00
Olivier Goffart
c460b3f3be
Bandwith manager: It needs do be initialiazed after the limits of the propagator
2014-11-21 16:55:46 +01:00
Markus Goetz
1c001ee138
Folder: Don't blindly trigger sync on first EtagJob result
...
For #2352
2014-11-21 16:47:15 +01:00
Markus Goetz
fab82107bb
OS X: Don't use hardcoded name in packages file
2014-11-21 16:34:30 +01:00
Olivier Goffart
78362af168
Compile with TOKEN_AUTH_ONLY
...
(QtGui is not included in that case)
2014-11-21 12:15:41 +01:00
Olivier Goffart
1c58b75ac2
Merge branch '1.7'
2014-11-21 11:08:20 +01:00
Olivier Goffart
41568c885d
Propagator: only check the content-lenght if it is there
...
If content-lenght is 0, don't chack it is the size we recieved.
It can be zero when using HTTP chunk encoding.
Also do not remove the temporary file so it can be re-used on the next sync
and ask for a new sync immediatly to re-do the sync.
Fixup the fix to task #2528
2014-11-21 11:03:14 +01:00
Jenkins for ownCloud
dba2efe367
[tx-robot] updated from transifex
2014-11-21 02:52:45 -05:00
Christian Kamm
e3b07f569a
FolderWatcherTest: Use Utility::usleep.
2014-11-21 08:21:36 +01:00
Klaas Freitag
65a307970b
Propagator: Compare the actual file size with the request content length
...
The values must match. Otherwise the request did succeed, but the file
was not downloaded completely.
This fixes https://github.com/owncloud/mirall/issues/2528
2014-11-20 18:49:34 +01:00
Christian Kamm
3e3ca14b4c
Print ssl library version only on Qt >=5.0.0.
2014-11-20 13:46:44 +01:00
Christian Kamm
8b45d1c928
Sync: Change force-sync interval to 2h everywhere. #2297
2014-11-20 13:38:32 +01:00
Christian Kamm
0fe7a69b39
FolderWatcher: Detect own changes. #2297
2014-11-20 13:16:29 +01:00
Christian Kamm
6d09f1b6c0
Folder watcher now reports changing paths instead of dirs.
2014-11-20 12:51:16 +01:00
Christian Kamm
1ada20ac7b
Linux folderwatcher: Get full path of changed file. #2297
2014-11-20 12:42:59 +01:00
Christian Kamm
d04eedeb8d
OSX: Trust the file watcher. #2297
...
* Use a bigger default force sync interval (2h)
* Allow the file watcher to schedule a sync while a sync for
the same file is running.
2014-11-20 12:42:59 +01:00
Christian Kamm
f275002ebe
Merge branch '1.7'
2014-11-20 12:41:06 +01:00
Christian Kamm
d4e0941c27
Windows filewatcher: switch to ReadDirectoryChangesW.
...
Based on danimo's #2454 fix for #2455 and related to #2297 .
2014-11-20 12:36:17 +01:00
Christian Kamm
9dc57359b9
csync db files: Hide after some commit/transactions. #2461
...
The shm and wal files are only created later.
2014-11-20 12:30:04 +01:00
Jenkins for ownCloud
06b31d7cf0
[tx-robot] updated from transifex
2014-11-20 01:25:20 -05:00
Christian Kamm
4d7b8bdb25
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
OWNCLOUD.cmake
test/CMakeLists.txt
test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
Christian Kamm
421a8cc6b7
Windows: Make unit tests compile.
2014-11-19 14:18:37 +01:00
Christian Kamm
3a448fda91
Windows mingw32: Fix finding of windres binary.
2014-11-19 14:16:56 +01:00
Christian Kamm
3706c76622
useLegacyJobs: Fix logic.
2014-11-19 10:31:42 +01:00
Olivier Goffart
9a6710e330
Propagator: add a bit of documentation comments
2014-11-18 17:54:53 +01:00
Olivier Goffart
1113980b20
Propagator: Change the scheduler
...
It still needs to be a bit optimized, but it allows to paralelized jobs between directories
(this is required to paralelize the mkcol)
2014-11-18 17:35:31 +01:00
Markus Goetz
e890c4ae1b
OS X: Move previous fix to proper location
2014-11-17 18:30:32 +01:00
Markus Goetz
7ada625161
OS X: Fix packages file
2014-11-17 17:48:29 +01:00
Olivier Goffart
7d8dd54b19
Merge pull request #2504 from owncloud/revert-2454-fswatcher_readdirectorychanges_port
...
Revert "WiP: switch to ReadDirectoryChangesW"
2014-11-17 11:11:39 +01:00
Olivier Goffart
0b275c4933
Revert "WiP: switch to ReadDirectoryChangesW"
2014-11-17 11:11:13 +01:00
Olivier Goffart
e529bbed90
Merge pull request #2454 from owncloud/fswatcher_readdirectorychanges_port
...
switch to ReadDirectoryChangesW
2014-11-17 09:43:29 +01:00
Jenkins for ownCloud
39e97779ec
[tx-robot] updated from transifex
2014-11-17 01:25:22 -05:00
Jenkins for ownCloud
629d46ca25
[tx-robot] updated from transifex
2014-11-16 01:25:22 -05:00
Daniel Molkentin
c5a35ad56f
Merge pull request #2499 from owncloud/revert-2412-nsis_shortcuts_all_users
...
Revert "Install shortcuts for all users"
2014-11-15 21:05:05 +01:00
Daniel Molkentin
1e94161ec1
Revert "Install shortcuts for all users"
2014-11-15 21:04:33 +01:00
Daniel Molkentin
6f78ff200c
Merge pull request #2412 from owncloud/nsis_shortcuts_all_users
...
Install shortcuts for all users
2014-11-15 20:09:29 +01:00
Daniel Molkentin
02e96484a8
Install shortcuts for all users
2014-11-15 17:07:39 +01:00
Jenkins for ownCloud
67b0e4dd15
[tx-robot] updated from transifex
2014-11-15 01:25:23 -05:00
Olivier Goffart
a3b21022af
new bandwith limiting: Do a test on the Qt version to activate it
...
We need Qt 5.3.3.
If the compiled qt version is Qt 5 but smaller than Qt 5.3.3, do a runtime
check.
OWNCLOUD_NEW_BANDWIDTH_LIMITING is still there for a special setup in which
we patch Qt with the patches
2014-11-14 17:29:28 +01:00
Olivier Goffart
ad92e7b888
Move UploadDevice to the right header
2014-11-14 16:40:13 +01:00
Olivier Goffart
c73522de2e
Remove ChunkBlock
...
It is not in used
2014-11-14 16:39:39 +01:00
Olivier Goffart
14f5e8e32e
Move all the neon code to the _legacy files
2014-11-14 16:13:50 +01:00
Olivier Goffart
f3797abecf
Fix the PropfindJob
...
-the namespace mangling was wrong
-And the way we read the reply did not work
2014-11-14 15:03:48 +01:00
Markus Goetz
5b7ec19778
SyncEngine: Also output the neon version
2014-11-14 15:02:09 +01:00
Jenkins for ownCloud
e71c617bfd
[tx-robot] updated from transifex
2014-11-14 01:25:20 -05:00
Olivier Goffart
1310bef528
Port the propagate mkdir to QNAM
...
This way we can make it parallel
2014-11-13 18:57:07 +01:00
Jenkins for ownCloud
f1432992d3
[tx-robot] updated from transifex
2014-11-13 01:25:30 -05:00
Markus Goetz
348b7bf4eb
SyncEngine: Output versions used
2014-11-12 09:21:37 +01:00
Markus Goetz
30479cc5a2
Wizard: Properly show error message
2014-11-12 09:21:37 +01:00
Jenkins for ownCloud
1ba1bdec2d
[tx-robot] updated from transifex
2014-11-12 01:25:29 -05:00
Daniel Molkentin
8993af4378
Bump version in readme
2014-11-12 00:32:28 +01:00
Daniel Molkentin
7246011b62
Merge pull request #2459 from owncloud/typo
...
fix typo
2014-11-12 00:09:22 +01:00
Daniel Molkentin
058d868edd
Merge remote-tracking branch 'origin/1.7'
2014-11-12 00:09:00 +01:00
Daniel Molkentin
9a58d0e559
Merge pull request #2469 from owncloud/fixing_indent
...
Fixing indent and make nautilus script python3 compatible.
2014-11-12 00:08:46 +01:00
Daniel Molkentin
281c0e1553
Merge branch 'master' into rename_client
...
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
2014-11-12 00:07:59 +01:00
Daniel Molkentin
52a63a65ef
Merge pull request #2110 from owncloud/crashreporter
...
Implement CrashReporter using libcrashreporter-qt
2014-11-12 00:01:58 +01:00
Daniel Molkentin
cdac8d56d5
Merge remote-tracking branch 'origin/master' into crashreporter
...
Conflicts:
src/libsync/utility.cpp
src/libsync/utility.h
2014-11-11 23:53:38 +01:00
Olivier Goffart
b04cb23ed5
t8.pl: fix the test for me
...
On localhost, the other file (the bigger one) was downloaded first
2014-11-11 16:38:20 +01:00
Olivier Goffart
7b4be209aa
MOVE: fix moving with special character.
...
The Destination header need to be %-encoded
2014-11-11 16:27:06 +01:00
Olivier Goffart
c712b7c46c
Parallel MOVE by porting the job to qnam
2014-11-11 16:09:01 +01:00
Olivier Goffart
22c6892870
DELETE: Error out if the HTTP code is not 204
2014-11-11 14:32:25 +01:00
Olivier Goffart
134650eb44
Parallel DELETE
2014-11-11 13:19:29 +01:00
Olivier Goffart
506ba022f1
Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp
2014-11-11 12:17:10 +01:00
Klaas Freitag
fc6d572a6c
Make compile against Qt4
2014-11-11 10:10:46 +01:00
Jenkins for ownCloud
e6eb91c5f9
[tx-robot] updated from transifex
2014-11-11 02:06:12 -05:00
Jenkins for ownCloud
ced986e010
[tx-robot] updated from transifex
2014-11-11 01:25:22 -05:00
Jenkins for ownCloud
cde9b3ac85
[tx-robot] updated from transifex
2014-11-10 01:25:22 -05:00
Daniel Molkentin
b54c079766
Adjust issue urls
2014-11-09 23:38:07 +01:00
Daniel Molkentin
2db17a57d2
Fix header names
2014-11-09 23:25:57 +01:00
Daniel Molkentin
a992c5b8d3
Fix build
2014-11-09 23:10:18 +01:00
Daniel Molkentin
58f1a9bb30
Rename: Adjust documentation
2014-11-09 23:09:52 +01:00
Daniel Molkentin
269b59c2ba
More CMake adjustments
2014-11-09 22:58:24 +01:00
Daniel Molkentin
d462c8838f
Adapt and expand README
2014-11-09 22:58:16 +01:00
Daniel Molkentin
1297ac77b9
Fix tests
2014-11-09 22:37:56 +01:00
Daniel Molkentin
d57d3cf1f6
Drop Mirall from strings
2014-11-09 22:35:29 +01:00
Daniel Molkentin
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
Daniel Molkentin
f2eadacf09
Remove "Mirall" from class names
2014-11-09 22:30:29 +01:00
Daniel Molkentin
9ebc41ed6f
Remove "Mirall" from cmake project files
2014-11-09 22:30:05 +01:00
hefee
f9dfdd58df
Fixing indent and make nautilus script python3 compatible.
2014-11-09 16:59:01 +01:00
Jenkins for ownCloud
c9f9388ef6
[tx-robot] updated from transifex
2014-11-09 01:25:21 -05:00
Olivier Goffart
7ae6712d56
Add a few Q_DECL_OVERRIDE
2014-11-08 11:21:48 +01:00
Olivier Goffart
98a283b4ec
Fix clang warnings
2014-11-08 11:21:48 +01:00
Olivier Goffart
d524f6b395
Fix compilation errors after merge
2014-11-08 11:11:05 +01:00
Olivier Goffart
6b716683e2
Merge the long PUT Poll URL feature with the new sql backend
2014-11-08 11:09:50 +01:00
Olivier Goffart
ba2c33af0b
Fix the il branch merge: Move the bandwidthmanager to libsync
2014-11-08 10:52:14 +01:00
Olivier Goffart
de11f602d5
Merge remote-tracking branch 'origin/il'
...
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
2014-11-08 10:48:36 +01:00
Jenkins for ownCloud
b8cb180e4b
[tx-robot] updated from transifex
2014-11-08 01:25:22 -05:00
Volkan Gezer
260c8e0227
fix typo
2014-11-07 17:51:15 +01:00
Daniel Molkentin
e579504181
Merge pull request #2370 from owncloud/icons-overlay-doc
...
Add section on Overlay Icons to 'Using the Synchronization Client'
2014-11-07 16:52:26 +01:00
Daniel Molkentin
7c034b427e
Handle invalid handle & fix an issue found during code review
2014-11-07 14:52:31 +01:00
Jenkins for ownCloud
08868594ae
[tx-robot] updated from transifex
2014-11-07 01:25:32 -05:00
Daniel Molkentin
f25d175b5d
Merge remote-tracking branch 'origin/1.7'
2014-11-06 19:54:20 +01:00
Daniel Molkentin
cc6e548a78
Merge pull request #2419 from owncloud/updater
...
Update and correct doc/autoupdate.rst
2014-11-06 19:53:33 +01:00
Daniel Molkentin
17a4299f74
Fix nautilus python integration
2014-11-06 19:26:43 +01:00
Daniel Molkentin
776f4dc316
v1.7.0
2014-11-06 15:53:17 +01:00
Daniel Molkentin
5db55d9e29
Prettify Changelog
2014-11-06 15:41:23 +01:00
Christian Kamm
5c9564ac08
Add to 1.7 changelog.
2014-11-06 15:31:09 +01:00
Daniel Molkentin
5c5a89c1a4
Revert "Bump binary directory to current master"
...
This reverts commit af4e9c30f5 .
This is consistent with 176413d312 .
2014-11-06 15:21:39 +01:00
Daniel Molkentin
176413d312
Revert "Windows Shell Integration: Show status icon for root folder"
...
This reverts commit 5805ffebec .
There is no good way to fix this on the Mirall side without risk.
Delay until after 1.7.0
2014-11-06 15:18:54 +01:00
Olivier Goffart
b70ecc3dd3
Never overwrite the mtime from the local file system in the db when updating the metadata
...
Attempt to fix #2431
2014-11-06 15:13:10 +01:00
Daniel Molkentin
89670e5ce4
Folderwatcher_win: handle conversion error
2014-11-06 12:54:33 +01:00
Christian Kamm
174e1acbc7
Folder::wipe(): Remove partial downloads and -shm,-wal db files.
2014-11-06 12:49:02 +01:00
Christian Kamm
1f09a24a72
Resync button: Remove partial downloads too. #2445
2014-11-06 12:17:04 +01:00
Christian Kamm
eed91ddf46
Legacy propagator: Don't use mtime retrieved via _fstat64.
...
May be the cause of #2431
2014-11-06 12:16:55 +01:00
Daniel Molkentin
96a7118d05
WiP: switch to ReadDirectoryChangesW
2014-11-06 12:04:33 +01:00
Klaas Freitag
6eec896282
FolderWatcher: Check for hidden outside of loop
2014-11-06 09:23:30 +01:00
Klaas Freitag
a78bb252de
Nautilus shell: Remove some useless logging.
2014-11-06 09:23:30 +01:00
Jenkins for ownCloud
0ba07f19f7
[tx-robot] updated from transifex
2014-11-06 01:25:24 -05:00
Christian Kamm
a49a6bfd88
Logging: Report setModTime failures.
...
Ths may be helpful for #2252 and maybe even #2431 .
2014-11-05 13:20:19 +01:00
Christian Kamm
b87931c0a9
Logging: Print etags, not just result of comparison.
2014-11-05 13:08:53 +01:00
Christian Kamm
9b640d586b
Wizard: Fix local folder warning in advanced setup wizard. #2362
...
The _oldLocalFolder should always be the previously configured
folder, not the one that was most recently chosen on the wizard
page.
2014-11-05 12:10:41 +01:00
Christian Kamm
7440ffc0e6
Download: Fix data loss when rename fails. #2428
2014-11-05 11:00:46 +01:00
Jenkins for ownCloud
63e901cd0b
[tx-robot] updated from transifex
2014-11-05 01:25:23 -05:00
Daniel Molkentin
af4e9c30f5
Bump binary directory to current master
2014-11-04 09:33:04 +01:00
Daniel Molkentin
5805ffebec
Windows Shell Integration: Show status icon for root folder
2014-11-04 09:30:29 +01:00
Jenkins for ownCloud
39bfacf1d5
[tx-robot] updated from transifex
2014-11-04 01:25:23 -05:00
Daniel Molkentin
8d30fc2718
Update binary subrepo to master
2014-11-03 22:51:55 +01:00
Daniel Molkentin
19daff36b0
Windows Overlay: Fix icon refresh
...
The condition for the refresh was inverse of what it should have been.
2014-11-03 20:46:35 +01:00
Daniel Molkentin
c34c8ff358
Windows Overlay: Use FLUSHNOW everywhere to speed up updates
2014-11-03 20:45:38 +01:00
Daniel Molkentin
af68cb6029
Move binary submodule to current master
2014-11-03 11:17:04 +01:00
Jenkins for ownCloud
6b6b212643
[tx-robot] updated from transifex
2014-11-03 01:25:21 -05:00
Jenkins for ownCloud
dd2a71fa8f
[tx-robot] updated from transifex
2014-11-02 01:25:21 -04:00
Jenkins for ownCloud
cd72d133a3
[tx-robot] updated from transifex
2014-11-01 01:25:22 -04:00
Jenkins for ownCloud
d3662d0e34
[tx-robot] updated from transifex
2014-10-31 01:25:27 -04:00
Markus Goetz
cf6219bb6f
NetworkJobs: Improve timeout handling and increase timeout by 5 sec
2014-10-30 11:54:58 +01:00
Christian Kamm
45eeb5065f
Download: Avoid overwriting file with case conflict. #1914
2014-10-30 09:06:53 +01:00
Jenkins for ownCloud
f563eb1f63
[tx-robot] updated from transifex
2014-10-30 01:25:30 -04:00
Carla Schroder
2c1f31cecb
Update autoupdate.rst
...
Corrected configuration file location
2014-10-29 09:56:17 -07:00
Klaas Freitag
ef16c409ef
Merge pull request #2393 from svkurowski/issue-2215
...
Switch monochrome systray icon color depending on systray brightness
2014-10-29 14:54:33 +01:00
Klaas Freitag
1029f9521c
tests: exit t5.pl if running against ownCloud 6
...
t5.pl checks the environment variable SERVER_VERSION and if that equals
"owncloud6" it bails out after a check of the sharing ocs api.
2014-10-29 14:24:36 +01:00
Klaas Freitag
825eca078d
tests: make t1.pl work on jenkins, for that disable a size compare.
2014-10-29 14:01:58 +01:00
Olivier Goffart
1eccfb798f
Add missing license headers
...
Part of #2068
2014-10-29 13:30:46 +01:00
Klaas Freitag
b9b9f3c136
Propagator: Schedule a resync immediately if file is modified during upload
2014-10-29 13:10:56 +01:00
Olivier Goffart
7810da51a8
Propagator: report error when deleting directories
...
Will help to understand why a directory cannot be removed
Will help for #2348
2014-10-29 12:23:48 +01:00
Olivier Goffart
a470138450
Windows Shell Integration: refresh the cache on UPDATE_VIEW
...
Attempt to fix #2383
2014-10-29 11:00:51 +01:00
Christian Kamm
4e20a02fe5
SyncJournalDB: Add filesize column to metadata.
...
* Alter table to include column.
* Make get/set in SyncJournalDB store and load it.
* Make csync recover the stat_t's size member from it.
2014-10-29 09:53:36 +01:00
Markus Goetz
7bad731ad2
CheckServerJob: Guard again null reply
...
Lucia had reported a crash in this function
2014-10-29 09:38:20 +01:00
Jenkins for ownCloud
eeb54290b3
[tx-robot] updated from transifex
2014-10-29 01:25:27 -04:00
Daniel Molkentin
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
Carla Schroder
94be12b9e4
Merge branch 'updater' of https://github.com/owncloud/mirall into updater
2014-10-28 15:01:34 -07:00
Carla Schroder
1862fb77ff
Correct Linux section on disabling update notifications
2014-10-28 14:57:18 -07:00
Markus Goetz
782463589e
ownSql: Also mention filename
2014-10-28 21:50:09 +01:00
Markus Goetz
ff570c4a6b
ownSql: Don't set busy timeout on bad object
2014-10-28 21:46:30 +01:00
Carla Schroder
06b619f0ed
Update autoupdate.rst
...
Typo correction
2014-10-28 12:19:05 -07:00
Carla Schroder
f5cc6cfd07
Fix typos and clean up wording
2014-10-28 11:56:49 -07:00
Carla Schroder
0f5cf00e35
Update The Automatic Updater manual page with current information
2014-10-28 11:52:58 -07:00
Klaas Freitag
105ff694f2
SyncEngine: Handle 503 condition as soft error to properly handle etags.
...
Otherwise the ETags could be removed from the db and cause file
deletes.
2014-10-28 17:13:21 +01:00
Jenkins for ownCloud
26ff6be63c
[tx-robot] updated from transifex
2014-10-28 01:25:42 -04:00
Daniel Molkentin
47e3da9ebf
Merge pull request #2414 from owncloud/fix_2365
...
Doc: Fix build documentation, adjust it to 1.7.
2014-10-27 16:15:14 -04:00
Daniel Molkentin
b7ce5ba82a
Doc: Fix build documentation, adjust it to 1.7.
...
Fixes #2365
2014-10-27 16:14:32 -04:00
Olivier Goffart
5723abe6eb
Merge remote-tracking branch 'origin/fix_service_unavailable' into 1.7
2014-10-27 20:49:46 +01:00
Daniel Molkentin
95a9b0427c
doc: Fix markup in build.rst
2014-10-27 14:54:23 -04:00
Klaas Freitag
0692fea9d8
discovery: handle 503 reply code from server for directories
...
503 for directories means that the dir is a mounted directory from an
external mount which currently is not available. The directory is
ignored and not traversed into during discovery phase.
2014-10-27 19:21:12 +01:00
Markus Goetz
b0882a5cd2
Fix compile
2014-10-27 17:18:49 +01:00
Markus Goetz
4c1a0005e6
Make two more asserts usable in nondebug
2014-10-27 16:01:18 +01:00
Markus Goetz
05ceed926c
SyncEngine: Log for an assert, return -1 for nondebug compile
2014-10-27 15:52:17 +01:00
Klaas Freitag
b691521662
tests: Fix CSync Journal test, use real CSYNC struct from csync_private.
...
This fixes bug #2396
2014-10-27 13:15:33 +01:00
Olivier Goffart
ce300d88ee
Wizard: show the choice to start a clean sync if the directory exist even on new accounts
...
Task #2406
2014-10-27 13:05:17 +01:00
Brandon Coleman
05c0249672
correct spelling on user is empty error.
2014-10-27 07:59:31 -04:00
Brandon Coleman
2498c13078
options are required at the beginning of owncloudcmd.
...
Conflicts:
src/owncloudcmd/owncloudcmd.cpp
2014-10-27 07:59:31 -04:00
Klaas Freitag
ab5dae741a
Show GIT SHA sum in cmake output.
2014-10-27 11:54:22 +01:00
Olivier Goffart
cddad94e45
Selective Sync: change the label text
...
to specify that the files will be removed from the local folder
Task #2404
2014-10-27 11:33:25 +01:00
Jenkins for ownCloud
2f0a40c1c8
[tx-robot] updated from transifex
2014-10-27 01:25:20 -04:00
Daniel Molkentin
24b07aaaef
Merge pull request #2402 from metrix78/spelling
...
correct spelling on user is empty error.
2014-10-26 21:52:03 -04:00
Brandon Coleman
ece1100d65
options are required at the beginning of owncloudcmd.
2014-10-26 15:33:50 -05:00
Jenkins for ownCloud
3b1ff5bf41
[tx-robot] updated from transifex
2014-10-26 01:25:20 -04:00
Brandon Coleman
e5b03634ae
correct spelling on user is empty error.
2014-10-25 11:01:58 -05:00
Daniel Molkentin
1bd1c61c3c
Merge pull request #2399 from r2evans/patch-1
...
add 64-bit windows registry location
2014-10-25 10:31:04 -04:00
r2evans
9cd81d87b2
add 64-bit windows registry location
2014-10-25 07:25:18 -07:00
Jenkins for ownCloud
59efea1b0e
[tx-robot] updated from transifex
2014-10-25 01:25:22 -04:00
Sascha Vincent Kurowski
59f18583d1
Switch monochrome systray icon color depending on systray brightness.
...
https://github.com/owncloud/mirall/issues/2215
As of version 10.10 Yosemite, Mac OS X offers the user the option to use
a dark version of the dock and menu bar. The systray icon was black even
on the dark menu bar, thus rendering it nearly impossible to spot.
2014-10-24 21:52:41 +02:00
Daniel Molkentin
d0b40bab47
Merge pull request #2391 from owncloud/ignore_windows_reserved_characters
...
Ignore reserved words on Windows
2014-10-24 15:39:21 -04:00
Daniel Molkentin
d76192cce1
Ignore reserved words on Windows
...
Fixes #2385 and #2386
2014-10-24 13:18:57 -04:00
Klaas Freitag
0e828d802e
Bump version to 1.7.0rc1
2014-10-24 18:20:41 +02:00
Klaas Freitag
9505d7cc51
Updated changelog for 1.7.0
2014-10-24 18:19:16 +02:00
Christian Kamm
1c4072e231
Selective sync ui: Fix #2390
2014-10-24 16:11:29 +02:00
Klaas Freitag
86e13ea06f
FolderMan: Use folderForPath method to get the folder object for a path
2014-10-24 15:07:33 +02:00
Klaas Freitag
c12d3870cd
Merging work branch for a bug fix for bug #2379 .
...
It closes all db connections if the new local path is a already
synced folder path.
2014-10-24 14:43:48 +02:00
Christian Kamm
fce76a13cb
Sync scheduling: Only do a follow-up sync 3 times. #2355
...
After trying again immediately for 3 times, no more fast follow-ups
are run until a sync finishes without needing a fast follow-up.
2014-10-24 13:31:48 +02:00
Christian Kamm
82b14370fc
Sync scheduling: Only retry up to twice after fail. #2386
...
Previously when a sync failed, we'd retry very soon (30s) no matter how
often a sync had failed before. After this change we'll retry twice and
then back off to the regular 5min interval.
2014-10-24 13:31:48 +02:00
Klaas Freitag
a9d8e9dcd8
Setupwizard: Close the database in case of moving the folder.
2014-10-24 13:05:29 +02:00
Klaas Freitag
542e989046
Setup Dialog: Terminate sync if the new folder is a an actual folder.
2014-10-24 11:59:56 +02:00
Klaas Freitag
f5c199740d
Followup: To unregister a path in socket api use the alias of folder.
2014-10-24 11:36:01 +02:00
Klaas Freitag
f37b81c8b7
Unregister path in socketapi before removing it.
2014-10-24 11:12:06 +02:00
Christian Kamm
c0ea69ee24
SqlQuery: Reset after each successful exec().
...
In e5269a4151 I moved the reset calls to
before the first bindValue() because we didn't consistently reset()
after exec().
However, some queries may keep a lock on the database so it is necessary
to reset() as soon as the data is read. This commit reintroduces these
reset() calls.
2014-10-24 10:11:00 +02:00
Christian Kamm
5640cbf653
SqlDatabase: Make it non-copyable.
2014-10-24 09:56:30 +02:00
Jenkins for ownCloud
6d81e5c87a
[tx-robot] updated from transifex
2014-10-24 01:25:23 -04:00
Daniel Molkentin
3c7ff97ed4
SocketAPI: Don't use a theme dependent name for now
...
We will revert this once #2388 is implemented
2014-10-23 17:46:17 -04:00
Craig Morrissey
2120ff8037
fix resources path and permissions
2014-10-23 16:42:32 -04:00
Daniel Molkentin
92c35c6aa6
Update reference to binary submodule
2014-10-23 15:09:49 -04:00
Daniel Molkentin
149b16aefd
Win32 Shell Integration: Use RegDeleteKey instead of RegDeleteKeyEx
...
RegDeleteKeyEx does not exist on Windows XP 32 bit
Fixes : #2165
2014-10-23 21:00:31 +02:00
Klaas Freitag
114c38c1ff
csync tests: add some debug code to get behind the jenkins fails.
2014-10-23 17:33:47 +02:00
Christian Kamm
e5269a4151
Add SyncJournalDB autotests.
...
There also was a bug in syncjournaldb: in some error conditions the
sql query wasn't reset properly. We now always reset a query before
calling bindValue.
2014-10-23 15:15:47 +02:00
Markus Goetz
81584c6d51
VERSION.cmake: rc1
2014-10-23 12:22:07 +02:00
Markus Goetz
0d9ae241c9
OwnCloudFinder: Rename to SyncStateFinder
...
Project file names stay the same, only the output file(s) changed
2014-10-23 12:19:19 +02:00
Klaas Freitag
e726e7aad8
util: Use canonicalFilePath to clean the path opened by explorer.
...
This fixes bug #2299
2014-10-23 10:41:07 +02:00
Jenkins for ownCloud
c7c05ea869
[tx-robot] updated from transifex
2014-10-23 01:25:33 -04:00
Carla Schroder
b5da8423a6
Update navigating.rst
2014-10-22 19:24:19 -07:00
Carla Schroder
c3de0a2d4b
Add section on Overlay Icons to 'Using the Synchronization Client'
2014-10-22 19:20:58 -07:00
Daniel Molkentin
83880aed52
Add proper background for OS X installer
...
Fixes #2335
2014-10-22 18:02:19 -04:00
Olivier Goffart
de56b753d1
protocolwidget: fix string that need to use plural translation
2014-10-22 18:26:40 +02:00
Olivier Goffart
dab01e3f3f
csync_update: add the perms in the log
2014-10-22 17:25:38 +02:00
Olivier Goffart
e46ab72718
SocketAPI: Show error when we are not allowed
...
Issue #1931
2014-10-22 17:25:38 +02:00
Klaas Freitag
9f6d7eb587
tests: use the ocs_url in the same semantics as the 1.6 branch.
2014-10-22 16:06:39 +02:00
Daniel Molkentin
bbd9098e44
Switch git submodule for qtmacgoodies back to shadone
2014-10-22 09:58:08 -04:00
Markus Goetz
47ad4e3fe8
CSync: Close/Reopen DB between update and reconcile
...
update and reconcile happen in different threads. This code is safer.
(Even though depending on sqlite3 version it should work anyway)
2014-10-22 15:42:13 +02:00
Olivier Goffart
9330d2e1e8
SocketAPI: always clean the path and use the normal slash
2014-10-22 15:33:35 +02:00
Olivier Goffart
020e19f770
SocketAPI: Fix all files are new
...
(Introduced because of bad resolution of merge conflict
in my last commit)
2014-10-22 15:32:09 +02:00
Olivier Goffart
3be5600caf
t6.pl: fix missing space in curl command
2014-10-22 15:16:22 +02:00
Olivier Goffart
22dd275b15
SocketAPI: Fix the shared symbol, including for owncloud6 Shared dir
...
The shared symbol would not appear if the status came for estimateState
Also added the shared symbol for the Shared/ directories (owncloud 6 compat)
2014-10-22 15:10:21 +02:00
Markus Goetz
6342e76e19
Wizard: Change misleading text
2014-10-22 15:06:33 +02:00
Markus Goetz
55dd149a03
SocketAPI: Less verbose
2014-10-22 14:43:23 +02:00
Markus Goetz
39a0f28753
Move qtmacgoodies module forward
2014-10-22 14:43:03 +02:00
Olivier Goffart
dd45b448d9
t6.pl: pass the --insecure flag to curl so it works on the test machine
2014-10-22 13:57:22 +02:00
Olivier Goffart
7740150576
Selective Sync widget: add a "Loading..." label
...
Task #2088
2014-10-22 13:48:05 +02:00
Olivier Goffart
4f367faf4d
SocketAPI: Show an error for files inside the selective sync folders
...
Task #2283
2014-10-22 13:31:20 +02:00
Olivier Goffart
3840186dd8
Utility: fix function signature
2014-10-22 13:31:20 +02:00
Christian Kamm
d77fcea365
Csync tests: Don't use sqlite3_close_v2.
2014-10-22 12:44:33 +02:00
Daniel Molkentin
ed51a45187
Add title to selective sync dialog
2014-10-22 06:29:22 -04:00
Christian Kamm
c832226aa1
Merge remote-tracking branch 'origin/1.7' into master
2014-10-22 12:25:58 +02:00
Christian Kamm
a20375372d
Blacklist: Don't ignore error files forever. #2247
...
Instead try them again regularly, but don't show the user any
error messages if the error persists.
2014-10-22 12:25:18 +02:00
Christian Kamm
ba86988101
Csync tests: Fix broken tests.
...
It is no longer ok to call csync_statedb_load() on a non-existant
database since it opens readonly only.
2014-10-22 12:22:13 +02:00
Olivier Goffart
6073e3f345
SocketAPI: do not show a progress icon in case of errors
2014-10-22 12:19:57 +02:00
Olivier Goffart
d31ccacf57
SocketAPI: show an ignored icon for paused folders
2014-10-22 12:19:57 +02:00
Markus Goetz
7e3d2029e0
OS X: Fix bundle creation after merge
2014-10-22 12:06:43 +02:00
Christian Kamm
de48e65091
Csync tests: Fix compile.
2014-10-22 11:45:48 +02:00
Klaas Freitag
3243365210
JournalDb: Do not longer always have a write operation on version table.
...
Rather read the value from the table and if it is what we expect do not
write it.
2014-10-22 10:59:58 +02:00
Christian Kamm
7ae0338f5c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/socketapi.h
src/libsync/syncengine.h
test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
Jenkins for ownCloud
b2460fbee2
[tx-robot] updated from transifex
2014-10-22 02:06:40 -04:00
Jenkins for ownCloud
8dc3f2146a
[tx-robot] updated from transifex
2014-10-22 01:25:37 -04:00
Markus Goetz
a993496ab4
SyncJournalDB/SyncEngine: Properly detect 1.5 upgrade
...
Else we end up never reading file data from the DB.
2014-10-21 20:25:15 +02:00
Markus Goetz
61e72ef50b
CSync: statedb sanity check changes
2014-10-21 18:09:23 +02:00
Markus Goetz
d7ac878efd
SyncJournalDB: Fix deleteBatch
2014-10-21 16:37:51 +02:00
Markus Goetz
e5a0db8782
SyncJournalDB: Fix version table filling up
2014-10-21 16:37:39 +02:00
Markus Goetz
24d4840c93
SyncJournalDB: Set WAL files to hidden
2014-10-21 15:58:56 +02:00
Markus Goetz
fa70798fb5
SyncJournalDB: WAL checkpoint at end of sync
2014-10-21 15:41:11 +02:00
Markus Goetz
1af480ea3b
CMake: Fix RPATH
2014-10-21 15:39:31 +02:00
Olivier Goffart
a76fc0ee5a
SocketAPI: send the change of the parent folder in the broatcast
...
Also do not compute the status if there is nno listeners
2014-10-21 15:26:51 +02:00
Olivier Goffart
80e86d6c1b
ownsql: fix warning with clang
...
warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
2014-10-21 14:59:42 +02:00
Olivier Goffart
dc13e39bb1
SocketAPI: do not have a special case for UPDATE_VIEW on windows
...
This is a relique on the old times when there was no persistant connection
in the windows plugin
2014-10-21 14:57:50 +02:00
Olivier Goffart
98c5871d38
Windows shell integration: Add SHCNF_FLUSHNOWAIT to SHChangeNotify
...
(TortoiseSVN have this flag)
Also do not call SHChangeNotify if there was no change
2014-10-21 14:51:18 +02:00
Olivier Goffart
5a109d9293
Fix t3.pl
...
The fix in commit 86d8079 made the detection of changes inside
a directory more robust.
As a result, changes are detected inside a directory, even if the
files that are changed were moved away on the other remote, the algorithm
won't let the directory be removed and the directory will be re-created
2014-10-21 12:10:12 +02:00
Olivier Goffart
56316bc980
csync_reconcile: remove useless debug output
2014-10-21 11:47:18 +02:00
Klaas Freitag
21c8e65d13
csync tests: Fix test after db changes.
2014-10-21 11:26:04 +02:00
Olivier Goffart
86d8079739
Reconcile: Make sure not to loose new files added in a directory removed on the server
...
Found while investigating #2296
The problem is that we should not remove a directory locally if it contains
modified files.
But the modification time of the directory is not necessarily chaning (so
the instruction of the directory may still be NONE)
We have to move the child_modified test a bit down to be recursive
2014-10-21 10:38:21 +02:00
Jenkins for ownCloud
d2be45bce1
[tx-robot] updated from transifex
2014-10-21 01:25:34 -04:00
Markus Goetz
5d048c18bc
Sqlite3: Switch to WAL
...
This is faster.
2014-10-20 23:09:28 +02:00
Markus Goetz
0fb779d363
SyncEngine: De-initialize recursive PROPFIND value correctly
2014-10-20 22:24:28 +02:00
Daniel Molkentin
d0ed82a686
We need SqlDatabase and SqlQuery to be exported
...
Required due to 53b3e5af1b
2014-10-20 19:58:10 +02:00
Markus Goetz
d33b68ccc9
CSync: Error out if DB error
2014-10-20 19:32:06 +02:00
Klaas Freitag
26f068bcab
SocketApi: Properly manage the database connections.
...
Removed the fishy closeDb() method of SqlQuery again.
2014-10-20 17:31:33 +02:00
Markus Goetz
f0dc3725e8
ownSql: Still also use sqlite3 busy handler
2014-10-20 17:26:25 +02:00
Markus Goetz
2de22b408b
SyncEngine: Avoid transaction warning
2014-10-20 17:20:58 +02:00
Klaas Freitag
04b62b139d
Fix compile error and add warning.
2014-10-20 17:10:34 +02:00
Klaas Freitag
2f20f3c65d
SocketApi: Instanziate Object to call QFileInfo::exists
...
QFileInfo on Qt4 does not have static members.
2014-10-20 17:05:14 +02:00
Klaas Freitag
53b3e5af1b
SocketAPI: Use new class SqlQuery to cache the sql queries.
...
This results in better handling of the BUSY condition through SqlQuery.
2014-10-20 16:55:37 +02:00
Markus Goetz
7dbb98c2e5
SyncEngine/SyncJournalDB: Don't keep transactions open
2014-10-20 16:50:55 +02:00
Markus Goetz
8b35cda4c6
SyncEngine: Refactor startSync() code
2014-10-20 15:51:50 +02:00
Markus Goetz
cb36a37779
SyncEngine/SyncJournalDB: Fix creation of .csync_journal
2014-10-20 14:27:00 +02:00
Markus Goetz
704c5f2de7
NetworkJobs: Higher timeout for pre-oC7
...
Pre-oc7 has PHP session locking for PROPFIND (by recursive PROPFIND in csync_update),
the oc7 doesn't.
2014-10-20 13:34:09 +02:00
Klaas Freitag
3fcb0d2d6b
SocketAPI: Properly release precompiled statements. Use sqlite3_close
...
rather than its v2 equivalent. That should make it compile on older
linux platforms.
2014-10-20 10:51:03 +02:00
Klaas Freitag
2dfe0ed42e
Remove unused variable, fixes compile warning.
2014-10-20 10:51:03 +02:00
Daniel Molkentin
ac48fbae9c
1.7.0 beta4
2014-10-20 10:28:47 +02:00
Daniel Molkentin
6048a7143a
Revert "Remove references to qsqlite3"
...
QtWebkit needs it
This reverts commit b1c10c8454 .
2014-10-20 10:27:34 +02:00
Jenkins for ownCloud
7c24db07c2
[tx-robot] updated from transifex
2014-10-20 01:25:25 -04:00
Daniel Molkentin
271cdac474
Really use internal SQLite on Windows
2014-10-19 08:51:01 +02:00
Jenkins for ownCloud
79e2c132cc
[tx-robot] updated from transifex
2014-10-19 01:25:24 -04:00
Klaas Freitag
b5736fb5a7
Sql: Handle SQLITE_BUSY properly for sqlite3_step and sqlite3_prepare.
...
Repeat the statements a couple of times and sleep in between.
2014-10-18 16:16:29 +02:00
Klaas Freitag
7822a6b000
csync_statedb: Finalize the precompiled statements after discovery.
...
As described in http://www.sqlite.org/cvstrac/wiki?p=MultiThreading precompiled
statements should not be used across thread borders. However, the reconcile
phase would reuse the statements if defined (it calls statedb function from
a different thread) so it is saver to finalize them at the end of the
update run.
2014-10-18 14:18:11 +02:00
Jenkins for ownCloud
306b63599c
[tx-robot] updated from transifex
2014-10-18 01:25:33 -04:00
Daniel Molkentin
3021fb546e
NSIS: Fix copying of qtbase translations
2014-10-17 16:37:37 +02:00
Olivier Goffart
a5bd437d48
Propagator: Fix renaming of files and case confflicts
...
Better fix for #1385 and #2318
2014-10-17 16:15:03 +02:00
Olivier Goffart
08156186fa
Revert "propagator: Do not check for case clash when renaming"
...
This caused test regressions in t8.pl (#2318 )
This reverts commit dad8c1c27c .
2014-10-17 16:15:03 +02:00
Markus Goetz
f1006ca8b0
owncloudcmd: Always need exclude list
...
Try to load the system list or the user supplied list.
For #2322
2014-10-17 15:58:01 +02:00
Markus Goetz
93c85711d1
ownSql: Always use finish()
2014-10-17 13:39:48 +02:00
Markus Goetz
e5ef5f2410
Revert "socketapi: if the filename is empty, it's actually /"
...
Not needed, the socketapi checks for "".
This reverts commit 561e3c780d .
2014-10-17 13:29:34 +02:00
Daniel Molkentin
52a5729298
Merge pull request #2319 from owncloud/sqlite_capi
...
Introduce a common sqlite layer across csync and mirall.
This avoids conflicts that both each load different and/or updated sqlite versions.
2014-10-17 12:11:27 +02:00
Daniel Molkentin
b9849580f8
ReNautilus Shell Intgration: Remove debug output
2014-10-17 12:09:30 +02:00
Daniel Molkentin
4525161e7c
Updater: allow overriding update URL through environment
2014-10-17 12:07:18 +02:00
Daniel Molkentin
dee6d18d69
Discovery phase: Improve UI by quoting folder names
2014-10-17 12:07:18 +02:00
Daniel Molkentin
d44179142f
Discovery phase: Properly decode percent encoding
2014-10-17 12:07:18 +02:00
Klaas Freitag
c66c01245b
Beautified some debug logging strings.
2014-10-17 11:35:06 +02:00
Jenkins for ownCloud
bce6916c13
[tx-robot] updated from transifex
2014-10-17 02:07:06 -04:00
Jenkins for ownCloud
681c43631b
[tx-robot] updated from transifex
2014-10-17 01:25:34 -04:00
Klaas Freitag
2f740fe471
tests: Added unicode read an write testcase for ownsql.
2014-10-16 21:21:47 +02:00
Markus Goetz
b1c10c8454
Remove references to qsqlite3
2014-10-16 17:51:17 +02:00
Markus Goetz
1d5b3aadea
sqlite3: Bundle 3.8.6 for Mac and Windows
...
it is linked into ocsync.
2014-10-16 17:38:45 +02:00
Markus Goetz
2d420cd72c
ownSql: Always use SQLITE_TRANSIENT
...
More safe.
2014-10-16 15:30:50 +02:00
Markus Goetz
707d6880a8
main: Show console message if already running
2014-10-16 15:25:33 +02:00
Markus Goetz
dbad1a8d45
ownSql: Don't allow copying of SqlQuery
...
This fixes a crash on OS X where the destructor
calls sqlite3 to invalidate the underlying handle.
2014-10-16 15:10:25 +02:00
Klaas Freitag
36eaff92e5
JournalDb: Some Sql statement fixes, make t7 work again.
...
plus some minor fixes.
2014-10-16 11:22:57 +02:00
Klaas Freitag
e51c299937
ownSql: create an null value of an empty string in bindValue.
2014-10-16 11:20:50 +02:00
Klaas Freitag
8c7953a47c
ownSql: Proper initialization of result value plus assert on it.
2014-10-16 11:20:21 +02:00
Daniel Molkentin
4527784905
Second part of #1661
...
- QT_INSTALL_TRANSLATIONS was not defined in Qt5
- Some languages have been split up in multiple qm's. We only need qtbase for now
2014-10-16 11:08:29 +02:00
Klaas Freitag
ee8a93ae9a
ownSql: Proper initialization of errId
2014-10-16 10:39:10 +02:00
Jenkins for ownCloud
6096362052
[tx-robot] updated from transifex
2014-10-16 01:25:36 -04:00
Klaas Freitag
89c51e7649
ownsql: Implement the transaction functions.
2014-10-15 19:47:25 +02:00
Klaas Freitag
6c92076ec3
tx.pl: Adopt test t6.pl to the new way of handling precondition failed.
2014-10-15 19:25:34 +02:00
Olivier Goffart
2bba4134fb
owncloudgui: Fix a small leak
...
The systray icon were not destroyed while qutting
2014-10-15 18:11:52 +02:00
Daniel Molkentin
10175c8d57
Update binary/ sha
2014-10-15 16:52:16 +02:00
Olivier Goffart
7804bf0a9a
Windows Shell Integration: Use the right parametter to SHChangeNotify
2014-10-15 16:47:08 +02:00
Klaas Freitag
336c95ce5b
ownsql: Cleanups: In modern C++, we use 0 instead of NULL
2014-10-15 16:46:39 +02:00
Klaas Freitag
babe891242
SyncEngine: Show a warning if post update script can not be exec.
2014-10-15 16:43:58 +02:00
Olivier Goffart
bb37e93f52
Windows shell integration: Do proper wait
2014-10-15 16:09:35 +02:00
Olivier Goffart
aa0f2c64ff
Windows Shell Integration: fixeWindows Shell Integration: fixe
2014-10-15 15:57:15 +02:00
Olivier Goffart
e66ca267f4
Windows Shell Integration: try to wait for connection
2014-10-15 15:13:04 +02:00
Klaas Freitag
eeb5ca42e0
ownsql: Added some paranthisis to make clear whats happening.
2014-10-15 13:29:25 +02:00
Klaas Freitag
74ec90c725
tx.pl: Fix sharing api url, some whitespace fixes.
2014-10-15 13:28:53 +02:00
Daniel Molkentin
03ee742981
Correct lookup logic for Qt translations
...
Fixes #1661
2014-10-15 09:33:38 +02:00
Jenkins for ownCloud
557c63b372
[tx-robot] updated from transifex
2014-10-15 02:06:11 -04:00
Jenkins for ownCloud
b4c86bcf40
[tx-robot] updated from transifex
2014-10-15 01:25:24 -04:00
Klaas Freitag
0094c1ecf5
Make the sync work with new sql implementation.
2014-10-14 20:51:51 +02:00
Klaas Freitag
6b5fcf53eb
Test module for the new sql implementation.
2014-10-14 20:51:34 +02:00
Olivier Goffart
4b001a77b3
Windows Shell Integration: Use the QLocalSocket on windo and do the request assynchroniously
...
Squashed commit of the following:
commit 4d9b072f560fa171a1390b7c74425614aa20e955
Author: Olivier Goffart <ogoffart@woboq.com >
Date: Tue Oct 14 16:04:02 2014 +0200
Remove useless variable
commit 8e85de0307ec5f31bf3f92a7de793fed7d41c2ea
Author: Daniel Molkentin <danimo@owncloud.com >
Date: Tue Oct 14 16:01:52 2014 +0200
Make Windows Explorer Extension build
commit 8e2942cd9fd32e3af72d60cba0d06bd9d6222a45
Author: Daniel Molkentin <danimo@owncloud.com >
Date: Tue Oct 14 11:39:37 2014 +0200
Fix compilation
commit 0fc0c0e0e0c7e58ad97f62700256c7d1f8c0670b
Author: Olivier Goffart <ogoffart@woboq.com >
Date: Tue Oct 14 11:48:32 2014 +0200
Windows Shell Integration: Try to let the thread notify about changes when there are changes
commit 4a1712b7c03269ca3007f167b8f313ea47655967
Author: Olivier Goffart <ogoffart@woboq.com >
Date: Tue Oct 14 11:35:20 2014 +0200
Windows Shell Integration: Share the RemotePathChecker amongst all the OCOverlay instances
commit 2d87408e9af5a4d7ab71c460ce606ba1f367c09f
Author: Olivier Goffart <ogoffart@woboq.com >
Date: Mon Oct 13 18:55:15 2014 +0200
Windows Shell Integration: Attempts to wait on multiple objects (WIP)
commit e448e427b6d1561ad7a40d08fc6632f4d2b4ef44
Author: Daniel Molkentin <danimo@owncloud.com >
Date: Mon Oct 13 17:58:02 2014 +0200
Introduce a worker thread
commit 2344407ec0bc1ce173ebbacadcf3992d62d94078
Author: Olivier Goffart <ogoffart@woboq.com >
Date: Mon Oct 13 17:03:47 2014 +0200
Windows Shell Integration: try to keep the socket open using a thread (WIP)
commit ea6d5273ed60d8bc3f1c5d5c6936364d783a1c0f
Author: Daniel Molkentin <danimo@owncloud.com >
Date: Mon Oct 13 15:27:46 2014 +0200
Make Explorer plugin work again with named pipes
This is a temporary hack, which needs more refactoring.
commit 44a3437a44082379efa0078c9afd7b8bbde930de
Author: Daniel Molkentin <danimo@owncloud.com >
Date: Sat Oct 11 07:31:24 2014 +0200
Fix code
commit 123390a0f3516c0078309d7048c6d2acb9293676
Author: Olivier Goffart <ogoffart@woboq.com >
Date: Fri Oct 10 16:29:35 2014 +0200
Windows shell integration: Use named pipe (WIP)
commit 9eea7e2321abeac6b8db0bd85bfce612dbf6bb20
Author: Olivier Goffart <ogoffart@woboq.com >
Date: Wed Oct 1 12:04:13 2014 +0200
Windows Shell Integration: Simplify StringUtil
This fixes a memory leak in CommunicationSocket::ReadLine
2014-10-14 16:05:48 +02:00
Klaas Freitag
357c08c5b3
NewSQL: minor fixes to get stuff going
2014-10-14 12:18:33 +02:00
Klaas Freitag
e7d9ec50dc
Merge branch 'sqlite_capi' of github.com:owncloud/mirall into sqlite_capi
...
Conflicts:
src/mirall/socketapi.cpp
2014-10-14 11:43:10 +02:00
Klaas Freitag
09b0ba31ef
Sql: New implementation of ownSql class to go away from Qt's own Sql
2014-10-14 11:14:57 +02:00
Jenkins for ownCloud
8231bc931b
[tx-robot] updated from transifex
2014-10-14 01:25:23 -04:00
Klaas Freitag
26ffa078ef
SocketAPI: Cache database conections and statements
2014-10-13 17:31:40 +02:00
Markus Goetz
eb60aca34f
SyncJournalDB: Clarify debug message
2014-10-13 17:29:26 +02:00
Markus Goetz
4d3020421a
SocketAPI: Remove old dbFileRecord function
...
We will use the _capi functions
2014-10-13 17:29:26 +02:00
Markus Goetz
f1ce0a1cf3
SocketAPI: Use non-recursive (heuristic) computation of icons
2014-10-13 17:29:26 +02:00
Klaas Freitag
dd28a645a1
SocketAPI: Cleanup, removed helper namespace, added as private methods.
2014-10-13 15:38:57 +02:00
Klaas Freitag
561e3c780d
socketapi: if the filename is empty, it's actually /
2014-10-13 15:36:13 +02:00
Klaas Freitag
8371e34d87
Nautilus overlay: minor cleanups
2014-10-13 14:59:23 +02:00
Klaas Freitag
46fd79604d
JournalDb: Do not use static variable for path.
2014-10-13 14:49:53 +02:00
Klaas Freitag
d08c2de619
Use sqlite C api.
2014-10-13 14:14:43 +02:00
Jenkins for ownCloud
a452a05e52
[tx-robot] updated from transifex
2014-10-13 01:25:23 -04:00
Daniel Molkentin
0a96aa3aaf
Merge pull request #2307 from owncloud/fix-version-jw
...
owncloudcmd --version needs this.
2014-10-12 20:17:57 +02:00
Jürgen Weigert
07bcaaebf9
unreachable --version code made reachable.
...
error message improved.
2014-10-12 19:28:13 +02:00
Jenkins for ownCloud
0cde7c8ac1
[tx-robot] updated from transifex
2014-10-12 01:25:42 -04:00
Markus Goetz
b285e98988
SQlite: Print versions we use
2014-10-11 17:33:35 +02:00
Klaas Freitag
ab40ba2f75
owncloudcmd: Handle trust ssl switch correctly by overwriting trustssl
...
method in a subclass of HTTPCredentials.
2014-10-11 17:17:43 +02:00
Klaas Freitag
bbcb8ba3e7
credentials: Allow to trust ssl certs in subclasses of HTTPCredentials.
...
This allows to handle the --trust option in owncloudcmd. In the
owncloudcmd subclass of the httpcredentials, we allow to manually trust
the ssl certificate through a command line switch.
2014-10-11 17:17:43 +02:00
Markus Goetz
ef48de34f7
Logger: Log the thread pointer
...
Maybe we can somehow reduce this to make it not so many characters wide?
2014-10-11 16:58:47 +02:00
Olivier Goffart
7e898cf60c
SelectiveSync: rename blacklist to selectiveSyncBlackList in some places
...
Issue #2301
2014-10-11 16:24:45 +02:00
Klaas Freitag
2f5cea0e73
owncloudcmd: Add a custom ssl verification callback for neon.
...
That fixes the SSL related problems we had with ci.owncloud.org
2014-10-11 15:55:37 +02:00
Olivier Goffart
282abdd804
Sync engine: Restart sync when we get a precondition failed error
2014-10-11 15:40:28 +02:00
Olivier Goffart
9b178c5bb2
Sync engine: Do not write to the database too early
...
It is possible that we have should_update_etag set to true for files
that we also need to propagate. In which case we must not write to the DB
too early as this could cause data loss. (cf: issue #2296 )
2014-10-11 15:40:28 +02:00
Klaas Freitag
d491663143
owncloudcmd: Fix some slash screwup, to make the split succeed bug #2211
2014-10-11 15:14:07 +02:00
Klaas Freitag
8eaeba6486
owncloudcmd: Fix url handling with csync, make owncloudcmd sync again.
...
This fixes mirall issue #2211
2014-10-11 12:21:26 +02:00
Jenkins for ownCloud
631e67949e
[tx-robot] updated from transifex
2014-10-11 01:25:35 -04:00
Daniel Molkentin
77d2cba155
owncloudcmd: don't prompt for password if it was provided
2014-10-10 18:04:00 +02:00
Daniel Molkentin
2149092c7a
owncloudcmd: Fix crash
2014-10-10 18:04:00 +02:00
Olivier Goffart
100d1361b6
Add Folder wizard: Sort the folders when selecting the remote folder
...
Issue #1872
2014-10-10 16:56:05 +02:00
Daniel Molkentin
76f5266fa1
Fix small inefficiency in socketapi
2014-10-10 16:20:57 +02:00
Daniel Molkentin
3ebe3b1196
Use local socket (named pipe) connection also on Windows
2014-10-10 15:57:05 +02:00
Daniel Molkentin
c4f96c2fba
owncloudcmd: Implement --version, fix strings
...
Part of #2211
2014-10-10 15:55:58 +02:00
Olivier Goffart
d880f2ffbc
propagator: Do not show an error message saying it was done by user interaction if it was not
...
There is many reasons why we could abort (for example timeouts)
And in this case we should not show to the user it was aborted
by user interaction
2014-10-10 14:58:56 +02:00
Markus Goetz
f8f5a7ceaa
OS X Overlay Icons: Fix static analyzer warnings
2014-10-10 11:44:40 +02:00
Markus Goetz
b01839e9a4
OS X: Remove dead JSON code
2014-10-10 11:44:40 +02:00
Markus Goetz
75dbf12ae6
CSync: Remove dead code
2014-10-10 11:44:40 +02:00
Klaas Freitag
9bb89dced5
Less offensive logging, only use error if there was one.
2014-10-10 10:16:59 +02:00
Olivier Goffart
661fe5df66
csync_statedb: fix inverted logic in testing if the sqlite was compiled with threads
2014-10-10 10:12:54 +02:00
Jenkins for ownCloud
8a93437e55
[tx-robot] updated from transifex
2014-10-10 01:25:39 -04:00
Olivier Goffart
b20752f13e
Fix the build with clang and Qt4
2014-10-09 17:54:46 +02:00
Klaas Freitag
61967f6e1b
csync tests: conform to read only db.
2014-10-09 17:45:20 +02:00
Markus Goetz
f0fef4f232
OS X: Fix .app creation for non-system Qt
2014-10-09 16:50:03 +02:00
Daniel Molkentin
7eb10a08b8
SSL error dialog: Remove debug noise
2014-10-09 16:49:31 +02:00
Olivier Goffart
4c83653d5d
Selective sync: do not upload or rename file that would ends up in a not selected folder
...
Issue #2283
2014-10-09 16:50:03 +02:00
Christian Kamm
3149cd03be
Sync scheduling: Never enqueue a folder while it is synced.
...
Issues: #2268 , #2275
2014-10-09 15:55:10 +02:00
Christian Kamm
5314765410
fix compile
2014-10-09 15:55:10 +02:00
Olivier Goffart
621a37be15
Selective sync: Remove the etag of parent folders in the db when adding or removing items in the selective sync blacklist
2014-10-09 15:28:51 +02:00
Olivier Goffart
6de104a03a
Selective Sync: ensure that the blacklist contains the last '/'
...
In the sync engine. Because that makes tha tthe lower_bounds in selective sync works properly.
For example, if both "Test" and "Test Test" are in the list, then "Test/Foo" would match the "Test Test"
because slash is after space
Task #2289
2014-10-09 15:11:04 +02:00
Olivier Goffart
97560509ea
Selective sync: change the text of the label.
...
Selective sync is a black list. Unchecked folder are blacklisted
Partially checked folders are not in the blacklist and the files there
are sync'ed
2014-10-09 14:36:26 +02:00
Markus Goetz
32aaecd832
macdeployqt: Fix missing symbol
2014-10-09 12:07:00 +02:00
Christian Kamm
dfba8fbe5e
CheckServerJob: Require status code 200. #2290
2014-10-09 11:06:00 +02:00
Klaas Freitag
32fea6523f
Use climits for ULONG_MAX rather than modern C++ option
2014-10-09 11:03:07 +02:00
Klaas Freitag
d1c1a18226
SyncJournal: Use precompiled statement in blacklist query.
2014-10-09 10:05:20 +02:00
Klaas Freitag
04558beabe
SyncJournal: Use the NOCASE Collate for blacklist query.
2014-10-09 10:05:20 +02:00
Klaas Freitag
425d0d77c5
Two little typo fixes.
2014-10-09 10:05:20 +02:00
Klaas Freitag
edf7cd29dd
csync statedb: Set PRAGMA synchronous to NORMAL for read only db.
2014-10-09 10:05:20 +02:00
Klaas Freitag
27318dded6
csync statedb: Issue a warning if sqlite is not compiled thread safe.
2014-10-09 10:05:20 +02:00
Klaas Freitag
11fe0c5b4b
csync statedb: Open the statedb in read only mode and with mutex set.
...
For that, sqlite3_open_v2 is used with the appropiate flags.
2014-10-09 10:05:20 +02:00
Christian Kamm
886f9d82f2
Sync scheduling: Improve logging. #2275
2014-10-09 09:01:35 +02:00
Jenkins for ownCloud
4f2fb4af5d
[tx-robot] updated from transifex
2014-10-09 01:25:28 -04:00
Daniel Molkentin
6c8eab734e
Remove C++11ism that doesn't work with older GCCs
2014-10-08 18:56:30 +02:00
Daniel Molkentin
9d5d6aff38
Q_DECL_OVERRIDE for Qt4 only for GCC >= 4.7
2014-10-08 18:55:41 +02:00
Christian Kamm
705cd571a5
Download: Don't store message body if status != 2xx #2280
2014-10-08 14:18:29 +02:00
Christian Kamm
48d3c75745
GET: Retry if bad range header used. #2280
...
* If a 416 is returned and we used a Range header, try again
from scratch.
* The direct URL logic was also inconsistent for resumed downloads:
it sent the Range header but didn't check the returned
Content-Range header correctly. Now resuming is disabled for
direct URL downloads.
2014-10-08 14:18:29 +02:00
Markus Goetz
6fbd28d228
Merge branch 'overlayicon_cache' into 1.7
2014-10-08 11:02:58 +02:00
Christian Kamm
285cb78962
Sync scheduling: Don't always force-sync. #2268
...
If lastEtag was null, a force sync was triggered. Force syncs
don't update the etag. The etag retrieval job would only run if
lastEtag was not null. So it could never become non-null.
2014-10-08 10:51:32 +02:00
Christian Kamm
708655d9b2
fix incomplete rename
...
from 9bd7ffe952
2014-10-08 09:36:47 +02:00
Christian Kamm
9bd7ffe952
blacklist: Fix stale blacklist removal. #2247
...
Use the right check to determine whether a file has a blacklist entry,
SyncFileItem::FileIgnored was incorrect because that denotes files from
the ignore list or blacklisted files with no retries left.
The blacklistedInDb flag does the right thing. Rename it to
hasBlacklistEntry to be more explicit.
2014-10-08 09:17:40 +02:00
Markus Goetz
8febd90f2a
Propagator: Be less verbose
2014-10-08 09:07:29 +02:00
Jenkins for ownCloud
51109ea485
[tx-robot] updated from transifex
2014-10-08 01:25:32 -04:00
Daniel Molkentin
1579c23ff1
Fix order in which credentials are getting fetched
2014-10-07 18:21:22 +02:00
Markus Goetz
bf18ecae13
Propagator: Fix bw limiting bug, be less verbose in logging
2014-10-07 17:42:50 +02:00
Markus Goetz
89971925ca
Propagator: Be more verbose about propagator choice
2014-10-07 14:55:30 +02:00
Markus Goetz
2ba007ee4f
CMake: Add else() case for Qt detection
2014-10-07 14:46:55 +02:00
Markus Goetz
d1cc3c34c9
Propagator: Relative download limit
2014-10-07 14:46:55 +02:00
Markus Goetz
de79f9338a
Propagator: Bandwidth limiting for new propagator
2014-10-07 14:46:55 +02:00
Olivier Goffart
5471bfd5a8
No need to update mtime and etag after a move
...
The server keeps the mtime and etag anyway.
And changing the mtime also changes the etag and so make other clients re-download
the file instead of detecting the move
2014-10-07 09:13:13 +02:00
Daniel Molkentin
961df010cb
Propagator: Fix typo in Win32-only code
2014-10-06 15:39:49 +02:00
Jenkins for ownCloud
103986b320
[tx-robot] updated from transifex
2014-10-06 01:25:24 -04:00
Jenkins for ownCloud
764c0cdb03
[tx-robot] updated from transifex
2014-10-04 01:25:25 -04:00
Klaas Freitag
12b09fab67
CaseClash: more defensive logging on Windows.
2014-10-03 11:54:32 +02:00
Klaas Freitag
ed5a8ab090
Push version to beta3
2014-10-03 11:37:00 +02:00
Klaas Freitag
41fa562dce
blacklisting: disable broken remove stale entries function for now.
2014-10-03 11:35:18 +02:00
Klaas Freitag
6c2ce06fea
tx.pl: Set the SSL relaxing env variable.
2014-10-03 10:33:30 +02:00
Markus Goetz
ef019cdbfa
OS X Overlay Icons: Fix Finder plugin crash
...
By enabling ARC for GCDAsyncSocket (as we should have done before
https://github.com/robbiehanson/CocoaAsyncSocket/wiki/ARC ) there
is no chance anymore for a situation where the to-be-written NSData*
is deleted before the socket has had a chance to write it.
Interestingly, this only happened after switching to local sockets,
probably because of how immediatly the NSData* would be sent.
This commit also keeps the debug symbols for the Finder plugin.
2014-10-03 07:23:43 +02:00
Jenkins for ownCloud
1b02a1a6f3
[tx-robot] updated from transifex
2014-10-02 01:25:30 -04:00
Daniel Molkentin
1d8900dc19
OS X: write a qt.conf file
2014-10-01 23:57:14 +02:00
Daniel Molkentin
171fd22d91
Fix rpath for libraries
2014-10-01 21:41:56 +02:00
Daniel Molkentin
78d50f4033
CPack is still needed for Windows
...
This partially reverts commit dafd9c308f .
This partially reverts commit 7f836cc01b .
2014-10-01 21:16:18 +02:00
Klaas Freitag
fee18dd457
Push version to beta2
2014-10-01 21:04:13 +02:00
Klaas Freitag
81d3ce8257
cmake: Commented setting of the INSTALL_PREFIX var on Mac
2014-10-01 20:55:39 +02:00
Daniel Molkentin
5213970c3d
OSX: fix signing script
2014-10-01 17:57:51 +02:00
Daniel Molkentin
bcc06af904
fix last commit
2014-10-01 17:46:29 +02:00
Daniel Molkentin
a98242a2b8
fix install target for macdeployqt
2014-10-01 17:32:17 +02:00
Daniel Molkentin
5f715ca063
OSX: fix Frameworks path in signing script
2014-10-01 16:04:24 +02:00
Daniel Molkentin
0ceeff62d6
Fix app signing on OS X
2014-10-01 15:34:42 +02:00
Daniel Molkentin
f53a7c0e4a
Improve macdeploy script
2014-10-01 15:34:42 +02:00
Daniel Molkentin
41b07d045a
OS X: Use a python script to fix for bundle fixup...
...
...rather than relying on cmake magic
2014-10-01 15:34:42 +02:00
Olivier Goffart
0d303f1d1f
SelectiveSync: sort the item instead of using the order from the server
...
Task #2259
2014-10-01 13:47:24 +02:00
Markus Goetz
b6d97cfffb
OS X Overlay Icons: Introduce a short term cache for rendered icons
...
This is for #2093
2014-10-01 13:21:29 +02:00
Jenkins for ownCloud
3e982ad34c
[tx-robot] updated from transifex
2014-10-01 06:54:46 -04:00
Daniel Molkentin
dafd9c308f
More removal of obsolete CMake code
2014-10-01 12:51:38 +02:00
Daniel Molkentin
7f836cc01b
Kill obsolete Mac deployment code
2014-10-01 12:35:21 +02:00
Olivier Goffart
147fa60f81
Merge branch 'socketapi_localsocket' into 1.7
2014-10-01 12:34:22 +02:00
Olivier Goffart
a1b9405e2e
Windows has not been ported back to QLocalSocket
2014-10-01 12:33:54 +02:00
Olivier Goffart
db02d44c6a
No need to update mtime and etag after a move
...
The server keeps the mtime and etag anyway.
And changing the mtime also changes the etag and so make other clients re-download
the file instead of detecting the move
2014-10-01 11:22:00 +02:00
Klaas Freitag
dff1f77dfa
SocketAPI: remove nonsense FIXME's.
2014-09-30 17:12:07 +02:00
Daniel Molkentin
1a2fff8ed8
OS X: Use a python script to fix for bundle fixup...
...
...rather than relying on cmake magic
2014-09-30 17:09:16 +02:00
Markus Goetz
52c12b33c3
OS X: CMD+H should hide the dialog
2014-09-30 15:21:55 +02:00
Klaas Freitag
29987ca2aa
Overlays Linux: Add the state to the cache to save calls to add_emblem
...
The SocketAPI sends status updates for files without being asked for.
And in order to not draw the emblem again if it had not changed, the
state is compared before calling add_emblem
2014-09-30 13:57:06 +02:00
Markus Goetz
02f971b534
OS X Overlay Icons: Fix request for sync dir itself
2014-09-30 12:53:35 +02:00
Klaas Freitag
479b340d75
Folderman: Check if socketApi member is non zero, no crashes.
2014-09-30 12:33:51 +02:00
Klaas Freitag
06c48f58cc
SyncEngine: Use proper start indicator, max unit64.
...
This avoids a warning.
2014-09-30 12:29:24 +02:00
Klaas Freitag
0ee81a2865
SocketAPI: Set permission of the socket Directory.
...
Set that to be accessible by the owner only.
2014-09-30 11:23:49 +02:00
Klaas Freitag
e78c251832
SocketAPI: Split up for specific linux and mac implementation.
2014-09-30 11:23:49 +02:00
Klaas Freitag
efbc495f79
overlays Nautilus: Adopt to the use a local unix socket not TCP.
...
Also, use the appname to find the correct branded icons.
2014-09-30 11:17:05 +02:00
Markus Goetz
f8b73eb9d9
SocketApi: Port OS X to use local sockets
2014-09-30 07:36:20 +02:00
Jenkins for ownCloud
f25a590af5
[tx-robot] updated from transifex
2014-09-30 01:25:39 -04:00
Markus Goetz
0539098371
OS X: Update GCDAsyncSocket
...
The two files are from the fork from
https://github.com/jdiehl/CocoaAsyncSocket/tree/socketUN
It supports unix domain sockets.
SHA1 was 7e97fc876522c7bf2a2a434cf40579ae9daf9da5
2014-09-30 07:09:39 +02:00
Klaas Freitag
788c27bf2f
cmake: Fix installation of overlay icons on linux
2014-09-29 16:08:49 +02:00
Olivier Goffart
a587148c73
SocketApi: Save the socket in $XDG_RUNTIME/<appname>/socket
2014-09-29 13:54:13 +02:00
Olivier Goffart
9acd3a58ee
SocketApi: Use QLocalSocket after all for windows and linux
...
Relates issue #2189
2014-09-29 12:19:33 +02:00
Jenkins for ownCloud
dce30a27b9
[tx-robot] updated from transifex
2014-09-28 02:06:12 -04:00
Jenkins for ownCloud
449f5adaba
[tx-robot] updated from transifex
2014-09-28 01:25:20 -04:00
Jenkins for ownCloud
2380b7af3d
[tx-robot] updated from transifex
2014-09-27 01:25:22 -04:00
Olivier Goffart
10989d13e4
Folder: Remove slotTerminateAndPauseSync
...
This make no sens to just set the pause config flag here. It make selective sync to mark
the folder as posed on restart
2014-09-26 12:43:54 +02:00
Olivier Goffart
fe1653ede6
csync_update: don't recurse into ignored directory.
...
This save some time when selective sync deselected a large tree
2014-09-26 12:35:56 +02:00
Olivier Goffart
b4071cec01
DiscoveryPhase: fix the name of a function
...
It was renamed from white list to black list long ago
2014-09-26 12:35:56 +02:00
Klaas Freitag
b1c842373d
Add OWNCLOUDSYNC_EXPORT to make building on windows.
2014-09-26 10:07:50 +02:00
Olivier Goffart
a3d70b3cf6
Attempt to fix a crash
...
The reply might be null at the point we are timing out.
Issue #2246
2014-09-26 10:04:36 +02:00
Jenkins for ownCloud
70912c44de
[tx-robot] updated from transifex
2014-09-26 01:25:28 -04:00
Klaas Freitag
98d9f7924d
SocketAPI: Before reporting something new check for parent permissions.
...
In case it is not allowed to create files or dirs because of missing
permissions in shares, the socket API has to report an error state
rather than the NEW state.
As discussed in mirall issue #1931
2014-09-25 21:52:20 +02:00
Klaas Freitag
172295289e
Permissions: If a top level shared dir is removed, do not restore files in it
...
A top level shared dir can always be removed on the client, even if it is
read only shared. In that case, the removal means "unsharing". Fixed the
permission check accordingly.
See bug #1918 for more information.
2014-09-25 15:39:14 +02:00
Klaas Freitag
8ba08d7e87
Activity View: honor error string even if no warning
...
that allows to specify a more specific user message to be displayed.
2014-09-25 15:03:54 +02:00
Klaas Freitag
8915f94931
Mac Overlays: handle filenames with slashes properly.
...
There are filenames with slashes on MacOSX, they can be created
in Finder. Internally they are converted to colons.
2014-09-25 12:24:32 +02:00
Markus Goetz
1543899795
Upload Chunking: Fix progress DB values
2014-09-25 11:32:54 +02:00
Klaas Freitag
31bf844452
DownloadJob: Refresh the FileInfo after renaming the target file.
...
Otherwise the activity view reports file size 0.
2014-09-25 10:59:08 +02:00
Markus Goetz
6d94acee8f
permissions: Fix root properties if no permissions used
2014-09-25 10:24:51 +02:00
Jenkins for ownCloud
0c8b74a025
[tx-robot] updated from transifex
2014-09-25 01:25:30 -04:00
Olivier Goffart
dad8c1c27c
propagator: Do not check for case clash when renaming
...
Issue #1385
When renaming, we would normaly already have an error if the file already exist.
And we want to allow the renaming to chang ethe case (Eg. "hello" -> "HELLO"
2014-09-24 16:43:01 +02:00
Klaas Freitag
2e12acdf32
doc: add a memo about the issue that defines the permission flags.
2014-09-24 16:35:50 +02:00
Jenkins for ownCloud
d6156dd755
[tx-robot] updated from transifex
2014-09-24 01:25:22 -04:00
Klaas Freitag
2c67a7ca71
progress: Set a clear start indication in the progress.
...
Before, 0 was used to indicate the sync start which wipes the activity
window. However, if there _are_ no synced items but only ignored items
the overall counter stays zero which wipes the list all the time.
This fixes bug #2171
2014-09-23 15:58:06 +02:00
Klaas Freitag
688b8dcc38
MacOverlays: Pass isDir flag to isRegisteredPath method
...
With that, a path can be added to directories to also detect the
sync top directory.
This fixes bug #2053
2014-09-23 10:25:11 +02:00
Klaas Freitag
280edee1db
cmake: fix typo
2014-09-23 10:25:11 +02:00
Jenkins for ownCloud
37a7ad4795
[tx-robot] updated from transifex
2014-09-23 02:08:06 -04:00
Jenkins for ownCloud
b9ea72f189
[tx-robot] updated from transifex
2014-09-23 01:49:01 -04:00
Klaas Freitag
8f8265b219
Mac Installer: Add file name quoting.
2014-09-22 16:45:33 +02:00
Klaas Freitag
00ae3c3120
Mac Installer: Rename the final package to branded.
2014-09-22 16:38:51 +02:00
Klaas Freitag
1e49f152be
Mac create pkg: Adjust background image path
2014-09-22 16:25:23 +02:00
Klaas Freitag
f72ca4d83e
Mac installer: Use template value for bundle name
2014-09-22 16:18:30 +02:00
Klaas Freitag
5b10a9f3a7
Minor: Remove unused definition
2014-09-22 13:47:45 +02:00
Klaas Freitag
d0fb1acebb
Win32: Define HANDLE variable, make win compile again.
2014-09-22 13:47:17 +02:00
Klaas Freitag
09be4d22ee
Nautilus: Renamed nautilus plugin script to make it branding friendly
2014-09-22 12:24:06 +02:00
Klaas Freitag
11a64320f0
git: fix entry in .gitattributes to not export binary dir.
2014-09-22 11:24:24 +02:00
Olivier Goffart
d7d241196e
tests: add the source dir in the include paths
2014-09-22 08:58:35 +02:00
Jenkins for ownCloud
4eac66b84a
[tx-robot] updated from transifex
2014-09-22 01:25:21 -04:00
Jenkins for ownCloud
fa606b38b7
[tx-robot] updated from transifex
2014-09-21 02:06:11 -04:00
Jenkins for ownCloud
497b7808b6
[tx-robot] updated from transifex
2014-09-21 01:25:21 -04:00
Jenkins for ownCloud
b10c2b5946
[tx-robot] updated from transifex
2014-09-20 01:25:29 -04:00
Christian Kamm
fa881ba1c7
Notifications: Don't emit one per error. #1777
2014-09-19 15:59:03 +02:00
Christian Kamm
eb1b17e8e4
CSync tests: Add t1.cfg to gitignore.
2014-09-19 14:21:14 +02:00
Olivier Goffart
9ae4d45243
Restart the sync when we detect we need to redo a sync
...
Fixes #1968
Relates #2038
(cherry picked from commit a84b7dc27e )
Conflicts:
src/mirall/owncloudpropagator.h
src/mirall/propagator_qnam.cpp
src/mirall/syncengine.h
2014-09-19 11:51:17 +02:00
Christian Kamm
2eec85a97c
NetworkJobs: Propagator jobs keep others from expiring. #2155
...
In some owncloud server setups multiple concurrent connections for the
same session are not supported: owncloud/core#11153
This causes issues with multiple uploads and downloads. A usual symptom
is the quota job failing and the sync aborting.
This workaround lets activity on the propagator's GET and PUT jobs
reset the timeout of all network jobs. That way, queries like the quota
job would not time out while a large up/download is in progress.
2014-09-19 11:22:57 +02:00
Olivier Goffart
1cd5681967
permissions: Remember the permissions for the root folder
2014-09-19 10:58:52 +02:00
Jenkins for ownCloud
c85b6193d5
[tx-robot] updated from transifex
2014-09-19 01:25:29 -04:00
Olivier Goffart
eab488e64f
compile after merge
2014-09-18 19:58:04 +02:00
Olivier Goffart
50e718b1e7
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
Klaas Freitag
fc36e7eccf
tests: Add a csync exclude test to check toplevel excludes.
2014-09-18 15:34:24 +02:00
Klaas Freitag
0cc2bbf5d9
csync exclude: Export the csync_exclude_add function in debug mode
2014-09-18 15:34:24 +02:00
Olivier Goffart
7c36e5c0e6
parallel chunk upload: allow "true" for the value of OWNCLOUD_PARALLEL_CHUNK
2014-09-18 14:29:38 +02:00
Jürgen Weigert
d2669debb9
Merge branch '1.7' of https://github.com/owncloud/mirall into 1.7
2014-09-18 12:37:17 +02:00
Olivier Goffart
1b62ed1e7e
Parallel chunk upload: Fix progress
2014-09-18 12:36:30 +02:00
Jürgen Weigert
637fb449c6
Fixed https://github.com/owncloud/mirall/issues/1699
...
Added missing copyright headers.
2014-09-18 12:30:42 +02:00
Daniel Molkentin
e82b319ee7
Fix owncloud man page formatting
2014-09-18 12:30:20 +02:00
Jürgen Weigert
c3d41f0d48
Fixed https://github.com/owncloud/mirall/issues/1699
...
Missing copyright headers added.
2014-09-18 12:26:55 +02:00
Klaas Freitag
e9248066df
SyncJournal: Better error report for sql statements in updateDbStructure
...
Also, even if the updateDatabaseStructure fails, precompile the sql
statements.
This will help to debug and maybe solve bug #2106
2014-09-18 12:02:28 +02:00
Daniel Molkentin
819472d366
Fix owncloud man page formatting
2014-09-18 11:44:25 +02:00
Daniel Molkentin
21bbdd6f49
Update owncloudcmd documentation
2014-09-18 11:36:14 +02:00
Christian Kamm
a88ac00115
SyncEngine: Better reporting when ignoring hardlinks. #2217
...
Also touch csync to actually let us know it's ignoring the file
due to it having hard links.
2014-09-18 11:32:29 +02:00
Christian Kamm
30683b38a8
Updater: Add "didn't check for updates" message. #2175
...
Don't show "Checking server..." when we are not.
(cherry picked from commit ece11dc3d8 )
2014-09-18 09:43:13 +02:00
Christian Kamm
45aefeb146
SelectiveSyncDialog: Change 'partial' behavior.
...
The real bug in #2219 actually was that the gui allowed users to
choose to not sync the root folder. That's not supported and no
longer possible in the UI.
Instead you may now sync a folder's files without syncing its sub-
folders.
2014-09-18 09:42:50 +02:00
Jenkins for ownCloud
9daacd7aee
[tx-robot] updated from transifex
2014-09-18 02:06:15 -04:00
Jenkins for ownCloud
580ecbff0c
[tx-robot] updated from transifex
2014-09-18 01:25:28 -04:00
Daniel Molkentin
db3318886e
Merge pull request #2214 from owncloud/2211
...
Implement (most of) #2211
2014-09-18 00:09:26 +02:00
Daniel Molkentin
54eb837950
Remove unused confdir option
2014-09-18 00:07:33 +02:00
Christian Kamm
0bd73788f4
Doc: Update csync test script README.
2014-09-17 16:18:55 +02:00
Christian Kamm
e395282e0e
SelectiveSyncDialog: Fix sync-nothing case. #2219
2014-09-17 16:13:47 +02:00
Christian Kamm
1f129d0bcb
Propagator: Don't upload files that were changed recently.
...
Instead skip them and try another sync later.
See #2167 , #2169 , #2210 .
2014-09-17 15:30:18 +02:00
Christian Kamm
c2ae5e5fd1
FolderMan: Ensure a 1s delay between sync request and start.
...
That way the propagator can detect files that are still being
changed right now and skip them.
2014-09-17 15:30:18 +02:00
Olivier Goffart
292a7357bd
t1.cfg.in: saner placeholder executable name
...
Now it is owncloudcmd and not csync
2014-09-17 14:39:34 +02:00
Christian Kamm
ece11dc3d8
Updater: Add "didn't check for updates" message. #2175
...
Don't show "Checking server..." when we are not.
2014-09-17 11:41:04 +02:00
Christian Kamm
99aa2cdf2a
Log: Print client version on sync start. #2178
2014-09-17 09:39:04 +02:00
Christian Kamm
0eb9401c62
File change detection: Also look at file sizes.
...
See #2167 and #2169 .
* csync_detect_update: Reupload a file if the sizes differ, similar
to how we reupload if the mtimes differ.
* PropagateUploadFileQNAM::slotPutFinished(): Abort an upload if the
size changed, similar to how we abort an upload if the mtimes changed.
2014-09-17 09:05:13 +02:00
Jenkins for ownCloud
ab14a589c8
[tx-robot] updated from transifex
2014-09-17 01:25:27 -04:00
Daniel Molkentin
122fa596b3
Remove stray file that was not meant to be committed
2014-09-17 00:55:55 +02:00
Daniel Molkentin
5406407ed6
Implement --non-interactive as per Juergens' request
2014-09-17 00:12:16 +02:00
Daniel Molkentin
b72cee2783
Fix passing URLs not ending in /remote.php/webdav
2014-09-16 23:53:01 +02:00
Daniel Molkentin
fe023e2229
Allow passing user/pass explicitly or via netrc
...
#2211
2014-09-16 23:52:28 +02:00
Olivier Goffart
66595a3597
Parallel chunk uploads
...
This does not include progress indicator
2014-09-16 17:40:42 +02:00
Jenkins for ownCloud
1dae928a7c
[tx-robot] updated from transifex
2014-09-16 01:25:22 -04:00
Olivier Goffart
9b1779bb06
Fix compilation
...
qFatal does not work with <<
2014-09-15 18:03:44 +02:00
Olivier Goffart
97cc05eeea
journaldb: Assert in case of SQL error
...
relates issue #2106
2014-09-15 14:27:39 +02:00
Christian Kamm
20dd3b0a69
FolderMan: Fix startFromScratch logic. #1989
...
(cherry picked from commit 4566ca3127 )
2014-09-15 13:53:38 +02:00
Christian Kamm
f348eabf19
Account: Fix cert save/restore from settings. #2160
...
(cherry picked from commit cc1121ef00 )
2014-09-15 13:53:38 +02:00
Olivier Goffart
5870a57002
wizard: fix start a clean sync
...
The problem was that the backup function failed as we tried to
move /home/xxx/ownCloud/ to /home/xxx/ownCloud/.oC_bak
The intention was to move it to /home/xxx/ownCloud.oC_bak
Issue #1989
2014-09-15 13:49:13 +02:00
Olivier Goffart
278bc5a8cd
owncloudcmd: ask for the login and password and put it in the url (if it's not there already)
...
Because we cannot rely on HTTPCredentials to open windows in a command line tool
Fixes #1860
2014-09-15 13:24:31 +02:00
Jenkins for ownCloud
3c89415df1
[tx-robot] updated from transifex
2014-09-14 01:25:21 -04:00
Jenkins for ownCloud
5981f700f5
[tx-robot] updated from transifex
2014-09-13 05:16:21 -04:00
Olivier Goffart
af5e8ee18c
AbstractNetworkJob
...
Abort the transfer in case of timeout.
This avoid that a connection that never replies blocks mirall
Issue #2148
2014-09-12 18:06:29 +02:00
Olivier Goffart
52e8343f76
ConnecitonValidator: Handle the timeout
...
otherwise the account may be stuck in a disconnect case if there is a timeout
Issue #2148
2014-09-12 18:06:17 +02:00
Olivier Goffart
a4dbf5942c
owncloudcmd: restart the sync if required
...
Fixes #2038
2014-09-12 17:23:01 +02:00
Daniel Molkentin
ada1d42ebf
Sparkle requirement bumped to 1.8
2014-09-12 16:08:52 +02:00
Daniel Molkentin
f27182ae05
fFx Utility::freeDiskSpace for win32
2014-09-12 16:08:52 +02:00
Markus Goetz
2fddf05515
OS X: Overlay Icons: Load from bundle-specific path
...
The client (in this case mirall) tells the Finder plugin where to get the icons.
This enables installation in different locations and in branded clients.
2014-09-12 15:09:47 +02:00
Markus Goetz
91d1864840
OS X: Overlay Icons: Less verbose debug output
2014-09-12 15:09:46 +02:00
Daniel Molkentin
6e42ee1bd4
Merge pull request #2194 from tim-vandecasteele/fix-apple-build
...
Fix apple build.
2014-09-12 14:39:26 +02:00
Tim Vandecasteele
f3cc614427
Fix apple build.
...
The apple build was broken because the elseif in the CMakeLists is never triggered.
Some code was not properly adapted for the new qtmacgoodies.
Some paths were not adapted to new split.
2014-09-12 14:24:26 +02:00
Olivier Goffart
79052ba7c6
Blacklist: ignore problems that don't have HTTP error code and are possibly problem on the local file system
...
Issue #1985
2014-09-12 14:13:04 +02:00
Markus Goetz
0edd4d3c02
OS X: Overlay icons: Don't show if folder is not marked as being an oC folder
2014-09-12 11:46:53 +02:00
Jenkins for ownCloud
71516c480d
[tx-robot] updated from transifex
2014-09-12 03:28:04 -04:00
Markus Goetz
4960890d70
Propagator: Commit the DB for Poll Jobs
2014-09-11 12:05:35 +02:00
Olivier Goffart
76f0f3cbf2
csync_vio_local on windows: fix overflow when computing the size of file > 4GiB
...
MAXDWORD is 0xFFFFFFFF, so if we add one, it overflows and is 0.
We need to cast it to 64 bits before
2014-09-11 11:10:58 +02:00
Jenkins for ownCloud
1304c2c4ab
[tx-robot] updated from transifex
2014-09-11 01:25:22 -04:00
Olivier Goffart
a84b7dc27e
Restart the sync when we detect we need to redo a sync
...
Fixes #1968
Relates #2038
2014-09-10 17:27:33 +02:00
Daniel Molkentin
927af0adec
Fix build on win32: add missing export
2014-09-10 16:31:47 +02:00
Daniel Molkentin
2dfbc2058f
Win32: ignore files ending in '.' or at least one space
...
Fixes #416
Fixes #2176
2014-09-10 15:21:19 +02:00
Olivier Goffart
79ee6c2f3b
csync_vio_local on windows: fix overflow when computing the size of file > 4GiB
...
MAXDWORD is 0xFFFFFFFF, so if we add one, it overflows and is 0.
We need to cast it to 64 bits before
2014-09-10 13:21:31 +02:00
Daniel Molkentin
f59a6862ca
raiseDialog: Actually send the XEvent
...
Amendment to 25c274a0bd
Conflicts:
src/mirall/owncloudgui.cpp
2014-09-10 13:21:27 +02:00
Olivier Goffart
fa962b7f53
csync_update: fix compilation warning
2014-09-10 11:08:00 +02:00
Olivier Goffart
71408bab60
I forgot to rename one of the while list to the blacklist
2014-09-10 11:01:38 +02:00
Jenkins for ownCloud
9e015eb654
[tx-robot] updated from transifex
2014-09-09 01:25:24 -04:00
Markus Goetz
4ce03e8b61
OS X: Fix Overlay icon retrieval
...
Re-retrieve all icons for a path in case we receive UPDATE_VIEW.
(But in contrast to previous code, don't delete the icons which then
would have caused screen flickering)
2014-09-07 11:38:23 +02:00
Jenkins for ownCloud
68b7f412b6
[tx-robot] updated from transifex
2014-09-07 01:25:23 -04:00
Jenkins for ownCloud
20011f3a84
[tx-robot] updated from transifex
2014-09-06 01:25:23 -04:00
Daniel Molkentin
2d020b5989
Merge pull request #2138 from owncloud/cleanup_shell_integration_nautilus
...
Cleanup and make python3 compatible shell integration nautilus
2014-09-05 15:48:16 +02:00
Markus Goetz
1909b465dc
CSync: Show file size and inode during update traversal
...
With the previous code, we saw those values only when the file/dir was also in the local DB
2014-09-05 15:23:33 +02:00
Christian Kamm
88b7f2e0ee
SyncJournal: Don't use C++11 features.
2014-09-05 12:48:45 +02:00
Markus Goetz
f5f04bcc4b
SyncEngine: Always return _renameTarget in destination() if possible
...
We want to do this since the instruction is actually ERORR, not RENAME.
2014-09-05 10:07:24 +02:00
Jenkins for ownCloud
531d586460
[tx-robot] updated from transifex
2014-09-05 01:25:28 -04:00
Christian Kamm
2630a73a1c
Propagator: Use csync to get the modification time.
...
See owncloud/core#9781
2014-09-04 14:16:23 +02:00
ckamm
4decd15ca9
Merge pull request #2161 from ckamm/stale-downloadinfo
...
Clean up stale journal entries and temporaries. #2057
2014-09-04 14:14:39 +02:00
ckamm
3a59dd24f3
Merge pull request #2162 from ckamm/error-missing-exclude
...
Don't do a broken sync when the system exclude file is missing
2014-09-04 14:14:07 +02:00
Olivier Goffart
c232411e96
uploading: make sure to cast to uint64 to avoid integer overflow
2014-09-04 13:46:01 +02:00
Christian Kamm
1cf1f6edcb
Fix style issues.
2014-09-04 13:27:11 +02:00
Christian Kamm
5d36a27893
Clean up stale journal entries and temporaries. #2057
...
* Downloadinfo entries for files that no longer need to be downloaded
are useless and can be removed. In particular, the temporary files
holding partially retrieved files are now deleted when no longer
necessary.
* The same is true for blacklist entries for paths that are no longer
being discovered.
* Same for uploadinfos for files that no longer need to be uploaded.
2014-09-04 13:14:15 +02:00
Christian Kamm
da94533647
Folders: Signout should not switch folders to paused state. #2112
...
On signout, syncs that are running in folders are aborted. That used to
also switch the state of these folders to 'paused'. To fix that, aborts
that are caused by user actions no longer change the folder paused
state.
Aborts due to errors should still pause folders! Otherwise we'd try
resyncing them even though there was an error.
2014-09-04 11:21:28 +02:00
Jenkins for ownCloud
db08d5021e
[tx-robot] updated from transifex
2014-09-04 01:25:25 -04:00
Markus Goetz
69066013c1
ownCloudTheme: Fix casing in appName()
...
Without this fix, the section in the config file uses the wrong name,
leading to re-configuration of the client needed.
2014-09-03 17:30:34 +02:00
Christian Kamm
aef569ee9d
SyncEngine: Use exclude file fallback next to binary on linux.
...
This is mainly useful for developers where the system-wide exclude file
may not exist.
2014-09-03 14:53:01 +02:00
Christian Kamm
cf881aa6dc
SyncEngine: Fix invalid slot name in sync error condition.
2014-09-03 14:52:55 +02:00
Christian Kamm
a48bf3142c
SyncEngine: Abort sync with error if system exclude file is missing.
...
Syncing without the system exclude file would cause lots of trouble.
For instance we would try uploading the temporary files we store
partially completed downloads in.
2014-09-03 14:52:46 +02:00
Jenkins for ownCloud
33d9f4b882
[tx-robot] updated from transifex
2014-09-03 01:25:21 -04:00
Markus Goetz
49c40a4b11
OS X: Have the PKG installer also be signed
2014-09-02 17:57:22 +02:00
Markus Goetz
d1eff0ae24
OS X: Add sign_app.sh
2014-09-02 16:14:00 +02:00
Daniel Molkentin
c0131695c5
Return from Folder::slotPollTimerTimeout() if the account object is 0
...
Right now, we crash instead. This can happen if a folder is created
when an account object is not (anymore/yet) created.
Fixes #2142
2014-09-02 14:51:33 +02:00
Daniel Molkentin
fcbadda40f
Make Settings Window close on Ctrl+W
...
Fixes #2141
(cherry picked from commit 2ab19b23d7 )
2014-09-02 14:03:20 +02:00
Daniel Molkentin
2455faa6fe
Account Migrator: Switch to string comparison for URLs.
...
QUrl does not normalize trailing slashes, so there is no benefit
of using QUrl here.
(cherry picked from commit d770f9cc1a )
2014-09-02 14:03:07 +02:00
Markus Goetz
7da8a5e374
OS X: Create tbz in create_mac_pkg.sh
...
Sparkle needs this
2014-09-02 12:15:11 +02:00
Jenkins for ownCloud
b3950165c4
[tx-robot] updated from transifex
2014-09-01 15:47:58 -04:00
Jenkins for ownCloud
b8ab859c59
[tx-robot] updated from transifex
2014-09-01 01:25:19 -04:00
Jenkins for ownCloud
99a3cb0eab
[tx-robot] updated from transifex
2014-08-31 13:00:41 -04:00
Markus Goetz
0be4b59cff
Sparkle: Keep permissions from bundle
2014-08-31 18:57:39 +02:00
Jenkins for ownCloud
fef37b0222
[tx-robot] updated from transifex
2014-08-31 02:06:16 -04:00
hefee
ddfc7c75df
Fix minor Python styling issues
...
* Do not use sapces inside parenthesis
* make indend PEP8
* empty lines should not contain whitespaces
2014-08-31 00:35:56 +02:00
David Prévot
7618f29657
Fix minor Python syntax errors
...
The installation fails because of these:
TabError: inconsistent use of tabs and spaces in indentation
SyntaxError: Missing parentheses in call to 'print'
2014-08-31 00:28:25 +02:00
Olivier Goffart
291231c561
Merge missing commits from 1.6.2-themefix into 1.7
...
Conflicts:
VERSION.cmake
2014-08-30 17:57:58 +02:00
Dominik Schmidt
7ad557f2f8
Add crash reporter to osx package and don't build it with BUILD_LIBRARIES_ONLY enabled
2014-08-30 14:45:39 +02:00
Dominik Schmidt
ef70052b0e
Package installer if it was built
2014-08-30 14:12:40 +02:00
Dominik Schmidt
202426f536
Make crash reporter application name branded
2014-08-30 11:05:52 +02:00
Dominik Schmidt
d240415671
Make crash reporter logo branded
2014-08-30 11:05:34 +02:00
Dominik Schmidt
1aca22b5f8
Make crash reporter executable branded
2014-08-30 10:46:09 +02:00
Jenkins for ownCloud
ff970ee3f5
[tx-robot] updated from transifex
2014-08-30 02:06:15 -04:00
Jenkins for ownCloud
51a46a8ad7
[tx-robot] updated from transifex
2014-08-30 01:25:30 -04:00
hefee
68792ee9db
Fixing spellingerror
...
GNU Public License -> GNU General Public License
2014-08-30 02:18:55 +02:00
Klaas Freitag
bcff1ced5e
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folderman.cpp
src/gui/wizard/owncloudadvancedsetuppage.cpp
src/libsync/account.cpp
2014-08-29 20:40:33 +02:00
Klaas Freitag
7ce2a93c63
Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7
...
Conflicts:
src/CMakeLists.txt
src/mirall/folderman.cpp
src/mirall/folderman.h
src/mirall/owncloudtheme.h
2014-08-29 20:23:07 +02:00
Klaas Freitag
4d33773cef
Nautilus Overlays: Rename icons according to branding.
...
Added a script that renames the icons and patches the python file for
nautilus.
2014-08-29 20:02:52 +02:00
Olivier Goffart
5d19426930
Propagator: When the server don't support ranges, reset the counter so the progress is not messed up
...
Issue #2081
2014-08-29 19:33:20 +02:00
Olivier Goffart
1b51a10b19
Socket API: be consistant in the VERSION command and add the VERSION at the beginning
2014-08-29 17:28:36 +02:00
Olivier Goffart
aab870af32
desktop file: add a Comment
...
Fixes #2130
2014-08-29 17:14:40 +02:00
Dominik Schmidt
38ff7d87c8
Hide crashreporter config option if not build with crashreporter enabled
2014-08-29 17:07:31 +02:00
Markus Goetz
7c70ada423
Exclude List: Gnucash temp files
...
Fixes #2045
2014-08-29 16:45:08 +02:00
Markus Goetz
12e2bac16b
Propagator: Also parse OC-ETag header
...
Client side part of https://github.com/owncloud/core/issues/9005
2014-08-29 16:30:58 +02:00
Olivier Goffart
34a27c748a
Progress: in case of resuming chunks, advance directly at startup by the amount of chunk already done
...
Fixes #2103
2014-08-29 16:06:56 +02:00
Markus Goetz
7ec0c52439
Poll URL: Use trimmed() on response
2014-08-29 13:58:33 +02:00
Jenkins for ownCloud
905dd20d0c
[tx-robot] updated from transifex
2014-08-29 01:25:25 -04:00
Olivier Goffart
a73fbccf8c
t4.pl: add a test to test that ignored file are not deleted
2014-08-28 19:33:52 +02:00
Klaas Freitag
7f1d707d23
ownCloud Theme: Do not have the oCSetupTop custom media, see #1445
2014-08-28 18:10:53 +02:00
Klaas Freitag
f1fb36bcb8
Tests: Get rid of the Carp package that ogoffart does not have.
...
Recommendation: Use a decent distribution! But anyway....
2014-08-28 18:10:53 +02:00
Daniel Molkentin
25c274a0bd
X11: Bring Settings window to front when launched
2014-08-28 17:25:00 +02:00
Olivier Goffart
d4bbd28757
csync: remove ignored_cleanup: it's not used anymore
2014-08-28 17:16:51 +02:00
Olivier Goffart
98b7248df0
reconcile/update: don't remove directory that contains ignored files
2014-08-28 17:16:17 +02:00
Olivier Goffart
0fb0f2c204
Selective sync: start a sync when the selective sync settings changes
2014-08-28 16:27:46 +02:00
Dominik Schmidt
6abaad1ae8
Show crash reporter if trying to read the crash-reporter-enabled config crashes
2014-08-28 16:23:14 +02:00
Dominik Schmidt
89aec52503
Add checkbox to general settings to disable the crash reporter
2014-08-28 16:19:17 +02:00
Olivier Goffart
79d13d9242
Selective sync: deselecting a folder removes it from the local file system
2014-08-28 15:53:49 +02:00
Markus Goetz
b6f42a91f4
OS X: Fix Finder bundle NVTY->OWNC
2014-08-28 15:45:07 +02:00
Daniel Molkentin
cc5f5cf3a6
Set the minimum supported OS X version to 10.7
...
We dropped 10.6 support quite a while ago.
This should avoid bug reports from 10.6 users.
Fixes #2122
2014-08-28 14:50:00 +02:00
Markus Goetz
2aef6a2174
Poll URL: Don't delete from DB in case of 503
2014-08-28 13:44:21 +02:00
Olivier Goffart
79f00c2a2a
Wizard: adjust alignements
2014-08-28 13:32:14 +02:00
Olivier Goffart
e5068e7543
Selective sync: if one click twice on the button in the wizard, it should keep the blacklist
2014-08-28 12:25:44 +02:00
Olivier Goffart
858218ac34
Wizard: new layout
2014-08-28 12:18:19 +02:00
Dominik Schmidt
b8e8d975aa
Add CRASHREPORTER_SUBMIT_URL to OWNCLOUD.cmake
2014-08-28 12:08:07 +02:00
Markus Goetz
6e0330ff65
SyncEngine: Error out if we don't have a sync dir
2014-08-28 11:47:40 +02:00
Markus Goetz
3aa7178382
PollJob: Increase timeout
2014-08-28 11:27:08 +02:00
Dominik Schmidt
439bf7641e
Use include path for libcrashreporter-qt instead of lengthy relative include
2014-08-28 11:11:42 +02:00
Dominik Schmidt
34042028b3
Add CRASHREPORTER_SUBMIT_URL define and default it to some placeholder owncloud url
2014-08-28 11:05:46 +02:00
Markus Goetz
d69049ce10
OS X: Fix Finder plugin
2014-08-28 10:21:56 +02:00
Jenkins for ownCloud
44a281534d
[tx-robot] updated from transifex
2014-08-28 01:25:30 -04:00
Daniel Molkentin
59a9cc7c12
OS X build: use correct macro for version number
2014-08-28 00:08:24 +02:00
Markus Goetz
2f34b046d0
Overlay Icons: Improve OS X version, improve general feedback
...
Now the update phase of the syncing algorithm pushes stuff the notification socket too.
2014-08-27 19:15:43 +02:00
Olivier Goffart
a73316306d
Selective sync: new design in the wizard
2014-08-27 19:03:11 +02:00
Daniel Molkentin
cf12a56b4c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/socketapi.cpp
2014-08-27 18:22:07 +02:00
Olivier Goffart
928652e4cf
Selective sync: rename the button 'choose what to sync'
2014-08-27 17:31:57 +02:00
Olivier Goffart
7950b49cb1
Selective sync dialog: fix fetching sub directory when the folder is not the root folder
2014-08-27 17:19:36 +02:00
Markus Goetz
f8b1b243c1
OS X: Fix installer target name if we have a build number
2014-08-27 14:44:21 +02:00
Klaas Freitag
cc6aa66ab0
JournalDB: Do prepare the queries even if the db update failed.
...
Also, add more logging in case SQL errors happen while db structure
update.
2014-08-27 14:01:33 +02:00
Olivier Goffart
ea381392a7
SocketAPI: fix the BROADCAST message
2014-08-27 13:55:06 +02:00
Olivier Goffart
bb7f63dcfd
AccountSettings: be less verbose in the status string
2014-08-27 13:51:14 +02:00
Olivier Goffart
253d65727b
Socket api: Add a VERSION command
2014-08-27 13:51:14 +02:00
Markus Goetz
61138b58bf
OS X: Quote the installer filename
...
Viel hilft viel
2014-08-27 12:49:22 +02:00
Markus Goetz
5490063b7e
OS X: Fix installer creation
...
The script should know independently of the machine
2014-08-27 12:02:57 +02:00
Klaas Freitag
d2e1489fe7
Propagator: Set the chunk size to 20MB as requested by Matt.
2014-08-27 10:35:58 +02:00
Daniel Molkentin
2c6324e3e5
Fix tests
2014-08-27 10:27:29 +02:00
Jenkins for ownCloud
e442ba863a
[tx-robot] updated from transifex
2014-08-27 01:25:26 -04:00
Dominik Schmidt
2b4849a2fa
Add crash reporter using libcrashreporter-qt
2014-08-26 18:15:13 +02:00
Klaas Freitag
eb898646bc
Create Mac Pack: Copy the creator script to the build directory.
2014-08-26 18:13:43 +02:00
Markus Goetz
79b547b83b
Icon Overlay OS X: Complain if icon couldnt be loaded
2014-08-26 17:21:15 +02:00
Olivier Goffart
2356601bb3
folder: Make sure not to pol the server if the account is disconnected
...
Fixes #2108
2014-08-26 16:23:19 +02:00
Olivier Goffart
9b88c7d3c1
SSLButton: fix memleak
2014-08-26 15:59:19 +02:00
Olivier Goffart
302499b483
uploading: make sure to cast to uint64 to avoid integer overflow
2014-08-26 15:58:55 +02:00
Dominik Schmidt
17e16f5e79
Add "Crash" entry to systray if started with --debug
2014-08-26 15:46:24 +02:00
Dominik Schmidt
b176ff6626
Don't use CMAKE_INSTALL_PREFIX for RPATH
2014-08-26 15:19:46 +02:00
Daniel Molkentin
e5471d8318
Build after merge
2014-08-26 14:33:21 +02:00
Daniel Molkentin
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
Jenkins for ownCloud
03dc27a327
[tx-robot] updated from transifex
2014-08-26 01:25:22 -04:00
Jenkins for ownCloud
9291ace558
[tx-robot] updated from transifex
2014-08-25 01:25:17 -04:00
Jenkins for ownCloud
15c11ea172
[tx-robot] updated from transifex
2014-08-24 02:06:11 -04:00
Jenkins for ownCloud
cd6950d984
[tx-robot] updated from transifex
2014-08-24 01:25:18 -04:00
Jenkins for ownCloud
de96350bee
[tx-robot] updated from transifex
2014-08-23 01:25:22 -04:00
Markus Goetz
b037e6356e
TokenCredentials, DirectDownload: Rework cookie handling
...
That way we don't override QNAM's cookie jar behaviour
2014-08-22 13:46:22 +02:00
Markus Goetz
824628061b
Propagator: Don't have cookies overriden by QNetworkCookieJar
...
The direct download feature has its own cookies, don't let QNAM override them.
2014-08-22 12:12:46 +02:00
Jenkins for ownCloud
a9f1e165b5
[tx-robot] updated from transifex
2014-08-22 01:25:19 -04:00
Daniel Molkentin
c60b433c42
create shellext path
2014-08-21 20:33:25 +02:00
Daniel Molkentin
933c7e36d1
NSIS: fix target path for shell extension
2014-08-21 17:33:22 +02:00
Markus Goetz
449abace66
CSync: Ignore OS X files with hidden flag
2014-08-21 16:43:24 +02:00
Klaas Freitag
6025b3a91b
Bump version to beta1
2014-08-21 14:33:03 +02:00
Klaas Freitag
c473428be6
Merge pull request #2084 from owncloud/contextless_exclude
...
Contextless exclude, @ogoffart reviewed, I'll merge.
2014-08-21 13:15:18 +02:00
Klaas Freitag
e06e5fe55f
Excludes: Fix unit tests for the new exclude load interface.
...
Also removed some commented lines.
2014-08-21 13:12:05 +02:00
Klaas Freitag
dc8f437b31
Excludes: Add an context free implementation of exclude file loading.
...
So that we are more thread safe.
2014-08-21 12:43:04 +02:00
Daniel Molkentin
2219d409a4
Update binary submodule
2014-08-21 11:48:59 +02:00
Olivier Goffart
aabcf80774
Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree
2014-08-21 11:33:38 +02:00
Olivier Goffart
1cf956ec21
Discovery phase: clear the callbacks after use
2014-08-21 11:27:25 +02:00
Daniel Molkentin
315c2eb4ca
Windows Shell Integration: Ensure precedence
2014-08-21 11:06:10 +02:00
Klaas Freitag
54e2b9345b
GUI: on Mac do not call slotUpdateAccountIcon
2014-08-21 11:00:57 +02:00
Jenkins for ownCloud
9743fee8f9
[tx-robot] updated from transifex
2014-08-21 02:06:14 -04:00
Jenkins for ownCloud
696f801df0
[tx-robot] updated from transifex
2014-08-21 01:25:23 -04:00
Klaas Freitag
fef0d0b31c
Overlays Nautilus: Handle UNREGISTER_PATH and do proper reconnect.
...
This is needed to fix #2073
2014-08-20 17:33:48 +02:00
Klaas Freitag
75101a0319
Application: Unload all folders when shutting down.
...
That sends a proper UNREGISTER message via socket API.
2014-08-20 17:33:48 +02:00
Klaas Freitag
d1a660ce20
SocketAPI: Add parameter to enable wait for the socket write.
...
This is needed to wait until the UNREGISTER message is sent to the
shell code when mirall shuts down.
2014-08-20 17:33:48 +02:00
Klaas Freitag
4356005c5a
FolderMan: Do not remove the folder icon too early from the map.
...
Otherwise, method unloadFolder can not do important frees.
This is one part of the fix for #2073 because now the socketapi will
send the UNREGISTER_PATH message over the socket.
2014-08-20 17:33:48 +02:00
Daniel Molkentin
86a00eee3f
Merge pull request #2079 from owncloud/nsis_use_installlib
...
Use InstallLib to install the overlay icons
2014-08-20 17:19:40 +02:00
Daniel Molkentin
ccf532672b
Use InstallLib to install the overlay icons
...
This allows for a cleaner expirience
2014-08-20 16:07:22 +02:00
Daniel Molkentin
6b52e9db34
Fix crash in accountsettings
2014-08-20 16:07:06 +02:00
Daniel Molkentin
8fdee79505
Fix crash in accountsettings
2014-08-20 16:06:38 +02:00
Markus Goetz
d9de6e68ad
OS X: Optimize Finder icon drawing code
...
Don't have an intermeditate TIFF.
2014-08-20 14:02:58 +02:00
Klaas Freitag
988fe70771
Merge pull request #2075 from owncloud/use_folder_paused
...
Rework of the status icons in FolderMan and Folder objects.
2014-08-20 10:50:28 +02:00
Jenkins for ownCloud
132fac86d7
[tx-robot] updated from transifex
2014-08-20 01:25:19 -04:00
Klaas Freitag
d02175210b
Status Icon: Set a proper icon if no sync is configured.
...
This fixes bug #1956
2014-08-19 17:47:28 +02:00
Daniel Molkentin
1dd3d080b8
Update binary submodule
2014-08-19 17:25:59 +02:00
Daniel Molkentin
d171431ac7
Windows Shell Integration: Add version information
2014-08-19 15:52:58 +02:00
Daniel Molkentin
76e0d61b19
Windows Shell Integration: Register icons with well known name
2014-08-19 15:52:47 +02:00
Daniel Molkentin
cc6d83a953
Windows Shell Integration: Adjust port
2014-08-19 15:51:40 +02:00
Klaas Freitag
617887a0c6
Propagator: If the sync was interrupted by pausing, do not show error.
...
Handle problems which happen because of pausing the sync as soft errors
rather than normal errors which are blacklisted and displayed in the
gui.
This fixes bug #1959
2014-08-19 14:21:59 +02:00
Klaas Freitag
e4fe4cb4d3
Status icons: Display the correct icons after startup connect.
2014-08-19 14:21:59 +02:00
Klaas Freitag
dc0a054d94
Status icons: Set the offline icon at the very beginning.
...
Otherwise, if the account is signed out and opens the credential popup,
there is a wrong icon displayed. If the account is coming from keychain
this icon is quickly overwritten.
2014-08-19 14:21:51 +02:00
Klaas Freitag
924d9b985f
Some minor cleanups.
2014-08-19 14:21:51 +02:00
Klaas Freitag
bb3bd6930a
StatusModel: Have another property accountConnected.
...
With that , make the status model aware of the account connection state.
With that, we can grey out the correct state icon if the account is not
connected and display the normal icon if the account is connected.
2014-08-19 14:21:51 +02:00
Klaas Freitag
1245ed6f06
Status Icons: Let FolderMan only write the folder config files.
...
Remove the setSyncEnabled() call to individual folders which mistakenly
set the folders to pause. Let the folders keep their pause state on their
own.
If FolderMan is set to be enabled emit a general refresh signal rather
than one for each folder.
2014-08-19 14:21:51 +02:00
Klaas Freitag
01b0ee49de
Status Icons: Rename the syncEnable method to isPaused.
...
Previously, in folder and folderman there have been the syncEnabled
properties, but they confused the semantics: While in FolderMan the
syncEnabled flag represents the network connection and stuff, in
Folder it represented if the user paused or resumed the folder.
This resulted in mixed use of both, which lead to wrong icon states.
This patch renames the folder methods and properties to isPaused to
make more clear about what it is.
2014-08-19 14:21:42 +02:00
Jenkins for ownCloud
2436ef9574
[tx-robot] updated from transifex
2014-08-19 02:06:17 -04:00
Jenkins for ownCloud
94f3a1ab1f
[tx-robot] updated from transifex
2014-08-19 01:25:24 -04:00
Olivier Goffart
9c98883bea
propagator mkcol: If the server replies with a file-id in the header, use it
...
Newer server will have a file id directly in the file header.
https://github.com/owncloud/core/issues/9000
2014-08-18 20:42:43 +02:00
Olivier Goffart
2fb19e25b5
Fix clang 3.0 compilation
2014-08-18 19:44:18 +02:00
Daniel Molkentin
6fbbe2d0e4
Create ShellIconOverlayIdentifiers key
...
It may not exist. Registration fails in that case.
2014-08-18 17:06:26 +02:00
Olivier Goffart
c291eb3db4
Fix compilation error
2014-08-18 15:45:58 +02:00
Olivier Goffart
7f38ce8908
Selective sync: the button should only be enabled while connected
2014-08-18 15:45:38 +02:00
Olivier Goffart
1781400340
fix compilation
2014-08-18 15:28:24 +02:00
Olivier Goffart
3760f14da8
Restore the log window
2014-08-18 15:16:33 +02:00
Olivier Goffart
dc18366111
DiscoveryPhase: put in namespace Mirall
2014-08-18 14:45:48 +02:00
Olivier Goffart
936252765a
Merge branch 'master' into selective_sync
...
Conflicts:
src/mirall/syncengine.cpp
src/mirall/syncengine.h
2014-08-18 14:44:43 +02:00
Markus Goetz
b62b87eed3
OS X: Rename LiferayNativity code for shell icons
2014-08-18 12:57:29 +02:00
Klaas Freitag
4b716f3ea6
About page: Fix the translation of developer names.
2014-08-18 12:17:13 +02:00
Klaas Freitag
ddbe181e48
Update phase progress: Check if callback is defined.
2014-08-18 11:51:45 +02:00
Klaas Freitag
27f9d4523b
Settings: Display the commit SHA both in branded and unbranded.
...
Also, do not put the developer names into the translation string.
2014-08-18 11:27:56 +02:00
Jenkins for ownCloud
8a7cfbd8de
[tx-robot] updated from transifex
2014-08-18 01:25:25 -04:00
Volkan Gezer
463a9a5485
space
2014-08-17 17:38:33 +02:00
Jenkins for ownCloud
ee7fe4a38a
[tx-robot] updated from transifex
2014-08-17 01:25:21 -04:00
Klaas Freitag
dccb9def3a
Merge pull request #2067 from owncloud/grammar
...
subject verb agreement - very good, thanks.
2014-08-16 12:13:01 +02:00
Jenkins for ownCloud
5c5d57a996
[tx-robot] updated from transifex
2014-08-16 02:06:14 -04:00
Jenkins for ownCloud
de2ce5a0a2
[tx-robot] updated from transifex
2014-08-16 01:25:23 -04:00
Sandro Knauß
7b114e2cae
Use QStandardPaths for linux if building with qt>=5
2014-08-16 03:12:20 +02:00
Volkan Gezer
25d519fed3
subject verb agreement
2014-08-15 20:49:47 +02:00
Klaas Freitag
8d819956d3
Tests: Fixed the CSync statedb test defined in the mirall module.
2014-08-15 18:33:04 +02:00
Klaas Freitag
4aec783362
Nautilus Overlays: Fix: do not change an dictionary which is iterated.
...
Also, item.invalidate_extension_info() is sufficient, no need to call
update_file_info afterwards.
2014-08-15 17:16:47 +02:00
Klaas Freitag
b494181764
Nautilus Overlays: Use port 34001 by default.
2014-08-15 17:16:47 +02:00
Olivier Goffart
9575271fcd
Selective sync: hide the header
2014-08-15 16:49:22 +02:00
Olivier Goffart
b6eda9076e
Selective sync: add a page in the folder wizard
2014-08-15 16:40:11 +02:00
Markus Goetz
88072a985a
SyncEngine & UI: Move QElapsedTimer to object
...
Using a function static is too dangerous when multiple threads are involved.
2014-08-15 16:20:43 +02:00
Markus Goetz
c27f151451
SyncEngine & UI: Make the function part of UpdateJob
...
That way we can easily emit UploadJob's signals
2014-08-15 16:11:51 +02:00
Markus Goetz
64a7025522
CSync: Add a 30 second connect (not read) timeout
2014-08-15 15:54:13 +02:00
Markus Goetz
ce2741cebc
SyncEngine & UI: Progress notifications for update phase
...
For each directory (local and remote, we have UI update throtting code)
a signal is emitted.
It is used by the settings dialog and the tray menu.
2014-08-15 15:28:35 +02:00
Daniel Molkentin
b40b670639
Remove owncloud_logo_blue.png from mirall.qrc resource
...
It not used in mirall itself.
2014-08-15 15:12:42 +02:00
Daniel Molkentin
3d6b622879
Merge pull request #2064 from owncloud/fix-1959
...
Show folder icon a offline when account is offline
2014-08-15 15:11:06 +02:00
Daniel Molkentin
4c67a8812a
Show folder icon a offline when account is offline
...
Fixes #1959
2014-08-15 15:01:01 +02:00
Olivier Goffart
4c4d02c0d0
Selective Sync: refactor the widget in its own class
2014-08-15 14:58:16 +02:00
Olivier Goffart
c1831f4946
Selective sync: use a black list instead of a white list
2014-08-15 12:29:10 +02:00
Olivier Goffart
4b2c1bacd1
Merge remote-tracking branch 'origin/master' into selective_sync
2014-08-15 10:28:50 +02:00
Jenkins for ownCloud
3909102436
[tx-robot] updated from transifex
2014-08-15 01:25:29 -04:00
Klaas Freitag
78e50747e4
Updated the about text for the generic ownCloud Theme.
2014-08-14 17:12:23 +02:00
Klaas Freitag
b09498d852
csync journal: Improve get_below_path query.
...
Add another index on the pathlen column. Use that column to deselect
all rows that are shorter than the path to search files below. That
shrinks the amount of rows to examine using LIKE tremendously by
a cheaply to query for criteria.
2014-08-14 13:52:44 +02:00
Klaas Freitag
7fcf723039
SyncJournal: Add an index on inode to the journal database.
2014-08-14 13:22:43 +02:00
Klaas Freitag
d27ab8c6ca
Revert "FolderMan: Proper singleton implementation."
...
This reverts commit 0350508b65 .
2014-08-14 12:46:01 +02:00
Klaas Freitag
0350508b65
FolderMan: Proper singleton implementation.
...
The connect in SocketAPI had to be moved because it also uses
FolderMan::instance(). And since SocketAPI is instanciated in
FolderMans constructor, this was a deadlock.
Now the connect is tried on every new socket connection in SocketAPI
but I assume that multiple attempts to connect are not an issue.
2014-08-14 11:32:03 +02:00
Klaas Freitag
32739cc305
SyncEngine: End the journal transaction after update.
2014-08-14 11:32:02 +02:00
Klaas Freitag
f515fe77c4
SyncJournal: Fix logging text.
2014-08-14 11:32:02 +02:00
Klaas Freitag
f6d20cbe55
nautilus overlay: Fix reconnect, create a new socket everytime.
2014-08-14 11:07:31 +02:00
Klaas Freitag
8bc0d9acd3
Updater: Added a bit of useful logging.
2014-08-14 11:07:31 +02:00
Klaas Freitag
73325bcd41
csync statedb: Fixed handling of sqlite reply value.
2014-08-14 11:07:31 +02:00
Klaas Freitag
1b5bbfdad3
csync statedb: Set sqlite3_busy_timeout to 5 seconds.
2014-08-14 11:07:31 +02:00
Klaas Freitag
fcd211b190
overlayNautilus: Better reconnect behaviour if mirall was not running.
2014-08-14 11:07:31 +02:00
Jenkins for ownCloud
55b3eb467f
[tx-robot] updated from transifex
2014-08-14 01:25:22 -04:00
Jenkins for ownCloud
192c23bfce
[tx-robot] updated from transifex
2014-08-13 02:06:14 -04:00
Jenkins for ownCloud
72e0418e4c
[tx-robot] updated from transifex
2014-08-13 01:25:32 -04:00
Daniel Molkentin
4fc044d368
Merge branch 'master' into move_lib_to_sep_dir
...
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
Daniel Molkentin
1544606bf0
Always handle 401 requests, except for network jobs
...
It is not enough to only implement it for the QNAM returned
by the ShibbolethCredentials, because we sometimes need it
when we have no valid credentials set (and are using dummy
credentials in the course). The main use case is the
Webview opened by Shibboleth for FBA.
But as a side-effect, we can use it to handle auth requests
from the updater and other places.
2014-08-12 19:25:59 +02:00
Olivier Goffart
255330d342
Add a "Skip Folder Configuration" button in the wizard
...
This allow to start owncloud the first time but not automatically sync
everything, but let the user configure sub folders instead
2014-08-12 17:34:54 +02:00
Olivier Goffart
ad139e19ab
Fix error reported by address sanitizer
...
Qt allow to call deleteLater on a null object, but it is an undefined behaviour
2014-08-12 17:34:54 +02:00
Markus Goetz
4c0891a22e
Tests: Give a more random name to test directories
...
Conflicts:
csync/tests/ownCloud/ownCloud/Test.pm
2014-08-12 16:27:03 +02:00
Markus Goetz
8e6e51f9a6
OS X: Move include to MAC define
2014-08-12 14:58:34 +02:00
Markus Goetz
faa502163e
OS X: Finally(?) fix stay-on-top behaviour of settings dialog
...
Fixes #1795
2014-08-12 14:48:42 +02:00
Olivier Goffart
4ff0e7e0a2
Silent some warnings
2014-08-12 14:03:04 +02:00
Olivier Goffart
12459bf07e
selective sync: fix whitelist matching
2014-08-12 11:43:42 +02:00
Olivier Goffart
b25ef28e82
Selective sync: remember the old list when accepting the dialog even if the tree was not expanded
2014-08-12 11:12:58 +02:00
Jenkins for ownCloud
ef6c82ba00
[tx-robot] updated from transifex
2014-08-12 01:25:26 -04:00
Olivier Goffart
7e009667a2
Selective sync: ignore the files that are not in the selective sync white list
2014-08-11 18:42:24 +02:00
Olivier Goffart
1f1eb933d1
Move the update job in a new file named discoveryphase
...
"Discovery" is a better name than "update"
2014-08-11 18:42:24 +02:00
Olivier Goffart
aa85e875bd
Selective sync: Add UI to select paths
2014-08-11 18:42:24 +02:00
Daniel Molkentin
1b4c613fa6
ProtocolWidget: Disable copy button if widget is empty.
2014-08-11 16:38:51 +02:00
Daniel Molkentin
57ef515def
Use std=c++0x instead of c++11
...
Required for compat with Ubuntu 12.04, and possibly RHEL.
2014-08-11 15:46:45 +02:00
Markus Goetz
8cd1d43798
TokenCredentials: Don't overwrite Cookie header
...
If the request already had a cookie header, there was a reason for it.
Don't blindly overwrite it.
2014-08-11 15:40:12 +02:00
Daniel Molkentin
59643177af
Updated binary dir
2014-08-11 15:39:47 +02:00
Jenkins for ownCloud
e2d5ae1035
[tx-robot] updated from transifex
2014-08-11 02:06:11 -04:00
Jenkins for ownCloud
cd9f2e5ea5
[tx-robot] updated from transifex
2014-08-09 01:25:23 -04:00
Markus Goetz
acd3df33b6
Merge branch 'long_running_put' into il
2014-08-08 12:00:26 +02:00
Markus Goetz
1bc8fd9b49
CMake: Don't need translations with token auth compile
2014-08-08 11:59:14 +02:00
Klaas Freitag
600a6d9346
Bumped version to alpha1
2014-08-08 10:57:09 +02:00
Jenkins for ownCloud
0e22864426
[tx-robot] updated from transifex
2014-08-08 01:25:28 -04:00
Daniel Molkentin
5306cdc7a1
Shell Integration: Fix Integration bug when explorer starts before OCC
...
Also slightly improves performance
2014-08-08 02:40:46 +02:00
Daniel Molkentin
344b98bf13
Shell Integration / MSVC: Fix target platform
2014-08-08 02:40:46 +02:00
Klaas Freitag
12f5e4b46e
csync oC Util: set field flag correctly to avoid etag memleak.
...
The fields varialbe should contain or'ed flags of the fields set
in the csync_vio_file_stat_t struct. The problem was that the field
for CSYNC_VIO_FILE_STAT_FIELDS_PERM was assigned rather than or'ed
which makes the release function for the struct not freeing the
etag memory => memleak.
2014-08-07 23:14:21 +02:00
Daniel Molkentin
261d7ee688
Ignore binary dir for git exports
2014-08-07 16:50:50 +02:00
Daniel Molkentin
633267c457
Update binary dir
2014-08-07 16:46:57 +02:00
Daniel Molkentin
80f9ed70d3
NSIS: Script to download the VS runtimes
2014-08-07 16:24:09 +02:00
Daniel Molkentin
fa8f6f91c4
NSIS: Add a packaging routine for the overlay icons
2014-08-07 15:54:39 +02:00
Klaas Freitag
c3f8e099f4
tests: Never stumble over an already existing test share dir.
2014-08-07 15:45:17 +02:00
Klaas Freitag
6cb8134690
SocketAPI: Use Win32 function SHChangeNotify to notify Explorer.
2014-08-07 14:59:06 +02:00
Olivier Goffart
95a77e5ccc
Merge branch 'il'
2014-08-07 14:29:27 +02:00
Olivier Goffart
21783ecef7
SyncEngine: fix permission detection of moves
...
Two problems:
- "M" was used instead of "V"
- The extraction of the parent folder of the destination was wrong
2014-08-07 14:27:27 +02:00
Klaas Freitag
d8a8b53fc9
SocketAPI: Also update view when paused.
2014-08-07 14:07:08 +02:00
Klaas Freitag
e71ce01f90
tests: Some more tests with local files and shares.
2014-08-07 12:48:14 +02:00
Olivier Goffart
6827f9977c
Merge branch 'il'
...
Conflicts:
doc/ocdoc
2014-08-07 12:15:50 +02:00
Olivier Goffart
6d24bd0361
journaldb: Fix that fileid might be missing in the db
...
When recovering from a inalid move operation, we call
avoidReadFromDbOnNextSync. This will remove the fileid from the db so
we don't detect a move on the next sync. But we want the next sync to fetch
the file id again, and this can only happen if we don't read them
from the db and do the actual PROPFIND, this is done by avoidReadFromDbOnNextSync
However, if there is propagation in that source directory later, it
will overide the invalid etag with the real one and we will not uissue the PROPFIND
to fetch the fileid.
We must therefore also protect the future write to the DB when calling
avoidReadFromDbOnNextSync
2014-08-07 12:14:45 +02:00
Markus Goetz
22c1629dd3
SyncEngine: Keep csync_journal with proper values for fileId and remotePerm
...
Before this patch, we had a lot of empty rows because we created
the SyncFileItems with the wrong(=local) data.
2014-08-07 10:14:14 +02:00
Jenkins for ownCloud
bd9d5432f5
[tx-robot] updated from transifex
2014-08-07 02:06:14 -04:00
Jenkins for ownCloud
370ee5c6f6
[tx-robot] updated from transifex
2014-08-07 01:25:25 -04:00
Klaas Freitag
fe2e4d87c5
tests: Fix t5: work with ownCloud 7 sharing.
2014-08-06 17:19:02 +02:00
Klaas Freitag
e9c4635f6b
tests: Add another two seconds break, hope to make it work in virt. env.
...
Tests fail randomly on the CI computer which is virtualized. Maybe this
fix helps.
2014-08-06 11:34:35 +02:00
Jenkins for ownCloud
7337010fd8
[tx-robot] updated from transifex
2014-08-06 05:10:32 -04:00
Daniel Molkentin
f06019ab81
NSIS: First steps at installing the shell extension
2014-08-06 10:44:17 +02:00
Olivier Goffart
55567f8dd2
remove unused variable
2014-08-06 10:20:58 +02:00
Klaas Freitag
2ccfdcb084
NautilusOverlays: return False if sock connection breaks
2014-08-06 09:52:52 +02:00
Daniel Molkentin
084d9de4c9
Add binary submodule
2014-08-06 09:28:18 +02:00
Jenkins for ownCloud
41875c2ddb
[tx-robot] updated from transifex
2014-08-06 01:25:31 -04:00
Daniel Molkentin
4ad9ff4301
Merge remote-tracking branch 'origin/win_overlay_icons'
...
Conflicts:
.gitignore
2014-08-05 19:27:51 +02:00
Daniel Molkentin
c7ff1e9b3f
Windows Shell extension: Add watched directories
2014-08-05 19:23:40 +02:00
Markus Goetz
fe3f751a8a
OS X: Slightly improve pkgproj
...
It is still too much bound to Klaas' machine.
2014-08-05 17:16:17 +02:00
Daniel Molkentin
996b7166d2
Merge pull request #2027 from owncloud/l10n-fix
...
Use am. eng. since brit. eng. is handled on transifex
2014-08-05 14:11:20 +02:00
Daniel Molkentin
839b2fa8fd
SocketAPI: Convert to unix path before comparing with black list
2014-08-05 13:11:52 +02:00
Daniel Molkentin
8b1aebcdba
No need to ship the Qt4-based qtkeychain DLL
2014-08-05 13:11:15 +02:00
Klaas Freitag
f4e2041b0b
CMake: Fix installation of the icons, path corrected.
2014-08-05 11:46:21 +02:00
Jenkins for ownCloud
24df6f838d
[tx-robot] updated from transifex
2014-08-05 01:25:26 -04:00
Markus Goetz
c313cc02f2
Config: Fix loading of configuration
...
There is a strange bug with Qt, we need to always set the application name, then
we can generate the proper config path.
2014-08-05 00:41:43 +02:00
Klaas Freitag
4e13c882f8
CMake: Install the nautilus plugin.
2014-08-04 18:58:35 +02:00
Klaas Freitag
0fe51d826f
Overlays: renamed icons to sensible names. Also removed .DS_Store
2014-08-04 17:22:34 +02:00
Klaas Freitag
b2976baf9b
NautilusOverlays: Use the correct icon names, removed unused function.
2014-08-04 17:21:49 +02:00
Klaas Freitag
a0a5a49d7b
CMake: Install icons under linux.
2014-08-04 17:20:57 +02:00
Daniel Molkentin
9a1781f613
Support for multiple icons
2014-08-04 15:40:08 +02:00
Klaas Freitag
f983264b5d
SocketAPI: Do not allow a trailing slash for directories.
...
The entries in our sync journal have no trailing slashes for directories.
2014-08-04 12:47:22 +02:00
Klaas Freitag
40cebeedfc
SocketAPI: Call csync_exclude with the relative path.
...
This avoids messing with the windows pathes and csync_exclude is
designed that way.
2014-08-04 12:47:22 +02:00
Klaas Freitag
1f9280c68e
GUI: Remove useless comment.
2014-08-04 12:47:22 +02:00
Klaas Freitag
14ed261606
MacOverlays: Rather use FileManager API to check if is directory.
2014-08-04 12:03:01 +02:00
Klaas Freitag
4fb671e7f4
SocketAPI: Send Broadcasts only for Linux, not used on Mac and Win.
2014-08-04 11:09:17 +02:00
Klaas Freitag
aad5c96759
Mac Overlays: No crash on context menu actions.
...
Disable overlay menus for now.
2014-08-04 11:09:16 +02:00
Jenkins for ownCloud
72b8da317f
[tx-robot] updated from transifex
2014-08-04 01:25:28 -04:00
Jenkins for ownCloud
7f9033f1f1
[tx-robot] updated from transifex
2014-08-02 01:25:24 -04:00
Volkan Gezer
a42e384935
Use am. eng. since brit. eng. is handled on transifex
...
See https://github.com/owncloud/core/pull/10025#issuecomment-50855986 for info.
2014-08-02 04:05:10 +02:00
Klaas Freitag
9b37357513
cmake: Add the icons path to cmake, install the Mac icons properly.
2014-08-01 15:30:13 +02:00
Klaas Freitag
23269c9a08
Mac Overlays: load icons from the proper place in the system.
2014-08-01 15:26:18 +02:00
Klaas Freitag
327f70240c
GUI: Load the finder overlay icon script on MacOSX.
2014-08-01 14:28:34 +02:00
Klaas Freitag
0a7642dbe0
Mac Package: New shellscript and packages steering file.
2014-08-01 12:19:08 +02:00
Klaas Freitag
742b036a07
CMake: Follow policy for 2.8.0 (avoid cmake warnings)
2014-08-01 12:18:52 +02:00
Klaas Freitag
6e00989a9e
Add directory MacOSX to cmake processing.
2014-08-01 12:18:52 +02:00
Klaas Freitag
68f0227ca1
OverlaysMac: Make use of REGISTER_PATH to learn the synced dirs.
2014-08-01 12:18:52 +02:00
Klaas Freitag
fe9a2e7ba4
SocketAPI: Normalize file names when read from the filesystem.
...
Otherwise there will be bad encoded file names because of a Qt
upstream error that skips the normalization.
2014-08-01 12:18:52 +02:00
Klaas Freitag
a248fc36fe
Remove user XCode file.
2014-08-01 12:18:52 +02:00
Klaas Freitag
e28a7a7ae3
MacOverlays: Start a 5 seconds timer to try connect if unconn.
...
If mirall is not here, a timer is started to try again later.
2014-08-01 12:18:52 +02:00
Klaas Freitag
b92789825d
MacOverlays: Redraw window if registered pathes are empty.
...
That is the condition after a reconnect to the mirall server.
2014-08-01 12:18:52 +02:00
Klaas Freitag
c3b6aecb79
MacOverlay: Some logging cleanings.
2014-08-01 12:18:52 +02:00
Klaas Freitag
4688126f84
MacOverlays: Export the redraw method of content man.
2014-08-01 12:18:52 +02:00
Klaas Freitag
5a5c03a826
MacOverlays: Registered pathes support.
...
Remember the pathes that come with the first UPDATE_VIEW msg. That
reduces the number of socket communications.
2014-08-01 12:18:52 +02:00
Klaas Freitag
f3477877d0
Added XCode file.
2014-08-01 12:18:52 +02:00
Klaas Freitag
7bef588851
SocketAPI: Try reconnect if socket was not connected.
2014-08-01 10:59:50 +02:00
Klaas Freitag
72a25cf6ee
MacOverlays: Minor cleanups.
2014-08-01 10:59:50 +02:00
Klaas Freitag
74e13f4c70
Use better variable naming.
2014-08-01 10:59:50 +02:00
Klaas Freitag
3c09ef6cbf
SocketAPI: rename slot to send UPDATE_VIEW.
2014-08-01 10:59:49 +02:00
Klaas Freitag
68bfcf5d24
SocketAPI: Create the socket API instance in folderman.
2014-08-01 10:59:49 +02:00
Klaas Freitag
b2a10de71a
Copyright plus minor beautification.
2014-08-01 10:59:49 +02:00
Klaas Freitag
267b9e5c2f
FinderOverlays: Display the error if socket can not connect.
2014-08-01 10:59:49 +02:00
Klaas Freitag
55d94bf15a
Overlays: Handle Sharing state and display the correct icons.
2014-08-01 10:59:49 +02:00
Klaas Freitag
629e2a9e1c
Overlays: Add the missing icon containers for MacOSX.
2014-08-01 10:59:49 +02:00
Klaas Freitag
86acdf69d9
MocOverlays: Handle the UPDATE_VIEW socket notification correctly.
...
With UPDATE_VIEW the plugin gets notified to update the overlays.
It invalidates the entries in the file icon cache for the path
that comes with the UPDATE_VIEW and than refreshes the view.
2014-08-01 10:59:49 +02:00
Klaas Freitag
a6987ad703
Mac overlays: Fix allocations, use icns, correct query type.
2014-08-01 10:59:49 +02:00
Klaas Freitag
5642e40bc8
Mac Overlays: Add icon containers 1.st part
2014-08-01 10:59:48 +02:00
Mackie Messer
50d178feaa
MacOSX shell integration code plus icons.
2014-08-01 10:59:48 +02:00
Klaas Freitag
753aa9132e
Merge pull request #2013 from owncloud/fix-man-dir-16
...
Fix issue#2004 -- mandir must be man1, not man
2014-07-30 17:38:25 +02:00
Daniel Molkentin
8d71328192
Windows Overlay Icons
2014-07-30 17:20:55 +02:00
Olivier Goffart
cfdfd6a860
wizard: don't call initializePage
...
It is called automatically by QWizard and do not need to be called explicitly
But setVisibla(false) don't really have an effect there since show() is going
to be called on the page
2014-07-30 12:36:30 +02:00
Jenkins for ownCloud
17b320f7dc
[tx-robot] updated from transifex
2014-07-30 01:25:24 -04:00
Olivier Goffart
8df14ee845
Long running put: fix some bugs
2014-07-29 22:56:36 +02:00
Jürgen Weigert
0c9d57228d
Fix issue#2004 -- mandir must be man1, not man
2014-07-29 18:29:55 +02:00
Olivier Goffart
550d6d66d1
Long Running Put: Better error reporting
2014-07-29 15:51:22 +02:00
Olivier Goffart
f1ad82d0ba
t2.pl Fix the test testing that moving a file that was just added do not create duplicate
2014-07-29 13:58:21 +02:00
Jenkins for ownCloud
2fb283749c
[tx-robot] updated from transifex
2014-07-29 01:25:24 -04:00
Olivier Goffart
7480d34742
Long Running Put: store into the database so they can be resumed at startup
2014-07-28 15:37:37 +02:00
Olivier Goffart
5254c9785c
shibboleth: Fix connection when the URL do not have a path
...
When the url do not have a path (for example: "http://example.com " as
opposed to "http://example.com/ "), its path is not a prefix of the
root path of the cookie (usually '/')
By adding the dav path, we make sure the URL has a path.
This made a bug when the owncloud url was just a domain name and did not
have a path
2014-07-28 13:50:24 +02:00
Klaas Freitag
0f37484b8a
Bumped the release number to 1.6.2, Changelog additions.
2014-07-28 11:44:10 +02:00
Jenkins for ownCloud
5a4c023fc9
[tx-robot] updated from transifex
2014-07-28 02:06:11 -04:00
Jenkins for ownCloud
e8afac3a01
[tx-robot] updated from transifex
2014-07-28 01:25:19 -04:00
Jenkins for ownCloud
6284517dc9
[tx-robot] updated from transifex
2014-07-27 01:25:21 -04:00
Jenkins for ownCloud
80c096b6f1
[tx-robot] updated from transifex
2014-07-26 01:25:23 -04:00
Olivier Goffart
04cc513bbd
Poll for long running PUT: WIP
...
Some PUT, may take a long time on the server to process (for example, the
last chunk). It may take more time that the timeout.
So in that case the server may reply with an url that we can poll for the etag
This patch is still work in progress
2014-07-25 13:30:48 +02:00
Markus Goetz
f004d5085d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
2014-07-25 12:37:27 +02:00
Klaas Freitag
98e21ae0ad
SocketAPI: Connect REGISTER_FOLDER to Foldermans events.
2014-07-25 12:20:38 +02:00
Klaas Freitag
00274722ce
nautilus plugin: Adopted to latest socket api changes.
2014-07-25 12:11:21 +02:00
Klaas Freitag
8b93678e3d
SocketAPI: Added REGISTER_PATH and UNREGISTER_PATH
...
to inform the plugins about the top sync directories.
Also cleaned the code a bit.
2014-07-25 12:11:21 +02:00
Olivier Goffart
3d0c009719
propagator_qnam: Limit the HTTP buffer size when downloading
...
Otherwise the buffer might fill up too quickly and get too large and consume
too much memory which could lead to crash in extreme cases
Should fix issue #1974
2014-07-24 15:43:28 +02:00
dark-eye
1b3ec955b1
Merge pull request #2000 from dark-eye/fix_folder_status_ui_ignore_new_line_inoverall_text
...
Fix folder status ui ignore new line inoverall text
2014-07-24 12:52:15 +03:00
Olivier Goffart
208011f6ab
propagator_qnam: add debug output in cae the file changed localy
...
In order to debug https://github.com/owncloud/core/issues/9781
2014-07-24 11:17:59 +02:00
Daniel Molkentin
f84e0010ee
NSIS: ICU rebumped to 5.3 as per build service change
2014-07-24 10:07:46 +02:00
Klaas Freitag
c97f46d403
Bump version to 1.6.2 rc2 plus Changelog
2014-07-24 09:58:23 +02:00
Jenkins for ownCloud
5356898efc
[tx-robot] updated from transifex
2014-07-24 01:25:23 -04:00
Klaas Freitag
1fb52f0d8b
HTTPCreds: Do delete the WritePasswordJob to not leak memory.
2014-07-23 17:59:02 +02:00
Klaas Freitag
d4de024f15
Propagator: Fix local file name clash detection.
...
Need to normalize the output of QFileInfo::canonicalFilePath() before
comparing to a server side path.
See https://bugreports.qt-project.org/browse/QTBUG-39622
This fixes #1998 and #1999
2014-07-23 17:56:46 +02:00
Olivier Goffart
1d9d88ca85
Always use the dummy crendential while trying to determine the credentials
...
Otherwise the SHibbolethCredential may be set and it has hook to intercept 401
This should fix issue #1908
2014-07-23 14:38:50 +02:00
Eran
2ca8805cda
Removed uneed code
2014-07-23 15:09:28 +03:00
Eran
8e5c41e6f3
Merge https://github.com/owncloud/mirall into fix_folder_status_ui_ignore_new_line_inoverall_text
2014-07-23 13:53:05 +03:00
Eran
0f7efbc22e
fixed bug where the overall text caused in the folder view the to defrom
2014-07-23 13:52:02 +03:00
Jenkins for ownCloud
6b7bd07c97
[tx-robot] updated from transifex
2014-07-23 01:25:21 -04:00
Klaas Freitag
8d85516e72
tx.pl: Add a chunking update test, test for precondition failed.
2014-07-22 18:07:34 +02:00
Klaas Freitag
0f4cf74ae0
SyncEngine: allow to do a post upgrade script in debug mode.
2014-07-22 18:07:02 +02:00
Klaas Freitag
4dfe0fad7d
tests: Big file chunking, change an existing big file to trigger update
...
This failed on oC7
2014-07-22 10:45:03 +02:00
Jenkins for ownCloud
2e91ea8093
[tx-robot] updated from transifex
2014-07-22 01:25:22 -04:00
Klaas Freitag
77e3480b2f
csync oC Util: set field flag correctly to avoid etag memleak.
...
The fields varialbe should contain or'ed flags of the fields set
in the csync_vio_file_stat_t struct. The problem was that the field
for CSYNC_VIO_FILE_STAT_FIELDS_PERM was assigned rather than or'ed
which makes the release function for the struct not freeing the
etag memory => memleak.
2014-07-21 13:19:36 +02:00
Jenkins for ownCloud
bca1ef42fc
[tx-robot] updated from transifex
2014-07-21 01:25:21 -04:00
Jenkins for ownCloud
010ab7119e
[tx-robot] updated from transifex
2014-07-20 01:25:22 -04:00
Jenkins for ownCloud
3cb93510ac
[tx-robot] updated from transifex
2014-07-19 01:25:30 -04:00
Olivier Goffart
8a88ca6f34
Merge branch 'il'
...
Conflicts:
src/mirall/propagator_legacy.h
2014-07-18 17:00:38 +02:00
Olivier Goffart
81d786733d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/propagator_qnam.cpp
src/mirall/propagator_qnam.h
2014-07-18 16:59:29 +02:00
Olivier Goffart
336e74b992
csync_owncloud: fix the name of the permissions property
2014-07-18 16:52:04 +02:00
Olivier Goffart
beb9300b4e
network limit: Never wait more than 10 seconds
...
When using the "Limit automatically" limit, we wait for 25% of the time
it took to upload something.
However, if we go to sleep while uploading, the time it took to upload may take
days. And waiting for 25% of a day is too long.
So never wait for more than 10 seconds
This may be related to issue #1880
2014-07-18 12:27:02 +02:00
Klaas Freitag
74b3e2ce3f
tests: Another try to get around the jenkins test problem.
2014-07-18 12:20:14 +02:00
Olivier Goffart
c35880d4f1
Fix corruption while trying to resume and the server don't suport it
...
Issue #1982
2014-07-18 12:03:45 +02:00
Jenkins for ownCloud
ed6e3e4ee2
[tx-robot] updated from transifex
2014-07-18 01:25:23 -04:00
Klaas Freitag
f8bea55b10
SocketAPI: Handle top sync folder correctly.
2014-07-17 19:34:50 +02:00
Daniel Molkentin
72cd84e878
SocketAPI: Exclude drive part from path blacklist check
...
Otherwise, it always matches the ':' part
2014-07-17 19:26:58 +02:00
Daniel Molkentin
35b6d09615
SocketAPI: Fix separators on Windows
2014-07-17 17:41:20 +02:00
Daniel Molkentin
1ae727e70f
SocketAPI: Emit error of binding the server fails
2014-07-17 15:01:01 +02:00
Daniel Molkentin
0e5d0c1170
SocketAPI: Some cleaning up
2014-07-17 15:00:21 +02:00
Daniel Molkentin
7ff62bc577
NSIS: ICU rebumped to 5.3 as per build service change
2014-07-17 14:57:04 +02:00
Daniel Molkentin
bb32831a60
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/gui/folderman.cpp
2014-07-17 11:31:45 +02:00
Klaas Freitag
743c1c2eda
SocketAPI: Send an UPDATE_VIEW to the shell plugin on connect.
...
For each configured sync folder send an UPDATE_VIEW directly after
the socket connect to make the shell integration updating the view.
2014-07-17 11:26:03 +02:00
Klaas Freitag
0e9a08cbbf
SocketAPI: rename slot to send UPDATE_VIEW.
2014-07-17 11:25:08 +02:00
Klaas Freitag
d2445ec72d
PropagatorQNAM: Never send if-match header for new files.
2014-07-17 11:23:11 +02:00
Klaas Freitag
fef713aaed
SocketAPI: Create the socket API instance in folderman.
2014-07-17 11:22:18 +02:00
Klaas Freitag
c4d73688a6
Folderman: Fix path detection in folderForPath().
2014-07-17 11:21:02 +02:00
Daniel Molkentin
56b721b2eb
propagator_qnam: fix warning
2014-07-17 11:05:16 +02:00
Klaas Freitag
2981b37219
Use file size of factor of four because of the createLocalFile algorithm
2014-07-17 10:29:13 +02:00
Jenkins for ownCloud
cfc2f84d3e
[tx-robot] updated from transifex
2014-07-17 01:25:28 -04:00
Klaas Freitag
d8ebebaf12
WinInstaller: No hardcoded www in front of the url on final page.
2014-07-16 18:39:51 +02:00
Klaas Freitag
2a5691e575
tests: Fix assertion.
2014-07-16 17:26:06 +02:00
Klaas Freitag
774432066e
tests: Reverted previous change, do not append in createLocalFile()
2014-07-16 17:25:18 +02:00
Klaas Freitag
e6c501de8e
FolderMan: More useful logging.
2014-07-16 16:59:20 +02:00
Klaas Freitag
af3fae9c28
Bumped to 1.6.2 rc1
2014-07-16 14:32:58 +02:00
Klaas Freitag
d5a8661480
tests: do not use system any more to modify files, rather perl native.
2014-07-16 14:06:57 +02:00
Klaas Freitag
d3b72940fd
Updated Changelog for 1.6.2
2014-07-16 11:56:17 +02:00
Daniel Molkentin
e8de3e855a
1.6.2
2014-07-16 11:43:13 +02:00
Klaas Freitag
71338000a4
SetupWizard: Keep initial local folder to compare later for changes.
...
If the local folder changes, the sync has to be reinitialized as
well. Until now we did not detect that, which led to the case that
the sync folder was not reinitialized in case only the local folder
changed in the setup dialog.
2014-07-16 11:37:46 +02:00
Olivier Goffart
2fdb3cfdfb
Merge branch 'il'
...
Conflicts:
src/mirall/folder.cpp
src/mirall/propagator_qnam.cpp
2014-07-16 10:49:16 +02:00
Olivier Goffart
8961e61f60
Merge branch '1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/syncengine.cpp
src/mirall/syncengine.h
2014-07-16 09:57:40 +02:00
Jenkins for ownCloud
e5191acd73
[tx-robot] updated from transifex
2014-07-16 01:25:23 -04:00
Olivier Goffart
d697969f36
Use another way to detect that the server was reconfigured
...
Before, we would only detect it if all the files were removed, and no
file where added or changed. This may not be enough because there might
be a welcome.txt file. Now, we check that none of the file stays the same,
and some files are removed.
Relates issue #1948
2014-07-15 18:09:08 +02:00
Olivier Goffart
51e9c5fd96
propagator_qnam Fix signal slot connection
...
Fix the signature so it can be connected
This was hapenning if the derver does not support X-OC-MTime
issue #1963
2014-07-15 18:08:26 +02:00
Klaas Freitag
997504c03c
FolderMan: Unload folder method added.
...
unloadFolder now correctly removes a folder from all maps and signal
mappers.
2014-07-15 16:07:23 +02:00
Markus Goetz
0202351a27
Propagator: Fix crash when logging out during upload
...
Fixes #1957
2014-07-14 19:53:42 +02:00
Daniel Molkentin
ea690c285b
Make NSIS installer work with new structure
2014-07-14 13:12:31 +02:00
Daniel Molkentin
28879712e9
Make krazy target work again
2014-07-14 12:19:32 +02:00
Daniel Molkentin
3c2e43d883
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
2014-07-14 10:50:53 +02:00
Jenkins for ownCloud
dde06dfaba
[tx-robot] updated from transifex
2014-07-14 01:25:21 -04:00
Jenkins for ownCloud
eb0f074097
[tx-robot] updated from transifex
2014-07-13 02:06:11 -04:00
Jenkins for ownCloud
b6c9b5645c
[tx-robot] updated from transifex
2014-07-13 01:25:20 -04:00
Daniel Molkentin
5041880854
Try to handle BUILD_LIBRARIES_ONLY correctly
...
Also, try to fix OS X build
2014-07-11 12:36:01 +02:00
Klaas Freitag
a281b36d6f
SocketAPI: send the path with UPDATE_VIEW
2014-07-11 12:34:04 +02:00
Klaas Freitag
7772501cdf
Remove unused socketPath variable.
2014-07-11 12:33:43 +02:00
Daniel Molkentin
2c904afd04
OS X explicitly requires the neon include path to be set
2014-07-11 12:11:04 +02:00
Daniel Molkentin
2cc13fb74a
Fix includes in mac specific headers
2014-07-11 11:38:01 +02:00
Daniel Molkentin
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
Daniel Molkentin
d1b991e198
Fix windows compilation
2014-07-10 22:58:58 +02:00
Klaas Freitag
00f793a841
CMake: Remove accidentially added typo to fix build.
2014-07-10 17:20:40 +02:00
Klaas Freitag
bdb9598227
SocketAPI: Use QTcpSocket all over, rather than QLocalSocket.
2014-07-10 16:35:18 +02:00
Klaas Freitag
c6deb392fd
SocketAPI: Enhance SyncFileStatus to have share information.
...
Added a new class SyncFileStatus to reflect that properly.
2014-07-10 16:28:40 +02:00
Olivier Goffart
3477ea0eeb
Fix build with TOKEN_ONLY_AUTH
...
It was broken by commit 6ff38d8005
2014-07-10 15:26:55 +02:00
Klaas Freitag
9dacad99fa
t1.pl: Change the corruption creation command.
2014-07-10 12:07:28 +02:00
Olivier Goffart
73e35c66af
owncloudcmd: fix the --trust option
...
We can't call csync_set_userdata in owncloudcmd because it is
going to be overwritten later in the SyncEngine.
So we had an object of type SyncEngine* that we cast to CmdOptions*
and the trust flag was in the padding, so was some random data.
Therefore we must use global variables in that case in order to
know if we should ignore the certificate.
2014-07-10 11:19:23 +02:00
Olivier Goffart
d3b599b727
Fix build of the test on Qt5
2014-07-10 10:42:02 +02:00
Jenkins for ownCloud
4369151cd8
[tx-robot] updated from transifex
2014-07-10 03:57:24 -04:00
Olivier Goffart
846773efd3
Define Q_DECL_OVERRIDE for Qt4
...
That macro is new in Qt5, define it as well when compiling with Qt4
so we can use it in mirall
Note: QNetworkCookieJar::deleteCookie was not existing in Qt4.
2014-07-09 23:31:56 +02:00
Olivier Goffart
bcfa34357b
Add Q_DECL_OVERRIDE for all function that are overriding something
...
This was made automatically with
clang-modernize -override-macros -add-override
2014-07-09 23:31:56 +02:00
Olivier Goffart
e0c2e8ed86
folder: remove TOKEN_AUTH_ONLY
...
Folder is no longer in the libowncloudsync
2014-07-09 22:44:08 +02:00
Olivier Goffart
b80a3876ab
cleanup the CMakeLists.txt
...
Headers need not to be added if they are not going to be installed
The list was incomplete anyway, and most of the _HEADERS variables
were even not used
2014-07-09 22:44:08 +02:00
Olivier Goffart
26e17f58ef
Engine: Do not reset the csync log callback in the engine
...
It is already set in Folder and we don't want to use the Logger
in command line clients
2014-07-09 22:44:08 +02:00
Olivier Goffart
45d1567057
Move Folder, FolderMan, and FolderWatcher outside of owncloudsync
...
Those class are maintaining the folder for the mirall configuration
They are not usefull in command line clients
Also the FolderWatcher is only used by the folder and not used by the
command line clients
2014-07-09 22:44:08 +02:00
Olivier Goffart
8aacb3f7ec
Remove undeeded include
2014-07-09 22:44:08 +02:00
Olivier Goffart
99ee81a489
Utility: Move showInFileManager in its own file
...
And get rid of GUI in the Utility namespace
2014-07-09 22:44:08 +02:00
Olivier Goffart
517ffbd783
Utility: remove Utility::dataLocation
...
It is used only from one location, so put the code there
2014-07-09 22:44:08 +02:00
Olivier Goffart
7dd926d4f1
Utility: move raiseDisalog to owncloudGui
...
Reduce the GUI dependency in the Utility namespace used by libowncloudsync
2014-07-09 22:44:08 +02:00
Olivier Goffart
cbc7942a00
Added t8.pl that test case sensitivity issues
...
Made some change in the .cpp code in order to be able to test
the code when the file system is case sensitive
2014-07-09 22:44:08 +02:00
Olivier Goffart
63cd5ef563
ProtocolWidget: limit the number of items
...
That should save memory instead of letting the number of items grow
to infinity
2014-07-09 15:48:03 +02:00
Jenkins for ownCloud
3806905f5b
[tx-robot] updated from transifex
2014-07-09 01:25:24 -04:00
Olivier Goffart
82c254fecf
propagator_qnam: Avoid using too much memory
...
The idea here was that the buffer would be maximum 8KiB, not minimum.
2014-07-08 15:30:53 +02:00
Jenkins for ownCloud
2496f23e45
[tx-robot] updated from transifex
2014-07-08 01:25:22 -04:00
Olivier Goffart
86bea9a9af
shibboleth: Fix the waiting curser that would not disapear
...
Fix #1915
2014-07-07 14:08:13 +02:00
Jenkins for ownCloud
4bb1172c84
[tx-robot] updated from transifex
2014-07-05 01:25:23 -04:00
Klaas Freitag
88f26fb548
HTTP Creds: In case of Keychain error, open the interact password dialog
...
But in case the user clicks cancel in the interactive dialog, invalidate
the credentials. Emit fechted() also in error case.
2014-07-04 13:27:35 +02:00
Klaas Freitag
a9f1de84f0
HTTP Credentials: Read the password from the old location if not found.
...
Earlier clients used QtKeychain without a QSettings object, which made
QtKeychain to write the password encrypted into a settings default
location, ie. the registry under windows.
If we can not find a password at the new location it is tried to read
the password from the old default location once. That makes people
happy in migration scenarios.
2014-07-04 13:27:22 +02:00
Jenkins for ownCloud
367ff79ef1
[tx-robot] updated from transifex
2014-07-04 01:25:25 -04:00
Daniel Molkentin
2961c44bbe
NSIS: look for socketapiclient in the right place
2014-07-03 09:35:45 +02:00
Daniel Molkentin
997559dc6d
NSIS: fix typo
2014-07-03 09:17:08 +02:00
Jenkins for ownCloud
79d28bbc35
[tx-robot] updated from transifex
2014-07-03 01:25:24 -04:00
Daniel Molkentin
6bc425f981
NSIS: Add socketapiclient
2014-07-02 12:05:23 +02:00
Daniel Molkentin
2cdfc16829
SocketAPI: rename test client binary to socketapiclient
2014-07-02 12:03:52 +02:00
Daniel Molkentin
e63d45cca9
SocketAPI: put binary into bin/ dir
2014-07-02 11:15:39 +02:00
Daniel Molkentin
553f186b7c
SocketAPI: Build test client with Qt5
2014-07-02 11:11:11 +02:00
Daniel Molkentin
623dfc0286
Socket API: Add test client
2014-07-02 10:10:32 +02:00
Jenkins for ownCloud
ffa7f35a87
[tx-robot] updated from transifex
2014-07-02 01:25:30 -04:00
Olivier Goffart
081b7d4aa9
Merge pull request #1913 from owncloud/typo-fix
...
Typo fix
2014-07-01 20:39:30 +02:00
Olivier Goffart
9c3c4bac66
Merge remote-tracking branch 'origin/il'
2014-07-01 20:37:42 +02:00
Daniel Molkentin
6ec218ef11
FF docs submodules
2014-07-01 16:24:34 +02:00
Daniel Molkentin
ad2eabeb3b
SocketAPI: Try to make the folder selection work on windows
2014-07-01 16:24:14 +02:00
Daniel Molkentin
26c377d05b
Utility: export new functions
2014-06-30 14:13:45 +02:00
Jenkins for ownCloud
caa75d98be
[tx-robot] updated from transifex
2014-06-30 01:25:23 -04:00
Volkan Gezer
3ad9356ca4
Typo fix
2014-06-29 14:14:44 +02:00
Volkan Gezer
dd5296f03c
Typo fix
...
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/ )
2014-06-29 14:06:45 +02:00
Volkan Gezer
e673d76f22
Typo fix
...
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/ )
2014-06-29 14:04:30 +02:00
Volkan Gezer
393eb7bb4d
Typo fix
...
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/ )
2014-06-29 14:02:50 +02:00
Jenkins for ownCloud
2fa5a5b8c3
[tx-robot] updated from transifex
2014-06-29 01:25:23 -04:00
Jenkins for ownCloud
ca63b79ed8
[tx-robot] updated from transifex
2014-06-28 01:25:25 -04:00
Daniel Molkentin
f8b097669a
Merge remote-tracking branch 'origin/1.6'
...
Conflicts:
VERSION.cmake
doc/building.rst
2014-06-27 15:34:20 +02:00
Olivier Goffart
2f284209d8
Permissions: When moving is not allowed, fallback to delete and upload
...
We decided that we never want to rename a directory behind the
back of the user as the user may be using files in the directory
during the sync.
If moving is not allowed, we just erase the inode form the database so
the next sync will try to do an upload and delete and recover from there
using normal resolution.
This also add some code to update the inode back to the db when it is detected
as changed.
2014-06-27 15:30:08 +02:00
Olivier Goffart
09881040a3
Permissions: fix restoring subdirectories
...
The sync item vector must be sorted before we call checkForPermission
2014-06-27 13:34:15 +02:00
Olivier Goffart
9066ad5790
t7.pl: Test that deleting a directory restores it and all its sub directories
2014-06-27 11:31:35 +02:00
Olivier Goffart
62d0e670dc
Add t7.pl Test for operation of files with restrictions
2014-06-27 11:22:53 +02:00
Jenkins for ownCloud
e7d597045b
[tx-robot] updated from transifex
2014-06-27 02:06:13 -04:00
Jenkins for ownCloud
eaa3a2eae2
[tx-robot] updated from transifex
2014-06-27 01:25:23 -04:00
Klaas Freitag
40d765c73a
Remove version suffix, final release 1.6.1
2014-06-26 16:09:21 +02:00
Olivier Goffart
21d7d8988a
t1.pl: add a sleep to make sure the mtime of the files are different
...
It could be that the files are changed in the same second if the previous
sync was fast, and therefore the changes not detected.
2014-06-26 13:11:47 +02:00
Klaas Freitag
e76386be4f
Revert "ownCloudcmd: Use Account object and ConnectionValidator."
...
We decided that owncloudcmd should not share the config with mirall.
This reverts commit 5f96de32bb .
2014-06-26 10:16:56 +02:00
Jenkins for ownCloud
b3b3ca0e16
[tx-robot] updated from transifex
2014-06-26 02:06:14 -04:00
Jenkins for ownCloud
730e86c4cd
[tx-robot] updated from transifex
2014-06-26 01:25:24 -04:00
Daniel Molkentin
23e0af5cc1
Documentation update from Mark.
2014-06-25 22:04:33 +02:00
Jenkins for ownCloud
a92f1cb055
[tx-robot] updated from transifex
2014-06-25 06:34:41 -04:00
Jenkins for ownCloud
a54162e009
[tx-robot] updated from transifex
2014-06-25 06:31:32 -04:00
Olivier Goffart
48864a6921
httpcredentials: Remove useless mutex
...
The mutex is not shared with any thread, so it is totaly useless.
Yes: there are possible races here. (with the account, but also with the
user and password)
2014-06-25 12:15:30 +02:00
Olivier Goffart
92f07cb60f
Enable C++11
...
In order to avoid the warning
warning: anonymous variadic macros were introduced in C99
Due to the use of variadic macro in the qDebug macro in Qt 5.3
C++11 requires a space between string literal and macro to avoid the
ambiguity with user defined litteral
2014-06-25 12:01:27 +02:00
Klaas Freitag
e17243bc1f
AccountMigrator: Read path from QDir::fromNativeSeperators(), add debug.
2014-06-25 11:38:08 +02:00
Klaas Freitag
0e45dd7a3d
AccountMigrator: Do not inherit from QObject as it is not needed yet.
...
As requested by Danimos review.
2014-06-25 11:38:08 +02:00
Klaas Freitag
65f313f1b4
Account: Added missing include statement.
2014-06-25 11:38:08 +02:00
Klaas Freitag
da4958c716
Account: Read settings from ownCloud config if no branded exists.
...
If there is not yet a config for a branded client, but one for the
"normal" client targetting the same URL, it will be migrated.
2014-06-25 11:38:08 +02:00
Klaas Freitag
653b8494f5
FolderMan: Migrate folderlist if no folder definitions can be found
...
and the account indicates that it was migrated. In that case,
read the folder definitions from the ownCloud config directory.
2014-06-25 11:38:08 +02:00
Klaas Freitag
6ed6f84f6e
Account: Add a wasMigrated flag.
...
If an account in a branded client was migrated from a former ownCloud
configuration, the method wasMigrated() will return true.
2014-06-25 11:38:08 +02:00
Klaas Freitag
ff0ba56bc3
ownCloud Theme: Implement appName() and appNameGUI().
2014-06-25 11:38:08 +02:00
Klaas Freitag
e795d04f30
cfg migration: Add a account migrator class.
2014-06-25 11:38:08 +02:00
Klaas Freitag
8d3806b080
folderman: make escapeAlias public as its now used in accountmigrator.
2014-06-25 11:38:08 +02:00
Klaas Freitag
5597ebe455
Account: Add a scoped pointer to the ownCloud theme.
2014-06-25 11:38:07 +02:00
Klaas Freitag
5f96de32bb
ownCloudcmd: Use Account object and ConnectionValidator.
...
That reads the credentials from the mirall config file if it was not
defined on the command line. Moreover, the connection is validated
before, which sets up the credentials properly.
2014-06-24 15:33:42 +02:00
Klaas Freitag
d2436ce23d
Networkjobs: Check if reply body is empty before parsing.
...
This avoids a false warning that the result is not valid JSON.
2014-06-24 15:17:33 +02:00
Olivier Goffart
fbadadc377
propagator: Fix folder duplication if the folder is renamed on the server while uploading
...
While uploading a new folder, if the folder is renamed on the server
when still uploading, the result will be that the files that are already
uploaded will end up in the new filder name, but the file that were
not still are in the old folder.
After renaming, all the new uploads wil fail with an error on this sync
because the parent directory don't exist.
But they were uploaded with the old name in the next sync because
the renaming was not detected because the file id was not in the DB
Fix the problem by fetching the file id always when creating a new
directory, on the next sync, and saving it in the database ummediatly
https://github.com/owncloud/enterprise/issues/191
2014-06-24 12:00:13 +02:00
Olivier Goffart
9adc30ab9f
Shibboleth: keep the cookie from the wizard to the ShibolethCredentials
...
Otherwise the user is asked twice for autentication on first sync.
Fixes https://github.com/owncloud/enterprise/issues/193
2014-06-24 11:44:52 +02:00
Olivier Goffart
8de3bda0b1
csync_update: update the permission in the db when they change
...
The current code only update the permissions in the DB when
the permission becomes non-empty.
Now we update the permission each time they change.
That way the code is the same for file id and permission so it is
simpler.
2014-06-24 11:10:50 +02:00
Olivier Goffart
3c4f410a4e
cmake compilation flags: don't define -Wdeclaration-after-statement
...
We are in 2014, let me use C99 already.
2014-06-24 11:02:58 +02:00
Olivier Goffart
9c0a21a5fb
Permission: keep a space if the permission is empty
...
To distinguish no permission present to nothing is allowed.
That was the intention of the old code but it did not work as
the first if was always taken
2014-06-24 10:52:42 +02:00
Olivier Goffart
94ddf7e5d8
Merge remote-tracking branch 'origin/il'
2014-06-24 08:40:27 +02:00
Jenkins for ownCloud
f45dd8e94f
[tx-robot] updated from transifex
2014-06-24 01:25:30 -04:00
Olivier Goffart
b735dc07d6
Permissions: Consider and empty remotePerms from csync as NULL
...
Since remotePerm from csync is never NULL (as it is a buffer),
we consider that if it is empty, there was no permission set
(and therefore everything is allowed)
csync will put a space in the permission if any permission was set
2014-06-23 15:05:48 +02:00
Olivier Goffart
68c902e60b
propagator: Fix restoring directory
...
If the result of a restored directory is SoftError, this prevent
to sync the rest of the directory
Therefore, we introduced a new status Restored, which means that
the job was a success, but is a restoration and therefore should be
seen as a warning
2014-06-23 13:56:17 +02:00
Olivier Goffart
e19214c3c4
permissions: record them even if the instruction is NONE
...
when the instruction is NONE, we may return from this function
before having registered the permission in the SyncEngine::_remotePerms
hash.
Move the code a bit up.
2014-06-23 13:35:34 +02:00
Olivier Goffart
4759429702
Fix compilation after merge
...
Some initializer were added in 1.6 for variable that are gone in master
2014-06-23 12:53:51 +02:00
Olivier Goffart
b626589c07
Merge branch 'il'
...
Conflicts:
src/mirall/folderstatusmodel.h
2014-06-23 12:52:03 +02:00
Olivier Goffart
02704cdf74
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
csync/src/csync_statedb.c
src/mirall/syncengine.cpp
src/mirall/syncfileitem.h
2014-06-23 12:48:34 +02:00
Klaas Freitag
a7d251f8fc
Update changelog for 1.6.1
2014-06-23 11:06:39 +02:00
Jenkins for ownCloud
4555d4bcbe
[tx-robot] updated from transifex
2014-06-23 01:25:24 -04:00
Jenkins for ownCloud
184e58f5e5
[tx-robot] updated from transifex
2014-06-22 01:25:22 -04:00
Jenkins for ownCloud
5c7f3c1642
[tx-robot] updated from transifex
2014-06-21 01:25:26 -04:00
Daniel Molkentin
7a8a3855b8
Mac: Make <ESC> close the settings dialog again
2014-06-20 16:37:07 +02:00
Daniel Molkentin
603a238eb9
Disable minimize button for Preferences on Mac
2014-06-20 16:31:17 +02:00
Olivier Goffart
b7b6cf4b3f
Shibboleth: Always ask for the password if we are going to open the log window
...
If we don't have the cookie in the keychain (e.g. the keychain is
unavailable) but there is still session cookie in the cookie jar,
showing the browser won't ask for authentication.
2014-06-20 16:25:35 +02:00
Daniel Molkentin
c855b783d9
NSIS: Remove duplicated entry
2014-06-20 15:53:10 +02:00
Daniel Molkentin
f593fc8e4d
NSIS: Bump required libpng version to 16
2014-06-20 15:50:42 +02:00
Klaas Freitag
ae5cbb8451
Version: Bumped to rc1
2014-06-20 15:37:50 +02:00
Klaas Freitag
041066a252
Exclude: Add a missing free in case of empty lines.
...
This fixes Coverity CLT 12893
2014-06-20 15:15:35 +02:00
Daniel Molkentin
9ca82ba14d
NSIS: add libwinpthread dependency
2014-06-20 14:58:05 +02:00
Klaas Freitag
36331512bc
doc: Updated package list for win32 build.
2014-06-20 14:41:36 +02:00
Olivier Goffart
b29a757b18
Revert "csync file util: Remove compare file function, not needed anymore."
...
This break the test.
And the function is aleady gone in master anyway
This reverts commit 407b3bebfe .
2014-06-20 14:29:43 +02:00
Daniel Molkentin
485a6926c5
FancyLineEdit: initialize all members
...
This fixes Coverity CID 12912
2014-06-20 13:46:57 +02:00
Daniel Molkentin
f3de6f46db
Folder: Removed unused member _pathWatcher
...
This fixes Coverity CID 12914
2014-06-20 13:42:26 +02:00
Daniel Molkentin
1309dc27d9
Remove previously unused member
...
This fixes Coverity CID 12915
2014-06-20 13:40:55 +02:00
Daniel Molkentin
31469d6a3e
Folderwizard: Properly initialize all members
...
This fixes coverity CID 12916
2014-06-20 13:38:36 +02:00
Daniel Molkentin
88776770f7
Legacy Propagator: Properly initialize members
...
This fixes coverity CID 12919
2014-06-20 13:36:15 +02:00
Daniel Molkentin
bbf8b9f8dd
syncengine: properly initialize all members in ctor
...
This fixes Coverity CID 12922
2014-06-20 13:28:52 +02:00
Daniel Molkentin
6ff38d8005
Cleanup member initialization in Theme
...
This fixes coverity issue 12925
2014-06-20 13:28:52 +02:00
Daniel Molkentin
6d13b5cc43
wizard setuppage: Clean up and properly initialize members
...
This fixes Coverity CID 12926
2014-06-20 13:28:52 +02:00
Daniel Molkentin
73ab2804c4
owncloudwizard: properly initialize _account memember
...
This fixes Coverity CID 12927
2014-06-20 13:28:52 +02:00
Klaas Freitag
db3d2eed5f
csync core: Remove logically dead code: Can never be reached.
...
This fixes Coverity CID 12881
2014-06-20 13:08:03 +02:00
Klaas Freitag
d995d1190f
SyncFileItem: Some more proper member initializations.
...
This fixes a Coverity CID
2014-06-20 12:54:46 +02:00
Klaas Freitag
3217e42a0f
SyncJournalDB: Initialize size member properly with 0
...
This fixes Coverity CID 12924
2014-06-20 12:37:49 +02:00
Klaas Freitag
1dd58a537e
owncloudcmd: Fix structurally dead code.
...
This fixes Coverity CID 12928
2014-06-20 12:34:15 +02:00
Olivier Goffart
3e916cfbb9
remove unused member
...
CID 12915
CID 12926
2014-06-20 12:08:58 +02:00
Olivier Goffart
4a9ad14e11
Folder: remove unused variable
...
CID 12914
2014-06-20 12:01:20 +02:00
Olivier Goffart
f80816d88f
SyncEngine: silence coverity issue 12885
...
It was complaining that we use the context later in the function
but the csync context should never be null anyway
2014-06-20 11:53:22 +02:00
Olivier Goffart
b34afa1afc
reconcile: use the proper enum type
...
thankfully the value hapenned to be the same, but the type
is of CSYNC_FTW_.. and not CSYNC_VIO_FILE_TYPE
Detected by coverity (CID 12887)
2014-06-20 11:51:07 +02:00
Olivier Goffart
b7c9fa6d5f
csync_owncloud: silent CID 12883
2014-06-20 11:51:07 +02:00
Olivier Goffart
61ad376bf4
accountsettings: silent coverity warning 12884
...
We use f anyway, so if we are going to test if it's null we can as
well return
2014-06-20 11:51:07 +02:00
Klaas Freitag
407b3bebfe
csync file util: Remove compare file function, not needed anymore.
...
This also fixes Coverity CID 12890 and CID 12898
2014-06-20 11:39:28 +02:00
Olivier Goffart
f04c80dd0e
httpbf: silent coverity issue 12905
2014-06-20 11:33:29 +02:00
Olivier Goffart
1e788d3d60
folderwizard: fix possible use of null pointer
...
Coverity issue 12907
2014-06-20 11:29:28 +02:00
Olivier Goffart
83171bf025
accountsettings: remove unused function
...
It was moved into owncloudgui before
And it was broken (bad use of QUrl and use of null pointer
2014-06-20 11:27:37 +02:00
Olivier Goffart
2e51721851
owncloudgui: Fix compilation
2014-06-20 11:26:41 +02:00
Olivier Goffart
4d4a0148e4
owncloudgui: use QUrl::fromLocalFile
2014-06-20 11:21:36 +02:00
Klaas Freitag
b144a5bbf9
csync_exclude: Add a missing free of path components.
...
This fixes Coverity CID 12895
2014-06-20 11:14:50 +02:00
Olivier Goffart
5225fe07e0
csync_owncloud_recursive_propfind: "fix" possible memory leak
...
This was only leaking memory if ne_path_parent returns 0, which
should never happen
This fixes coverity issue 12897
2014-06-20 11:12:45 +02:00
Klaas Freitag
85cdbd1f1d
stateDB: Close the file descriptor even if stat failed.
...
This fixes Coverity CID 12897
2014-06-20 11:05:40 +02:00
Klaas Freitag
e4f8a136f1
StateDB: Free locale string also if attribs are invalid.
...
This fixes Coverity CID 12898
2014-06-20 11:05:40 +02:00
Daniel Molkentin
c263c38cdf
statedb.c: fix potential memory leak on win32
...
This fixes coverity issue 12898
2014-06-20 10:58:03 +02:00
Daniel Molkentin
df8553e878
httpbf.c: Fix resource leak
...
This fixes Coverity CID 12902
2014-06-20 10:58:03 +02:00
Daniel Molkentin
bec66c85d4
Fix potential memory leak
...
This fixes Coverity CID 12893
2014-06-20 10:58:03 +02:00
Daniel Molkentin
f9710cc1d5
c_time: Fix resource leak in error case
...
This fixes Coverity CID 12903
2014-06-20 10:58:03 +02:00
Daniel Molkentin
6b041b0846
Fix use-after-free in QNAM propagator
...
This fixes Coverity CID 12929
2014-06-20 10:58:03 +02:00
Klaas Freitag
d0c992c991
Updater: Free tmp variable that might point to temp malloced memory
...
This fixes Coverity CID 12900
2014-06-20 10:41:01 +02:00
Klaas Freitag
9ee86cf06b
Fix resource leak in win32 code path, added free of locale filename.
...
This fixes Coverity CID 12901
2014-06-20 10:25:00 +02:00
Jenkins for ownCloud
817f89d586
[tx-robot] updated from transifex
2014-06-20 01:25:21 -04:00
Olivier Goffart
458645101b
SocketApi: query the database for the Shared flag
2014-06-19 15:37:29 +02:00
Olivier Goffart
1e306012ec
SocketApi: Fix recursiveFolderStatus
...
If only one file is EVAL or NEW, this mean the folder need to be sync
2014-06-19 15:25:30 +02:00
Olivier Goffart
db2c198feb
SocketAPI: Merge command_RETRIEVE_FOLDER_STATUS and command_RETRIEVE_FILE_STATUS
...
They do the same thing because fileStatus calls recursiveFolderStatus
for directories anyway
2014-06-19 15:02:27 +02:00
Markus Goetz
71a901a24e
TokenCredentials: Fix cookie behaviour
...
parseCookies did not work as expected. Now we just hard-set the
token credentials into the Cookie header for QNAM jobs.
This is the same behaviour as for neon jobs.
(cherry picked from commit 855a8c0a335f76b82b8e647a8c5a4ae692065d3b)
2014-06-19 14:41:47 +02:00
Olivier Goffart
f4ea34e63b
SyncJournalDb: use QByteArray for etag and fileid
2014-06-19 14:27:04 +02:00
Olivier Goffart
0d54b88ab2
Socket API: Make it work with Qt5's QUrl
...
QUrl default constructor has a different behaviour in Qt5
One must not forget to call QUrl::fromLocalFile in Qt5
2014-06-19 14:22:03 +02:00
Olivier Goffart
da0bd14bf3
Socket API: move the code that gets the status out of the folder
...
Move the code in socketapi.cpp where it belongs
2014-06-19 14:08:30 +02:00
Jenkins for ownCloud
6ce746b9ea
[tx-robot] updated from transifex
2014-06-19 01:25:20 -04:00
Olivier Goffart
02355696ff
engine: When restoring the file, use the mtime and fileid from the server
...
Important to switch the things around as we are going to write them in the DB
2014-06-18 16:15:14 +02:00
Olivier Goffart
38254125c9
csync: fix the size in strncpy for the remote perms
...
We must only do strncpy with size one smaller than
the size of the buffer in order to leave at least
one '\0' at the end
2014-06-18 15:56:13 +02:00
Olivier Goffart
e5b3363ecf
csync_statedb: remove noisy output
2014-06-18 15:40:26 +02:00
Olivier Goffart
646eafb05d
Legacy propagator jobs: Do not limit bandwidth when aborting
...
When aborting, we want the last job to be as fast as possible
as it blocks the UI. So don't limit the bandwidth in that case
2014-06-18 15:09:19 +02:00
Olivier Goffart
0880444e37
Syncengine: Wait for the neon thead to be finished before destroying the Propagator and calling csync_commit
...
The legacy job might still need the neon session and the propagator.
We need to make sure the thread exits before.
This fixes crash when pausing a sync made with the legacy jobs
(for example when there is network limitation)
This should fix https://github.com/owncloud/enterprise/issues/200
2014-06-18 15:08:23 +02:00
Jenkins for ownCloud
6c3eb06b65
[tx-robot] updated from transifex
2014-06-18 01:25:22 -04:00
Olivier Goffart
0a953b91f9
csync_vio_local: fix memory leak on windows
2014-06-17 16:40:38 +02:00
Klaas Freitag
b71881d300
SyncEngine: Use QSet for the seenFiles rather than QHash.
...
We can save some memory here as the seenFiles list can be long.
2014-06-17 16:30:11 +02:00
Daniel Molkentin
b91967f4d9
Fix regression over 1.5: Fix non-fba auth for Shib IdPs
2014-06-17 14:53:23 +02:00
Olivier Goffart
c759e8bb8f
permission: read them from the tree
2014-06-17 14:50:24 +02:00
Olivier Goffart
b83f6c0b3a
sync engine: try to respect permission
...
This is still Work in progress
2014-06-17 14:44:58 +02:00
Olivier Goffart
ade92d8ac1
csync test: fix warning
2014-06-17 14:16:42 +02:00
Jenkins for ownCloud
08398784e4
[tx-robot] updated from transifex
2014-06-17 01:25:29 -04:00
dark-eye
afea881d90
Merge pull request #1717 from dark-eye/master
...
Issue-142 : added time estimation and bandwidth indicator to the systray
2014-06-17 08:16:52 +03:00
Olivier Goffart
194bba2118
Merge remote-tracking branch 'origin/il' into tmp_master
2014-06-16 16:58:57 +02:00
Markus Goetz
a5967e4ecd
CSync: Fix win32 compile
2014-06-16 16:53:10 +02:00
Olivier Goffart
21e22a50c5
Merge remote-tracking branch 'origin/il' into master
2014-06-16 16:43:48 +02:00
Olivier Goffart
2f361278d2
Merge remote-tracking branch 'origin/1.6' into 'il'
2014-06-16 16:41:48 +02:00
Markus Goetz
319cf76417
CSync: Move compiler ifdef outwards
2014-06-16 16:26:00 +02:00
Markus Goetz
be7b08b50a
CMake: Fix token auth compile
2014-06-16 15:34:46 +02:00
Klaas Freitag
2d234cd96f
Propagator: Handle file open error properly and log error message.
2014-06-16 13:35:50 +02:00
Klaas Freitag
1230e87330
Propagator: Give a more specific error message on file remove.
...
If the file is removed during it is synced up, there is now a correct
error message saying that, rather than "the file has changed during
upload."
2014-06-16 13:34:59 +02:00
Jenkins for ownCloud
22c01748ce
[tx-robot] updated from transifex
2014-06-16 02:06:11 -04:00
Jenkins for ownCloud
02809d5016
[tx-robot] updated from transifex
2014-06-16 01:25:22 -04:00
Jenkins for ownCloud
d21f312936
[tx-robot] updated from transifex
2014-06-14 01:25:22 -04:00
Daniel Molkentin
b2966fecc7
Shib: remove slotLoadFinished() from webview dtor
...
This is a relict from when the webview was reused.
It is now pointless, since it's now destruct-on-close.
2014-06-14 03:00:18 +02:00
Daniel Molkentin
4abe00ff6c
Shib: Ensure browser view gets closed before QNAM
...
Otherwise, QWebPage tries to delete its QNetworkReplies, which have
already been deleted by the QNAM destruction, who is their parent.
Fixes #1840
2014-06-14 03:00:18 +02:00
Markus Goetz
357b041bb4
CSync: Give ctx to proxy callback
...
This fixes a crash.
2014-06-13 16:46:51 +02:00
Markus Goetz
61999a67cd
CSync: Give ctx to proxy callback
...
This fixes a crash.
2014-06-13 15:36:00 +02:00
Daniel Molkentin
8da97a7c6f
Merge remote-tracking branch 'origin/1.6'
2014-06-13 13:31:50 +02:00
Klaas Freitag
e1db834ec9
Add missing cmakedefine for HAVE_ASPRINTF and minor cleanup.
...
Fixes windows build.
2014-06-13 13:30:59 +02:00
Olivier Goffart
2caa69e0cb
blacklist: use the _ERROR instruction instead of _IGNORE
...
When something is in the blacklist, still use the _ERROR instruction
that way the applications can still report errors for blacklisted
items
2014-06-13 11:19:31 +02:00
Jenkins for ownCloud
c5932569f8
[tx-robot] updated from transifex
2014-06-13 01:25:21 -04:00
Klaas Freitag
c72c72a106
FolderWizard: Get folder map from FolderMan rather than store locally.
...
If the Folder::Map object is kept locally in the wizard, changes to
the map are not reflected there, as they happen when signing out.
This fixes bug #1875
2014-06-12 23:17:13 +02:00
Eran
1921d1a5be
Merge branch 'dark-eye-master'
2014-06-12 12:51:56 +03:00
Daniel Molkentin
4a5ef8f173
Fix a possible crash caused by a dangling pointer
2014-06-12 10:29:17 +02:00
Jenkins for ownCloud
8745a684ae
[tx-robot] updated from transifex
2014-06-12 02:06:12 -04:00
Jenkins for ownCloud
892cd962f8
[tx-robot] updated from transifex
2014-06-12 01:25:22 -04:00
Jenkins for ownCloud
3f543b881d
[tx-robot] updated from transifex
2014-06-11 02:06:11 -04:00
Jenkins for ownCloud
4a1d0eb80e
[tx-robot] updated from transifex
2014-06-11 01:25:22 -04:00
Klaas Freitag
ed26bcb3e7
Theme: Show the stringified app version rather than the major version.
...
This was a regression, we changed that by accident in 1.6.0.
(cherry picked from commit 760ecd71fc )
2014-06-10 17:05:15 +02:00
Klaas Freitag
760ecd71fc
Theme: Show the stringified app version rather than the major version.
...
This was a regression, we changed that by accident in 1.6.0.
2014-06-10 13:48:27 +02:00
Jenkins for ownCloud
04f1026cd8
[tx-robot] updated from transifex
2014-06-10 01:25:24 -04:00
Jenkins for ownCloud
b03c4cc62e
[tx-robot] updated from transifex
2014-06-08 01:25:21 -04:00
Olivier Goffart
18e9357aaf
network limits: Fix warning
...
About the order of initialization
2014-06-07 12:20:54 +02:00
Olivier Goffart
46b8260693
network limits: Do not read them from the config file in the engine
...
Do that from the folder, because the engine can be used in app where
the MirallConfigFile is not accessible
2014-06-07 12:09:22 +02:00
Olivier Goffart
d5bd3190d4
csync unit tests: fix cimpilation
2014-06-07 12:08:58 +02:00
Jenkins for ownCloud
e497b6d458
[tx-robot] updated from transifex
2014-06-07 02:06:12 -04:00
Jenkins for ownCloud
2e4320ee05
[tx-robot] updated from transifex
2014-06-07 01:25:22 -04:00
Eran
3406fcdce4
Merge branch 'master' of https://github.com/owncloud/mirall into dark-eye-master
...
Conflicts:
src/mirall/progressdispatcher.h
2014-06-06 18:56:58 +03:00
Klaas Freitag
14a5ff6747
overlayIcons: First version of the nautilus overlay python module
2014-06-06 17:49:19 +02:00
Markus Goetz
8dbfcd782b
CSync: Fetch permissions from server for whole tree on server update
2014-06-06 17:10:07 +02:00
Olivier Goffart
abf0f90a13
SocketAPI: broadcast change when an item is done
2014-06-06 15:52:55 +02:00
Klaas Freitag
4d5c74c019
SocketAPI: Add another API call for stat of file and folder separately.
2014-06-06 15:38:20 +02:00
Markus Goetz
70ff928381
CSync & statedb: Parse 'perm' from server
...
ownCloud 6 sends this.
2014-06-06 15:24:17 +02:00
Markus Goetz
b48ab79a92
CSync & statedb: Remove uid/gid
...
Columns are still in the DB as we don't want to break any compatibility.
2014-06-06 13:41:16 +02:00
Markus Goetz
9a7fbd4f71
csync_owncloud: Parse properties in one function
2014-06-06 13:41:16 +02:00
Jenkins for ownCloud
ef3b4956ad
[tx-robot] updated from transifex
2014-06-06 01:25:21 -04:00
Markus Goetz
fd4642d827
Folder: Don't add ignored files on startup
...
Before each sync is enough.
(We could do it at startup only, but so far it is good to have
it at each sync so we can easier see stuff in the log)
2014-06-05 17:50:18 +02:00
Olivier Goffart
6dd248e527
csync: fix warnings
...
warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
2014-06-05 15:48:53 +02:00
Olivier Goffart
7d00c3646a
csync: remove unused variable
2014-06-05 15:45:15 +02:00
Olivier Goffart
e355e12385
Fix crash in tests
2014-06-05 15:43:27 +02:00
Markus Goetz
34b31c0146
CSync: Fix test compile
...
The previously applied pull request apparantly broke the compile
because it re-ordered entries in the CMakeLists
2014-06-05 14:22:10 +02:00
Daniel Molkentin
3934fa019e
SocketAPI: proper name for pipe on windows
2014-06-05 12:02:57 +02:00
Daniel Molkentin
dc53e96f92
[Janitor] Bump version on master to 1.7.0prealpha
2014-06-05 12:02:00 +02:00
Daniel Molkentin
7fcf6f9f79
Merge branch '1.6'
2014-06-05 12:01:50 +02:00
Daniel Molkentin
b814b45e50
Add version and product information to installer properties
2014-06-05 11:51:12 +02:00
Daniel Molkentin
ded8914df2
[Janitor] Bump version to 1.6.1pre
2014-06-05 11:51:12 +02:00
Olivier Goffart
bd48ab23c3
Merge pull request #1835 from zizzfizzix/cmake_fixes
...
A little CMake cleanup
2014-06-05 11:48:40 +02:00
Markus Goetz
4e28ba73bb
Windows: Fix build harder.
2014-06-05 10:13:20 +02:00
Jenkins for ownCloud
16cb37ecd0
[tx-robot] updated from transifex
2014-06-05 01:25:23 -04:00
Olivier Goffart
7a7b0e8939
propagator: Ignore new directory inside removed directory.
...
This fixes te bug if one create a tree of folders and subfolders
and delete them while they are uploading. Some folder would
reappears
2014-06-04 16:37:46 +02:00
Markus Goetz
d4d630b2e9
Windows: Fix build
2014-06-04 12:47:17 +02:00
Olivier Goffart
a4f6370774
propagator: do not update perent directory etag before sub directories are removed
...
Direcotries are removed at the end, and we don't want to update
parent directory etag before the delete is performed, or the next
sync may read from db and think the files are not removed.
Issue #1845
2014-06-04 12:31:30 +02:00
Markus Goetz
2ff27cdd63
Merge pull request #1844 from owncloud/csyncStdlibReduction
...
Csync reduction
Reviewed offline by @dragotin
2014-06-04 11:28:35 +02:00
Markus Goetz
2f81167164
CSync: Remove more unused things
2014-06-04 11:19:09 +02:00
Markus Goetz
6897c5d41f
CSync: Always have statedb enabled
2014-06-04 11:06:41 +02:00
Markus Goetz
233450d850
CSync: Remove config dir setting
2014-06-04 10:56:56 +02:00
Markus Goetz
7428a8fa63
CSync: Remove unused std functions
2014-06-04 10:33:19 +02:00
Markus Goetz
18359d7871
StateDB: Remove _csync_win32_hide_file and use other implementation
2014-06-04 09:46:31 +02:00
Jenkins for ownCloud
df12a58e3d
[tx-robot] updated from transifex
2014-06-04 01:25:24 -04:00
Kuba Serafinowski
4b3d124b5a
put man docs in the correct /man1 directory
...
man doesn't work here when the docs are in a /man directory
2014-06-04 00:10:18 +03:00
Kuba Serafinowski
51e941e7b5
look for Sparkle only on OS X
2014-06-04 00:10:17 +03:00
Kuba Serafinowski
62ea6f316f
don't look for CMocka if we're not building unit tests
2014-06-04 00:10:16 +03:00
Olivier Goffart
6605a89990
csync_statedb: Fix wrong % code in debug output
...
%ld is for long, but int64_t is larger than long on windows
2014-06-03 18:28:31 +02:00
Olivier Goffart
4cb9b3a85b
Test: fix compilation
2014-06-03 17:54:43 +02:00
Olivier Goffart
806ab8ea46
csync: remove the local mode
...
It is no longer used for a long time
2014-06-03 17:52:07 +02:00
Olivier Goffart
582a8fe7fd
Merge branch '1.6'
2014-06-03 17:27:12 +02:00
Olivier Goffart
08ca8b54b1
test fles with '%' and '#'
2014-06-03 17:27:06 +02:00
Olivier Goffart
abafbef985
Optimize move
...
Do not send the mtime for each file without a directory, because the server now keeps it
2014-06-03 17:27:06 +02:00
Olivier Goffart
6e10b8c5c4
Propagator: Recover from 'precondition failed' error
...
When we detect a precondition failed, it is possible that it is
because the etag in the database is wrong. We must therefore not
read from the database on the next sync. In order to avoid that, we
reset the etag of parent directories to invalid values
Fixes #1767
2014-06-03 17:22:40 +02:00
Markus Goetz
06863ca9c6
Merge pull request #1839 from owncloud/directDownload
...
Direct download URL support + global variable refactoring
Reviewed offline by @dragotin
2014-06-03 16:44:05 +02:00
Markus Goetz
e49b8981dd
CSync: Shorten WebDAV property name
2014-06-03 16:41:57 +02:00
Olivier Goffart
24616bead4
Fix syncing a folder with '#' in the name
...
Or an url with '#'
Fixes #1838
The problem is a bug fixed in Qt5 now breaks.
In Qt4, QUrl::setPath() did not properly handle path with '#' in them
and QUrl::toString would restitute the '#'.
But csync will blindly do "uri + path" before passing the path to
VIO. because csync_update has no idea that the VIO plugin need special
encoding, the encoding cannot be done there. But csync_owncloud then
encodes the full path. So if the uri contains '#', it must not be already
encoded or there will be two encoding.
2014-06-03 15:45:10 +02:00
Markus Goetz
2e91557c28
CSync: Rename callback functions
2014-06-03 15:01:35 +02:00
Markus Goetz
4d4eab8b1c
CSync & Propagator: Support a direct download URL
...
This is for server file backends that support sending a
direct URL.
2014-06-03 14:55:34 +02:00
Olivier Goffart
13f9970257
Fix some possible "Precondition Failed" bug
...
The problem was if there was a false conflict: the file has been touched
both on the server and the client.
- etag has changed on the server
- mtime has changed on the server and the client and is the same
- and file size is the same on both the server and the client
This may also happen if the file is uploaded on the server, but the client
looses connection (or crashes) before it get notified of the etag.
In both tree, the instruction is EVAL, but we reduce it to a NONE because
we detected that the conflict is 'false'. Still, we need to update the db
with the new etag. (_should_update_db)
The problem was that we would set the flag on the wrong tree.
This was not a problem when the file was NEW on both side since we checked
for null etag and used the other one then.
2014-06-03 12:23:30 +02:00
Markus Goetz
4d4ae9374b
CSync: Remove old defines
2014-06-03 11:51:12 +02:00
Markus Goetz
b8e20b412c
CSync: We can access the context directly
2014-06-03 11:51:12 +02:00
Markus Goetz
e36f3c5b10
CSync: Remove one VIO layering
2014-06-03 11:51:12 +02:00
Markus Goetz
8a55f831f4
CSync: Use context instead of global variable
2014-06-03 11:51:12 +02:00
Markus Goetz
0dcc9be5c1
CSync: Remove owncloud_stat
...
We get already all metadata with the readdir
2014-06-03 11:51:12 +02:00
Markus Goetz
5ee00a8df7
CSync: Simplify csync_owncloud stat/resource handling
2014-06-03 11:51:12 +02:00
Klaas Freitag
1af3d3f18b
More descriptive error message when querying the database without hit.
2014-06-03 09:50:09 +02:00
Klaas Freitag
f54248c0a7
Minor cleanups and changes
2014-06-03 09:50:09 +02:00
Klaas Freitag
2911c0e1c4
Add a recursiveFolderStatus method
2014-06-03 09:50:09 +02:00
Klaas Freitag
16d35c1489
Avoid crash on csync_ctx is NULL.
2014-06-03 09:50:09 +02:00
Daniel Molkentin
746c15b4aa
Remove debug layout
2014-06-02 19:38:04 +02:00
Daniel Molkentin
7e65c9741e
[Shib] Ensure only one fetch job can open the browser
2014-06-02 17:41:49 +02:00
Jenkins for ownCloud
a50e7c1b48
[tx-robot] updated from transifex
2014-06-02 01:25:23 -04:00
Jenkins for ownCloud
0ae82e2041
[tx-robot] updated from transifex
2014-06-01 02:06:11 -04:00
Jenkins for ownCloud
22af756fe3
[tx-robot] updated from transifex
2014-06-01 01:25:21 -04:00
Jenkins for ownCloud
2f1bec28dd
[tx-robot] updated from transifex
2014-05-31 01:25:23 -04:00
Markus Goetz
022a3fcd92
OS X: Fix localFileNameClash
...
We need to compare the other way round and compare only the file name
because our sync directory might be symlinked and then resolve to
another canonical path (but we were only interested in the filename part
anyway)
2014-05-30 15:47:53 +02:00
Daniel Molkentin
064dcdb25a
1.6.0 final
2014-05-30 12:38:44 +02:00
Jenkins for ownCloud
938dce7fa6
[tx-robot] updated from transifex
2014-05-30 01:25:21 -04:00
Olivier Goffart
0151682a53
Make sure that OwncloudPropgator::finished is only emit once
...
When we abort, each job currently running may result in a call to finished().
It used to cause a crash because we would unlock the _syncMutex twice
Fixes #1793
2014-05-29 12:15:13 +02:00
Olivier Goffart
864f2cdc7d
remove the _syncMutex and replace it by a simple bool
2014-05-29 11:35:13 +02:00
Jenkins for ownCloud
77ddedc859
[tx-robot] updated from transifex
2014-05-29 01:25:27 -04:00
Eran
cd82a8585a
change the text to be a little more descriptive and use shorthand in the context menu
2014-05-29 00:09:02 +03:00
Daniel Molkentin
0c1ab533e6
Do not trim serial numbers
...
This broke in a refactoring. The 'true' was interpreted as length of 1.
Fixes part of #1436
2014-05-28 21:16:00 +02:00
Olivier Goffart
1dd7f736d0
Fix another crash at exit
...
Fixes #1794
2014-05-28 19:59:35 +02:00
Olivier Goffart
571c199db8
remove broken connection
...
Fixes #1822
2014-05-28 18:11:39 +02:00
Daniel Molkentin
40715cbc77
Update ChangeLog
2014-05-28 16:33:01 +02:00
Daniel Molkentin
3d2a2df86f
Allow to set a smaller timeout value in the config file
...
Added to debug #1724
2014-05-28 16:28:22 +02:00
Daniel Molkentin
86a48b52e9
Shib: Show a notification whenever the shib session times out
...
This is designed as a passive popup notification so that it will
not surprise or annoy the users.
Fixes Enterprise issue #179
2014-05-28 15:25:43 +02:00
Olivier Goffart
ebe1f986f1
Only remove session cookies
...
This should disconnect without loosing long lived cookie
2014-05-28 15:24:14 +02:00
Eran
6927fc80c3
change the mapping to use short hand and also made the mapping logic a little losser
2014-05-28 13:09:30 +03:00
Olivier Goffart
dd1152dd4f
Clear all cookies when loging out
2014-05-28 11:41:06 +02:00
Olivier Goffart
ce9bfd319a
Fix the sib window re-appearing.
...
When the windows is accepted, do not emit fetched which means the process is finished
one must first check the username is valid
2014-05-28 10:18:57 +02:00
Daniel Molkentin
f591ac6549
CookieJar: Reduce debug noise
2014-05-28 10:05:32 +02:00
Daniel Molkentin
4fd368c992
ShibCredentials: Ensure that _stillValid is not reset while the browser window is open
...
This will cause the browser window to open again after it has been told to close
if a network job has run in the background while the browser window was visible.
Fixes #1814
2014-05-28 10:05:32 +02:00
Eran
89a95d6445
fixed comment spelling
2014-05-28 08:28:03 +03:00
Jenkins for ownCloud
93f453057b
[tx-robot] updated from transifex
2014-05-28 01:25:21 -04:00
Klaas Freitag
5a069d274b
Pushed version suffix to rc3
2014-05-27 11:41:01 +02:00
Klaas Freitag
e275ad3866
Emit the sync finished signal a bit delayed.
...
This allows folder watcher events comnig in before the sync is marked
finished. This avoids "endless syncing" as described in bug #1808
2014-05-27 11:35:07 +02:00
Olivier Goffart
5813f63df8
Do not runs the check connection timer when there is no configured account
...
in order to avoid popup of the wizzard every 32 seconds
Fixes #1812
2014-05-27 11:05:09 +02:00
Jenkins for ownCloud
9a1f8ccf7b
[tx-robot] updated from transifex
2014-05-27 01:25:28 -04:00
Klaas Freitag
449c00f019
No need to check for case preserving filesystem here.
...
That is done in the utility function instead.
2014-05-26 18:28:52 +02:00
Klaas Freitag
6017eb7ca6
Case clash check for local remove plus native separators.
2014-05-26 18:28:25 +02:00
Klaas Freitag
f1b2417967
Add check for case clash for legacy propagator download.
2014-05-26 18:28:25 +02:00
Klaas Freitag
181383e5f1
Check for case preserving file system in localCaseClash
2014-05-26 18:28:25 +02:00
Markus Goetz
c1b9d5c653
Propagator: Implement localFileNameClash for OS X
2014-05-26 17:36:52 +02:00
Klaas Freitag
964c3ac7bf
Check for local file name clash before local renaming.
...
Return a proper error message in case.
2014-05-26 17:00:40 +02:00
Daniel Molkentin
6d8afabf41
Find export macro
2014-05-26 16:33:04 +02:00
Daniel Molkentin
0a7dbeb778
Export CookieJar
2014-05-26 16:29:26 +02:00
Olivier Goffart
3228fde4af
Only set should_update_etag for directories in the update case
...
If there is an error during the local rename for a file, we don't
want to write the entry for the destination before because there might be
an error
2014-05-26 16:11:05 +02:00
Daniel Molkentin
0582abe8dd
Shib: Wizard: Return to IdP selection when returning to creds page
2014-05-26 15:57:01 +02:00
Eran
f9192e27fa
added "/s" to the bandwidth
2014-05-26 16:25:33 +03:00
Olivier Goffart
81f410970f
ammend previous change
2014-05-26 15:01:26 +02:00
Olivier Goffart
e75c5236f2
Properly report errors when renaming a file
...
That is especially usefull when renaming to an existing file with a different case
2014-05-26 14:51:53 +02:00
Olivier Goffart
8a671c40d1
Make FolderMan a member of the application
...
The goal here is that it is going to be destroyed with the application
It need to be destoyed so the folder are destroyed, which is required
for properly finishing the sync while exiting.
It must not be destroyed after the application because the QSQLite plugin
may be already destroyed in that case.
Since the constructor of FolderMan is called earlier, we can't call the
config file too early
fixes 1793
2014-05-26 14:37:15 +02:00
Olivier Goffart
50ce0f9681
Fix crash at exit when there is a log after the Logger has been destroyed
...
Use a proper static Logger instead of allocating one, and cleanup
the QTMessageLogger when it is destroyed
2014-05-26 14:37:14 +02:00
Daniel Molkentin
a60902b33d
Make sure the settings window is brought up when minimized
...
Fixes #1804
2014-05-26 14:32:08 +02:00
Olivier Goffart
5220786cf2
do not blacklist fatal error
2014-05-26 12:27:16 +02:00
Olivier Goffart
99cead68f5
Fix crash when aborting
...
When aborting, the slotFinished will destroy all the Jobs, but they need
one more even loop to finish cleanups
Fixes #1793
2014-05-26 12:23:25 +02:00
Olivier Goffart
7a209ba376
leak fix
2014-05-26 12:07:00 +02:00
Olivier Goffart
f9263da3de
Fix crash when the account config is gone and there are still folder
...
In rare case (due to a bug in QSettings) the account config may disapear
We should not crash in that case
2014-05-26 11:08:32 +02:00
Daniel Molkentin
3f724e1c6a
Fix Pref window for good
...
This was forgotten in 18677dbc3f
2014-05-26 09:37:43 +02:00
Jenkins for ownCloud
c9d3f7a0eb
[tx-robot] updated from transifex
2014-05-26 01:25:25 -04:00
Eran
ba5e955ccb
chaned the design a little
2014-05-25 22:43:41 +03:00
Jenkins for ownCloud
072af16f3b
[tx-robot] updated from transifex
2014-05-25 02:06:12 -04:00
Jenkins for ownCloud
d2b6c626b5
[tx-robot] updated from transifex
2014-05-25 01:25:28 -04:00
Daniel Molkentin
115276408a
Merge pull request #1805 from wakeup/master
...
Fix some typos
2014-05-24 15:26:06 +02:00
Volkan Gezer
9abffdb1a6
fix typo
2014-05-24 15:04:42 +02:00
Volkan Gezer
5b0307446a
fix spacing
2014-05-24 15:03:45 +02:00
Jenkins for ownCloud
0f20a4f546
[tx-robot] updated from transifex
2014-05-24 01:25:29 -04:00
Klaas Freitag
1b2875c20a
Use the moved implementation of the name clash detection method.
2014-05-23 18:58:21 +02:00
Klaas Freitag
bbdf7bf955
Check for case clash on downloads.
2014-05-23 18:58:21 +02:00
Klaas Freitag
57359968ed
Added method localFileNameClash
...
Also reordered the implementations a bit.
2014-05-23 18:58:08 +02:00
Klaas Freitag
ea9f302b7a
Read the blacklist entries case insensitive in case the file
...
system is only case preserving.
2014-05-23 16:13:35 +02:00
Klaas Freitag
ef0a3c212e
Add a utility function fsCasePreserving.
...
Returns true if the underlying file system is case preserving instead
of case sensitive. That is true for Mac and Windows currently. Only
Linux has a case sensitive file system usually.
2014-05-23 16:13:35 +02:00
Daniel Molkentin
18677dbc3f
Fix on-top/below-others window problem
...
- Don't give the settings window an always-on-top hint, or else
sub dialogs will pop-under. Also, people seem to (ab-)use it
as a status monitor... well
- raiseWidget() can only really do one thing: remove the dialog status
from dialogs without a parent due to a bug in Qt. The previous
implementation never really worked. Tested on Mac and Gnome 3 so far.
Fixes #1795
Fixes parts of #1775
2014-05-23 16:00:50 +02:00
Klaas Freitag
7e8b403116
More progress on the CI problem detection.
2014-05-22 17:12:59 +02:00
Klaas Freitag
1303379c9e
Remove useless global varialbe for auth callback.
2014-05-22 12:54:14 +02:00
Daniel Molkentin
b995cd318c
Fix/cleanup PropagateLocalMkDir::start()
2014-05-22 10:16:33 +02:00
Daniel Molkentin
ed19107161
Remove useless check. QFile::exists() is CI on CI filesystems
...
Tested on OS X and Windows
2014-05-22 10:06:10 +02:00
Jenkins for ownCloud
1b67f253dc
[tx-robot] updated from transifex
2014-05-22 01:25:23 -04:00
Markus Goetz
667c835c49
Revert "remove auth callback setting in the csync module."
...
This commit broke syncing.
We need the callback to supply the password.
This reverts commit 8738128504 .
2014-05-21 20:02:22 +02:00
Daniel Molkentin
5b298abba1
Revert "Set an "active" role for the menubar icon on Mac"
...
Apart from a small mistake in this commit, there seems to be
something else wrong.
This reverts commit 97362cff32 .
2014-05-21 13:00:20 +02:00
Daniel Molkentin
4edbeece49
Fix connection following the update of the QtSingleApplication classes
2014-05-21 12:31:44 +02:00
Daniel Molkentin
97362cff32
Set an "active" role for the menubar icon on Mac
...
Fixes #1730
2014-05-21 11:19:38 +02:00
Daniel Molkentin
3db3c7b876
Update QtSingleApplication and QtLockedFile
...
Fixes stale temp file issues, and is needed for blocking support.
2014-05-21 11:19:38 +02:00
Klaas Freitag
8738128504
remove auth callback setting in the csync module.
2014-05-21 11:09:02 +02:00
Klaas Freitag
069eaf9170
Clear the authentication callbacks set before.
2014-05-21 11:09:02 +02:00
Klaas Freitag
d0b9b002e4
Show the sync icon in case the status is not yet defined.
...
This fixes the problem that on the first sync, no proper status icon is
shown on a potential long update phase.
2014-05-21 11:09:01 +02:00
Eran
fae3e46a59
made the code a little cleaner
2014-05-20 16:56:39 +03:00
Olivier Goffart
bdba56f60b
Always wait on the thread before emiting finished
...
This ensure that there would be no way to have two thread running
Refactor all the location where finished is called in a single function
2014-05-20 12:32:06 +02:00
Jenkins for ownCloud
7087dbc445
[tx-robot] updated from transifex
2014-05-20 01:25:31 -04:00
Daniel Molkentin
7ade4bb6e6
AccountSettings: Handle button states more correctly
...
Fixes #1779
2014-05-19 15:46:23 +02:00
Daniel Molkentin
86117aed0d
autostart unix impl: use mkpath instead of mkdir
...
Fixes TestUtility::testLaunchOnStartup(), if .config/ does not exist.
2014-05-19 12:42:04 +02:00
Jenkins for ownCloud
ed3d9a7479
[tx-robot] updated from transifex
2014-05-19 01:25:29 -04:00
Jenkins for ownCloud
3746a2efff
[tx-robot] updated from transifex
2014-05-18 01:25:29 -04:00
Jenkins for ownCloud
9b53cc66e7
[tx-robot] updated from transifex
2014-05-17 01:25:38 -04:00
Klaas Freitag
43fe7b0d55
Detect directory case sensitivity clash on windows
2014-05-16 15:24:01 +02:00
Daniel Molkentin
5aa6f81ef3
1.6.0rc2
2014-05-16 09:50:50 +02:00
Jenkins for ownCloud
f838f28185
[tx-robot] updated from transifex
2014-05-16 01:25:29 -04:00
Olivier Goffart
e1f8eb5aa5
Another way to force a sync when choosing 'Keep files'
2014-05-15 19:36:01 +02:00
Olivier Goffart
f40a054cb7
Revert "Re-sync immediatly after "Keep files" when all files were removed"
...
This causes infinite sync loops
This reverts commit 8b469d3992 .
2014-05-15 19:29:40 +02:00
Daniel Molkentin
adfb163593
1.6.0rc1
2014-05-15 17:22:01 +02:00
Eran
3777074e84
Remove extra space between the parenthesis when displaying estimation in the system tray
2014-05-15 17:46:25 +03:00
Daniel Molkentin
81c768099e
Folder: Correctly reflect paused state after restart
2014-05-15 15:04:48 +02:00
Daniel Molkentin
4bcaebb322
Decrease debug noise
2014-05-15 15:04:48 +02:00
Olivier Goffart
8b469d3992
Re-sync immediatly after "Keep files" when all files were removed
...
Fixes #1710
2014-05-15 11:48:01 +02:00
Olivier Goffart
bb929db7e6
fix warning
2014-05-15 11:29:23 +02:00
Olivier Goffart
90ee274744
We need to call csync_commit in every error cases
...
Else there will still be outdated tree in the memory and the further sync
will be confused
Relates to #1710
2014-05-15 11:18:06 +02:00
Daniel Molkentin
9f6e9f8e1b
Fix crash: if the credentials cannot be cast, don't deref, assume change
2014-05-15 11:12:18 +02:00
Klaas Freitag
943f9f60e3
Documented core dump catching
2014-05-15 11:11:13 +02:00
Klaas Freitag
f89bfce068
Enable core dumping if the env variable OWNCLOUD_CORE_DUMP is defined
...
Set OWNCLOUD_CORE_DUMP to anything to get a core dump in case of
crashing.
2014-05-15 11:01:21 +02:00
Klaas Freitag
ef44a59bed
Better debugability.
2014-05-15 09:45:50 +02:00
Klaas Freitag
d96139f698
Commented verbose logging.
2014-05-15 09:45:50 +02:00
Daniel Molkentin
de970eb0a5
Fix wizard flow with shibboleth
2014-05-15 09:43:26 +02:00
Jenkins for ownCloud
7a28b44128
[tx-robot] updated from transifex
2014-05-15 01:25:29 -04:00
Eran
5310a3cc1d
better time prediction
2014-05-14 16:57:14 +03:00
Daniel Molkentin
17a2e224c4
Fix memleak
2014-05-14 12:53:12 +02:00
Klaas Freitag
87386ce001
Fix testcase.
...
It failed because the directory where change happened triggered a
notification within the second before, so the event was skipped.
2014-05-14 12:49:11 +02:00
Daniel Molkentin
5ed4710d64
Merge pull request #1726 from owncloud/debian_bsd
...
Make Debian GNU/kFreeBSD compile
2014-05-14 12:20:17 +02:00
Klaas Freitag
5493c22584
Do not dispatch invalid progress information to avoid "unknown" messages
2014-05-14 11:52:22 +02:00
Klaas Freitag
64f4d1b387
Removed block parameter from terminateSync.
...
Do not pretend to immediately terminate the sync but let csync
finish planfully and free the mutex.
2014-05-14 11:52:22 +02:00
Daniel Molkentin
cdd8c8165b
Add missing header to fix Qt5 compilation
2014-05-14 11:22:56 +02:00
Daniel Molkentin
16ffd7fbe4
Merge pull request #1765 from owncloud/shibcookies
...
CookieJar refactoring required to overcome issues in Shibboleth support
2014-05-14 11:14:42 +02:00
Daniel Molkentin
ba959f7cf9
CookieJar refactoring required to overcome issues in Shibboleth support
...
The shibboleth implementation no longer maintains its own QNAM.
Instead, MirallAccessManager now holds a custom QNAM implementation
which saves cookies to a file on disk.
This patch also reduces some complexity wrt the browser window,
which used to be deleted via a roundtrip to its callee, which
is not longer required.
Fixes #1764 and Enterprise bug #165
Going forward, AbstractCredentials::getQNAM() could maybe removed entirely.
2014-05-14 11:11:45 +02:00
Eran
1509c4ffba
made the time description more malleable ,added support for none size update estimation (ie.. deletion), made the estimation more responsive at start and less jittery after some time
2014-05-14 10:55:04 +03:00
Jenkins for ownCloud
cf145feed8
[tx-robot] updated from transifex
2014-05-14 01:25:29 -04:00
hefee
07f57b1982
make Debian GNU/kFreeBSD compile
2014-05-13 16:51:42 +02:00
Klaas Freitag
e62eb62a01
Merge pull request #1179 from tomswartz07/master
...
Add exclusion for OSX ._<filename> files
2014-05-13 15:35:50 +02:00
Olivier Goffart
574e030caf
Use a different key than "user" to store the shib user
...
There is a HACK from commit fa0a2764a4
Which save the http user as a user for all credidentials, but that
cannot work with shibboleth
Fixes https://github.com/owncloud/enterprise/issues/175
2014-05-13 11:54:36 +02:00
Klaas Freitag
3705a42375
Remove misleading error message of "unknown error" for custom errnos.
2014-05-13 10:39:37 +02:00
Jenkins for ownCloud
a9ffd1d0cf
[tx-robot] updated from transifex
2014-05-13 01:26:28 -04:00
Eran
71ea2b582c
changed the systray to display total size and estimated time when the syncronization actually has size changed the descriptive time logic to be more generic
2014-05-12 17:36:27 +03:00
Klaas Freitag
f86dd1cbbf
Merge pull request #1747 from owncloud/doc_optional
...
install doc targets in any case. Thanks for the patch!
2014-05-12 11:35:59 +02:00
Jenkins for ownCloud
af066cc733
[tx-robot] updated from transifex
2014-05-12 01:26:26 -04:00
Eran
219098c182
Changed the time estimate string to be more textual, also added lower limit to the estimate to prevents starting estimation jittering
2014-05-12 00:26:17 +03:00
hefee
822650719b
RemoveADir test should realy test, if it is notified
2014-05-11 17:08:30 +02:00
Jenkins for ownCloud
95747fbaea
[tx-robot] updated from transifex
2014-05-10 01:26:26 -04:00
Jenkins for ownCloud
321058ef74
[tx-robot] updated from transifex
2014-05-09 01:26:28 -04:00
hefee
71c11373d8
install doc targets in any case.
...
If a user only builds some parts of the documentation and afterwards
wants to install owncloud-client afterwards via "make install", the
built parts should be installed in any case.
2014-05-08 13:44:35 +02:00
Jenkins for ownCloud
d5ba288dd5
[tx-robot] updated from transifex
2014-05-08 01:26:27 -04:00
Olivier Goffart
091e9bbd52
Fix crash when _engine is not available
...
Fixes #1671 and #1675
2014-05-07 16:17:08 +02:00
Olivier Goffart
ce09e11011
Revert "Do not dereference the _engine member variable without check."
...
bubbleUpSyncResult is only called from slotSyncFinished, so if _engine
is invalid there, it is also invalid in slotSyncFinished
This reverts commit aee7515d42 .
2014-05-07 16:13:43 +02:00
Olivier Goffart
d7a226e0e6
Silent warning:
...
warning: no previous prototype for ‘set_csync_file_locked_or_open_ext’ [-Wmissing-prototypes]
2014-05-07 12:38:57 +02:00
Olivier Goffart
f034bcb9ae
only increment the progressbar for files when the file has been fully transfered
2014-05-07 12:35:02 +02:00
Jenkins for ownCloud
4c77a04514
[tx-robot] updated from transifex
2014-05-07 01:26:27 -04:00
Klaas Freitag
a50c39cd0c
Maintain the original inode value for renamed files.
...
In case two renames are done on the same file/folder very quickly we
lost the information that the second operation was also a rename. That
was because we tried to get the inode value from a stat on the file once
the first rename was finished. But at that point, the file was already
gone because of the second rename.
Now the original inode is kept and written to db in case the file can
not be stat'ed.
This fixes bug #1737
2014-05-06 12:55:54 +02:00
Klaas Freitag
370dd99e47
Super useful source comment.
2014-05-06 09:30:50 +02:00
Jenkins for ownCloud
f97fbe868f
[tx-robot] updated from transifex
2014-05-05 01:26:30 -04:00
Jenkins for ownCloud
2ce6560b6e
[tx-robot] updated from transifex
2014-05-04 01:26:32 -04:00
Jenkins for ownCloud
2b4e14c4fc
[tx-robot] updated from transifex
2014-05-03 01:26:31 -04:00
Olivier Goffart
1631cfdaf1
Fix not blacklisting error 5xx
2014-05-02 17:26:28 +02:00
Olivier Goffart
2e76fe87c2
Fix reporting the right error in a GET
...
We always reported the lack of e-tag instead of the real error
2014-05-02 17:26:28 +02:00
Markus Goetz
6c44f53645
Set network timeout to 300 sec
...
As per previously used values (see source and changelog)
2014-05-02 15:35:40 +02:00
Olivier Goffart
988c162d2f
Have only one place where we read the timeout
2014-05-02 13:04:53 +02:00
Olivier Goffart
3d8d4fecd7
delete dead code
2014-05-02 11:50:20 +02:00
Jenkins for ownCloud
f8525fa5a0
[tx-robot] updated from transifex
2014-05-02 01:27:04 -04:00
Jenkins for ownCloud
6e48eb9397
[tx-robot] updated from transifex
2014-05-01 01:26:48 -04:00
Olivier Goffart
88cb047197
Add a timeout when using the QNAM propagation
2014-04-30 18:17:49 +02:00
Klaas Freitag
7f7154ed40
Auto generate the Export header.
...
This should fix oem builds.
2014-04-30 13:55:40 +02:00
Klaas Freitag
a8c1ffc2f4
Add a header file for owncloudcmd.cpp to avoid (auto)moc problems.
2014-04-30 13:55:40 +02:00
Klaas Freitag
df8b5b1ea6
Removed unused Q_OBJECT
2014-04-30 13:55:40 +02:00
Olivier Goffart
ce50cdecf1
Add one byte per files in the computation of the progress bar
...
So it feels like the progress bar is moving when operating of file
that are empty or when deleting or renaming files
2014-04-30 13:20:20 +02:00
Olivier Goffart
77c7439329
Don't include the directory size in the overall progress
...
We don't include them in the total amout of files so it should
not be included in the progress either.
Also, for some reasons directories seems to be 16kB on windows
2014-04-30 12:57:30 +02:00
Olivier Goffart
752112dbaa
Initialize the size properly on windows
2014-04-30 12:06:55 +02:00
Markus Goetz
925c6485e6
Propagator: Dont show silly string for non-error
2014-04-30 11:36:57 +02:00
Olivier Goffart
d62deabf9b
Fix updating mtime
...
Fixup commit 9193286fc1
Use the right URL for the PROPPATCH and HEAD, do not let other
jobs start when we wait for the UpdateMTimeAndETagJob
Update the etag and the fileid of the real item.
2014-04-30 10:24:17 +02:00
Jenkins for ownCloud
47c23dae30
[tx-robot] updated from transifex
2014-04-30 01:26:47 -04:00
Markus Goetz
3bf15541c6
Add set_csync_file_locked_or_open_ext
...
Without using function, there were problems with DLL import/export
2014-04-29 18:37:34 +02:00
Markus Goetz
876de8fd69
Networkjobs: Remove stray include
2014-04-29 17:55:26 +02:00
Olivier Goffart
983f9c5dde
The job restore job need to be run with QMetaObject::invoke
...
Because the job might be in a different thread.
2014-04-29 16:58:24 +02:00
Olivier Goffart
9193286fc1
Support old server which do not have the x-oc-mtime support
...
Owncloud 4.5
Or owncloud 5 with chunking
Fixes https://github.com/owncloud/core/issues/8392
2014-04-29 16:58:24 +02:00
Olivier Goffart
1b8d11182b
Add missing include
...
This was required so the compiler sees the declaration of
CredentialsFactory::create which should be exported
2014-04-29 16:04:24 +02:00
Olivier Goffart
dcc5c105eb
fix forward declaration of CredentialsFactory::create
2014-04-29 15:50:19 +02:00
Klaas Freitag
64b42333b0
Fix typo.
2014-04-29 15:36:13 +02:00
Olivier Goffart
3ee729bc4a
Add export macro to all classes that need to be exported
2014-04-29 15:31:14 +02:00
Daniel Molkentin
a268b03990
Try to not have windows stay-on-top
2014-04-29 15:31:03 +02:00
Klaas Freitag
6471a45a8a
Added changelog beta1 -> beta2
2014-04-29 14:46:17 +02:00
Klaas Freitag
7c27638f36
Set release suffix to beta2
2014-04-29 14:09:43 +02:00
Olivier Goffart
0bffdfb256
Fix compiler warnings, and be less spammy in the log
2014-04-29 12:30:13 +02:00
Olivier Goffart
9f0848ba15
Merge remote-tracking branch 'origin/libowncloudsync_noqtgui'
2014-04-29 12:23:15 +02:00
Olivier Goffart
f159b028b4
Add a compile option to not blacklist error code 5xx
2014-04-29 11:39:46 +02:00
Olivier Goffart
7e702778a1
Add missing line break
2014-04-29 11:27:31 +02:00
Eran
35b3ddd61f
Made the estimated time only appear in the systray when the sync has actual size.
2014-04-29 02:43:35 +03:00
Eran
a892b79dba
Seperated the systray estimation text to a seperate action, fixed an integer rounding bug
2014-04-29 02:31:27 +03:00
Eran
cd22a1846f
Fixed Indentation and multiple concurrent files syncing case ...
...
..Also increased the height of folder progress bar alittle in order to accommodate the added estimation data
2014-04-28 18:49:27 +03:00
Markus Goetz
4489a56c65
Csync: Set error at correct place
2014-04-28 17:25:18 +02:00
Markus Goetz
7f752c7e93
Csync: Plug code for csync_file_locked_or_open
2014-04-28 16:57:56 +02:00
Markus Goetz
b39359c929
Csync: Add hook for checking if a file is in use already
2014-04-28 14:18:58 +02:00
Klaas Freitag
b42d3ced15
Another fix for make install on MacOSX
2014-04-28 11:19:25 +02:00
Klaas Freitag
1c73a8d4ad
Fix installation for MacOSX
2014-04-28 10:24:12 +02:00
Daniel Molkentin
2d3ea59755
Limit the mac workaround to the Mac OS X platform
2014-04-28 10:13:53 +02:00
Jenkins for ownCloud
b8b064836c
[tx-robot] updated from transifex
2014-04-28 02:07:38 -04:00
Jenkins for ownCloud
3ab1330f63
[tx-robot] updated from transifex
2014-04-28 01:26:40 -04:00
Jenkins for ownCloud
ab711ddc36
[tx-robot] updated from transifex
2014-04-27 02:06:35 -04:00
Jenkins for ownCloud
2a1e67e587
[tx-robot] updated from transifex
2014-04-27 01:25:42 -04:00
Eran
eadcdab8e7
Issue-#142 : Added support for current file completion estimation.
...
Changed the account settings estimation to display both current file and overwhole estimation.
Decresed the progress font size to fit the added information
2014-04-27 00:48:12 +03:00
Jenkins for ownCloud
1d3febe053
[tx-robot] updated from transifex
2014-04-26 01:25:42 -04:00
Olivier Goffart
165e35c750
t1.pl: change assertLocalAndRemoteDir so we actually test something
2014-04-25 14:35:20 +02:00
Olivier Goffart
9da261acd8
Do not read from the database when upgrading from 1.5
...
We need to make sure that the file id are updated (if the user
had upgraded from owncloud 5 to owncloud 6 while using owncloud 1.5)
2014-04-25 13:31:44 +02:00
Jenkins for ownCloud
7544f4d367
[tx-robot] updated from transifex
2014-04-25 02:06:36 -04:00
Jenkins for ownCloud
a29a56bce8
[tx-robot] updated from transifex
2014-04-25 01:25:42 -04:00
Eran
46ffd1c29a
Issue-142 : added time estimation and bandwidth indicator to the systry and active download
2014-04-25 01:08:25 +03:00
Olivier Goffart
642c16b09b
Missing EXPORT
2014-04-24 23:57:42 +02:00
Olivier Goffart
5c92c190f0
Add EXPORT macro to owncloudsync library
...
Not all the class are exported currently, only the one that seems to be used
by the command line tools
2014-04-24 23:45:20 +02:00
Olivier Goffart
cc7826e087
Add a compile option to disable renaming when the extension changes
...
This is only used for a very specific server that do not support
changing the extension of files without re-uploading the file.
Since the change is small and self contained, it is guarded by a #ifdef
(Removed old BLACKLIST_ON_ERROR option that is no longer in use)
2014-04-24 11:51:48 +02:00
Jenkins for ownCloud
a154656311
[tx-robot] updated from transifex
2014-04-24 01:25:45 -04:00
hefee
9b7a3d00ee
Using QFile::decodeName instead of QLatin1String
2014-04-23 18:59:40 +02:00
Sandro Knauß
1d862b77af
merged 1.5 into master
2014-04-23 18:54:49 +02:00
Klaas Freitag
888843e655
Removed another file for Jenkins.
2014-04-23 13:22:06 +02:00
Klaas Freitag
28970393f6
Removed a test file as jenkins fails on it.
2014-04-23 13:18:28 +02:00
Klaas Freitag
1af7dc952c
Update to latest GNUInstallDirs cmake module
...
This version correctly detects debians multiarch lib handling and
lets us remove the manually set CMAKE_LIB_INSTALL_DIRS from the rules
file.
2014-04-23 13:04:16 +02:00
Jenkins for ownCloud
62dcfe85e4
[tx-robot] updated from transifex
2014-04-23 01:25:49 -04:00
Markus Goetz
f6711b2842
CMake: Find libraries also on Win host compile
2014-04-22 21:02:08 +02:00
Olivier Goffart
f2519e9d87
Fix function signature: pass argument by const reference
2014-04-22 19:52:09 +02:00
Markus Goetz
94f380c1f0
Updater: Ignore files matching with CSYNC_CONFLICT_FILE_USERNAME
2014-04-22 17:05:59 +02:00
Markus Goetz
197d180cb9
Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME
2014-04-22 16:17:49 +02:00
Markus Goetz
4be20db670
Propagator: Add makeConflictFileName function
2014-04-22 16:07:18 +02:00
Olivier Goffart
46d6191bc2
Also list folder for which the alias starts with '.'
...
Fixes #1695
2014-04-22 14:26:08 +02:00
Olivier Goffart
ee22f377af
Start the folder watcher when new folder are added
...
Before, we would only set up a file system watcher when we read the
config at startup. But we also need to do it in the other case when
the user configure new folder to watch
2014-04-22 14:15:43 +02:00
Olivier Goffart
44a04227f1
Update dynamically the error message in the account settings
...
This let the error be shown when the conneciton is missing at startup
And also remove the red background when there is no longer an error
2014-04-22 14:08:37 +02:00
Olivier Goffart
707c6fcc5d
An abort on the reply is not usually a password error.
...
Copy the code from HTTPCredidentials
2014-04-22 12:52:13 +02:00
Olivier Goffart
edb1f61241
Fix compilation without the BUILD_ONLY_LIBRARIES mode
2014-04-22 12:44:01 +02:00
Olivier Goffart
3fac5f91c8
In case of error, report the right error instead of missing etag
...
also, missing etag is not a fatal error
2014-04-22 12:43:38 +02:00
Olivier Goffart
1338c08622
Fix compilation on linux with BUILD_LIBRARIES_ONLY
2014-04-22 11:33:38 +02:00
Olivier Goffart
0cf8091705
Merge pull request #1700 from wakeup/master
...
Fix non-closed p tag
2014-04-22 10:08:29 +02:00
Klaas Freitag
521373f075
More specific log output.
2014-04-22 09:33:07 +02:00
Klaas Freitag
c24732f641
More debugable code.
2014-04-22 09:33:07 +02:00
Jenkins for ownCloud
655188d7b3
[tx-robot] updated from transifex
2014-04-22 01:25:41 -04:00
Markus Goetz
77ac092975
WiP: Attempt to compile without UI
2014-04-21 19:57:15 +02:00
Volkan Gezer
78e5e4ab66
Fix non-closed p tag
2014-04-21 15:29:42 +02:00
Jenkins for ownCloud
934eda128b
[tx-robot] updated from transifex
2014-04-21 01:27:00 -04:00
Daniel Molkentin
ece41921ff
Merge pull request #1697 from wakeup/master
...
Space fix
2014-04-20 15:44:03 +02:00
Volkan Gezer
9b71643c1c
Space fix
2014-04-20 14:54:40 +02:00
Jenkins for ownCloud
ed48b4bbf2
[tx-robot] updated from transifex
2014-04-20 01:26:54 -04:00
Olivier Goffart
b08284e4cc
Fix the background check job for the connection
...
We can't use the quota job for that as it needs the credidentials and therefore
may re-enter the credidential code when we are currently trying to fetch the credentials.
The quotainfo.cpp part of this patch is basically a revert of d836b80153
2014-04-19 09:49:52 +02:00
Jenkins for ownCloud
4731b506e5
[tx-robot] updated from transifex
2014-04-19 01:27:02 -04:00
Olivier Goffart
7d3b0fe0c5
Fix memory leak: Don't need to call strdup here
...
The other_node outlive the trav structure, so we can just use the same pointer
2014-04-18 19:16:10 +02:00
Olivier Goffart
fa38bf7029
Make sure the fileid are saved to the database when upgrading from owncloud5 to owncloud6
...
We fetch the id from the server, but don't save them in the database.
I Could have used INSTRUCTION_UPDATED for that, but then i would need to update the
reconcile algorithm to take in account the fact that UPDATED is possible there.
Instead, use should_update_etag which means the db is going to be written again
Remove reference to old instruction _UPDATED and _DELETED which does not make sens with
the new propagator
Improve the test to test this case, and that etags are properly writen to the DB
when there is a fake conflict
2014-04-18 18:27:27 +02:00
Olivier Goffart
bfdf638334
Add the files required by the tests.
...
Somehow they got removed with all the moving and merging.
Especially kernelcrash.txt is required for t1.pl
2014-04-18 17:20:42 +02:00
Jenkins for ownCloud
e6664c7790
[tx-robot] updated from transifex
2014-04-17 15:03:55 -04:00
Mr. Jenkins
a90779910a
[tx-robot] updated from transifex
2014-04-17 01:26:53 -04:00
Mr. Jenkins
edc7a9596a
[tx-robot] updated from transifex
2014-04-16 01:26:58 -04:00
Volkan Gezer
a7a19fad71
Fix note template label
2014-04-16 03:53:37 +02:00
Klaas Freitag
d143044f4a
Add missing cases to avoid "unknown action" under some circumstances.
...
Most of the translations are not used because they translate pre
propagation states.
Fixes #1674
2014-04-15 16:54:49 +02:00
Klaas Freitag
aee7515d42
Do not dereference the _engine member variable without check.
...
This can cause the crash because the _engine member is deleted in the
sync finished slot. The solution is to store the stopWatch object
before the engine is destroyed.
Fixes bug #1675
2014-04-15 16:28:18 +02:00
Klaas Freitag
82ab5fdcb9
Fix condition if network limit change is logged or not.
2014-04-15 16:28:18 +02:00
Klaas Freitag
4c6e6f6302
Add initialisations for member variables.
...
Avoids some valgrind warnings.
2014-04-15 16:28:18 +02:00
Klaas Freitag
0a2791270a
Add a reset method.
2014-04-15 16:28:18 +02:00
Klaas Freitag
c920f81562
Add braces.
2014-04-15 16:28:18 +02:00
Mr. Jenkins
9dcbafc307
[tx-robot] updated from transifex
2014-04-15 01:26:01 -04:00
Daniel Molkentin
d836b80153
Fix reconnect after server disconnect
...
Fixes #1679
Fixes #1568
Fixes #1659
2014-04-14 17:51:57 +02:00
Daniel Molkentin
efc4ff4d88
Fix redirects in CheckServerJob
2014-04-14 15:12:38 +02:00
Daniel Molkentin
dc043b5765
Try scheme://host/owncloud if scheme://host/ did not work
...
Fixes #1680
2014-04-14 15:10:08 +02:00
Daniel Molkentin
ef9a318cd9
AbstractNetworkJob Allow finished() to defer Job deletion
...
This allows to reuse the Job
2014-04-14 15:08:43 +02:00
Mr. Jenkins
9f4ffd44d6
[tx-robot] updated from transifex
2014-04-14 01:25:55 -04:00
Mr. Jenkins
598bfe6d1a
[tx-robot] updated from transifex
2014-04-13 01:25:56 -04:00
Mr. Jenkins
5f37c7b1b8
[tx-robot] updated from transifex
2014-04-12 01:26:00 -04:00
Volkan Gezer
8250fb81b3
Fix typo.
2014-04-11 15:10:47 +02:00
Klaas Freitag
30a14b9f45
Install ocsync library to private lib directory, use rpath to find it.
2014-04-11 13:28:11 +02:00
Mr. Jenkins
b0734f2791
[tx-robot] updated from transifex
2014-04-11 01:25:58 -04:00
Mr. Jenkins
d66b0910c6
[tx-robot] updated from transifex
2014-04-10 01:26:05 -04:00
Klaas Freitag
09e05392bf
Ignore all sync log files in the sync dir.
2014-04-09 22:02:28 +02:00
Daniel Molkentin
d3d202de68
Fix dataLocation on Linux/BSD
...
From the Qt 5 documentation:
Note: when porting QDesktopServices::DataLocation(obsolete)
to QStandardPaths::DataLocation, a different path will
be returned.
QDesktopServices::DataLocation was GenericDataLocation
+ "/data/organization/application", while
QStandardPaths::DataLocation is GenericDataLocation
+ "/organization/application".
We'll resort to the deprecated version, since we'll need to fix
data locations to be XDG compliant sooner than later anyway
(currently scheduled for 1.8)
2014-04-09 14:59:08 +02:00
Daniel Molkentin
87010fbe1a
SSL Button: Fix issues around printing Hash sums
...
- Use SHA 265 instead of obsolete MD5 where possible (Qt5)
- Remove <tt> formatting: that simply looked ugly
- Wrap SHA 265 hash
- Use spaces as separators
As usual, the default needs to remain ':' separation, because
it's needed to pass valid hashes to csync.
2014-04-09 14:30:51 +02:00
Jenkins for ownCloud
f302da81b1
[tx-robot] updated from transifex
2014-04-09 02:07:10 -04:00
Mr. Jenkins
3af53f5984
[tx-robot] updated from transifex
2014-04-09 01:26:26 -04:00
Klaas Freitag
7c40dc1a9a
Ignore changes on .owncloudsync.log in the linux filewatcher.
...
Also remove some verbose and unused logging.
2014-04-08 13:06:34 +02:00
Daniel Molkentin
af3af94a01
Allow tests to run against SSL-self-signed servers
2014-04-08 12:39:46 +02:00
Klaas Freitag
7d79d3d30d
Fix Search for Qt5 version Qt4
2014-04-08 12:08:01 +02:00
Klaas Freitag
990e2f0beb
Ignore the new sync log file in the sync dir.
...
It is required to have all ownCloud system files in the ignore list
that have to be ignored, because the ignore list is fed into the
folderwatcher, which needs to ignore changes to both the journal and
the logfile.
2014-04-08 11:55:31 +02:00
Daniel Molkentin
b34b4e37aa
Add Qt Keychain also when building with Qt5
2014-04-08 10:56:07 +02:00
Mr. Jenkins
02697a7c4d
[tx-robot] updated from transifex
2014-04-08 01:27:22 -04:00
Daniel Molkentin
4ff39d8114
Cleanups, build if Qt5 is not on system
2014-04-07 18:08:28 +02:00
Daniel Molkentin
69bdccfd2f
Include correct QtKeychain headers
...
..depending on Qt version
2014-04-07 17:46:06 +02:00
Daniel Molkentin
9f8d867ce2
About correctly when Qt5Keychain isn't found
2014-04-07 17:41:33 +02:00
Daniel Molkentin
d416c97eac
Fix Qt5 detection
2014-04-07 17:38:30 +02:00
Daniel Molkentin
1d70426bb7
Build with BOTH Qt4 and 5
2014-04-07 17:25:25 +02:00
Daniel Molkentin
6a2fe6be67
Build fix: QAtomicInt has no implicit integer conversion in Qt5
2014-04-07 16:49:01 +02:00
Klaas Freitag
8ed0fdcfa5
Fix info print in test script.
2014-04-07 16:36:35 +02:00
Klaas Freitag
ebf3c78237
More fine granular chunking test - improved t6.pl
2014-04-07 16:30:02 +02:00
Klaas Freitag
3d67d203fe
Fix content-length calculation for sizes multiple of the chunk size.
2014-04-07 16:29:06 +02:00
Klaas Freitag
fc06945b26
use the lowercase app name for icon in the desktop file.
...
fixes #1642
2014-04-07 15:14:58 +02:00
Klaas Freitag
9cdcc925c1
Do not log useless stuff.
2014-04-07 15:10:55 +02:00
Klaas Freitag
fc2923aa9b
Unlink the compare file after the remote cleanup.
2014-04-07 15:10:55 +02:00
Jenkins for ownCloud
6d325e6557
[tx-robot] updated from transifex
2014-04-07 02:07:45 -04:00
Daniel Molkentin
7d7d03071a
Add Copyright.txt for cmake modules
...
Fixes #1438
2014-04-07 01:27:59 +02:00
Mr. Jenkins
657f7613a1
[tx-robot] updated from transifex
2014-04-06 01:26:58 -04:00
Markus Goetz
d35c0f3ade
Propagator: Fix chunking for real
...
The reset() (using seek()) didn't work.
2014-04-05 14:26:24 +02:00
Mr. Jenkins
069e9526a8
[tx-robot] updated from transifex
2014-04-05 01:27:01 -04:00
Klaas Freitag
5aeee6d1f2
Use curl to get the file back, fix the LWP based download later.
2014-04-04 17:00:20 +02:00
Klaas Freitag
a759c93fb6
Add a new test script to check for big file chunking.
2014-04-04 16:33:57 +02:00
Daniel Molkentin
57c59850e1
Fix installation paths
2014-04-04 15:52:41 +02:00
Markus Goetz
0f7d448058
Propagator: Fix chunking
2014-04-04 15:41:35 +02:00
Klaas Freitag
ab8868eacd
Changelog updated.
2014-04-04 12:21:18 +02:00
Daniel Molkentin
00cd5875c0
Bump to beta1
2014-04-04 11:22:30 +02:00
Klaas Freitag
435e7e3eec
HACK to avoid continuation: See task #1448
...
We do not know the _modtime from the server, at this point, so just set
the current one. (rather than the one locally)
2014-04-04 10:56:33 +02:00
Klaas Freitag
08dd9796d1
HACK to avoid continuation: See task #1448
...
We do not know the _modtime from the server, at this point, so just set
the current one. (rather than the one locally)
2014-04-04 10:50:40 +02:00
Daniel Molkentin
4bcd620c29
Avoid build attempts with Qt4 on Windows and Linux
2014-04-04 09:29:01 +02:00
Mr. Jenkins
5f60c97f59
[tx-robot] updated from transifex
2014-04-04 01:26:59 -04:00
Olivier Goffart
20e850501d
Make sure we do not remove files that are replaced by a symlink
...
As we ignore symlink, we should not remove on the server the files that
are ignored.
Change tested in t4.pl
Relates to #1299
2014-04-03 17:47:49 +02:00
Olivier Goffart
462ba7d942
Don't dead lock when all the files are removed
...
SyncEngine is on the main thread, no need of the legacy BlockingConnection
2014-04-03 17:47:49 +02:00
Klaas Freitag
cf87fdff7f
Keep the updater data in the log struct for the synclog.
...
Also, shorten the timestamp and add the sync direction.
2014-04-03 16:56:50 +02:00
Markus Goetz
565bb540d6
Propagator: Add debug message regarding legacy vs QNAM
2014-04-03 16:37:40 +02:00
Klaas Freitag
062a0907db
Remove HTTP::DAV fragment and hardcode required version in Test.pm
2014-04-03 10:16:09 +02:00
Thomas Müller
95726eeab1
properly adding Turkish language support
2014-04-03 08:59:31 +02:00
Jenkins for ownCloud
6c2d286f10
[tx-robot] updated from transifex
2014-04-03 02:07:48 -04:00
Mr. Jenkins
6af3e9afc7
[tx-robot] updated from transifex
2014-04-03 01:26:59 -04:00
Klaas Freitag
ead935e0a6
Add an open to open the dav connection.
2014-04-02 16:45:31 +02:00
Olivier Goffart
eaf5681f61
Put the sync log in the actual folder
2014-04-02 16:36:32 +02:00
Olivier Goffart
03ef2aadde
Remove undeeded includes
...
And don't use 'using namespace' in headers
2014-04-02 16:23:57 +02:00
Olivier Goffart
f09076180d
don't add the list of field on the log for every sync
2014-04-02 16:21:07 +02:00
Olivier Goffart
d5d3c1a23a
Fix compilation with Qt5
...
We don't need QtWidgets, and we don't need Uility::escape
2014-04-02 16:21:06 +02:00
Markus Goetz
b18f1ad386
SyncEngine: Removed unused signal
2014-04-02 12:47:15 +02:00
Mr. Jenkins
fc553a8c04
[tx-robot] updated from transifex
2014-04-02 01:27:06 -04:00
Klaas Freitag
cba160706a
Minor cleanup
2014-04-01 16:14:24 +02:00
Klaas Freitag
fa453296c9
Enable SSL for testing.
2014-04-01 16:14:24 +02:00
Klaas Freitag
58aaad3fed
Add options to createRemoteDir
2014-04-01 16:14:24 +02:00
Klaas Freitag
8625ec250b
Add a trust ssl certificate switch
2014-04-01 16:14:24 +02:00
Klaas Freitag
d731f4718d
Add an simple SSL error handler for owncloudcmd.
2014-04-01 16:14:24 +02:00
Olivier Goffart
607e48a68b
let configure the default count of the blacklist
2014-04-01 13:54:47 +02:00
Olivier Goffart
bfe6a50b19
Fix some error cases in the SyncEngine
...
Always cleanup properly when we bail out.
Also fix thread safety of the SyncJournalDB
2014-04-01 13:41:47 +02:00
Mr. Jenkins
ded21c5826
[tx-robot] updated from transifex
2014-04-01 01:26:57 -04:00
Mr. Jenkins
9bd6019905
[tx-robot] updated from transifex
2014-03-30 01:26:33 -04:00
Mr. Jenkins
dcac2796dd
[tx-robot] updated from transifex
2014-03-29 01:26:34 -04:00
Klaas Freitag
ab439f8f0f
Proper cleanup of the shared directory.
2014-03-28 16:15:59 +01:00
Daniel Molkentin
9822002480
Spell APPLICATION_SHORTNAME correctly
...
Fixes #1547
2014-03-28 15:56:35 +01:00
Klaas Freitag
384a8d0d72
Added t5.pl which does basic testing with a Shared directory.
2014-03-28 15:04:14 +01:00
Daniel Molkentin
70eb688e86
fix frameworks during signing
2014-03-28 14:46:08 +01:00
Daniel Molkentin
4e0b6179f9
Libocsync is a library, not a plugin
...
This is needed to deploy the library correct in OS X.
2014-03-28 14:46:08 +01:00
Olivier Goffart
3acdfc0004
Make configurable the maximum amount of job in parallel
...
Bia the environement variable OWNCLOUD_MAX_PARALLEL
2014-03-28 11:20:07 +01:00
Olivier Goffart
a1fc7f0a25
Make the chunk size configurable via an environement variable
...
OWNCLOUD_CHUNK_SIZE
2014-03-28 11:11:02 +01:00
Olivier Goffart
5bceb6f787
fix test compilation
2014-03-28 11:02:18 +01:00
Olivier Goffart
8de9bec122
Remove progress info from csync
...
csync doesn't do no propagation no more
2014-03-28 10:50:15 +01:00
Olivier Goffart
5204a992b2
Remove HBF stuff from csync_owncloud
...
csync doesn't do no propagation no more
2014-03-28 10:41:48 +01:00
Olivier Goffart
765a18b74a
Fix compilation with Qt4
2014-03-28 10:26:42 +01:00
Olivier Goffart
350283fe06
Remove obsolete code that removed the sync journal when the sync directory is deleted
...
Since the journal is now in the same directory, we don't need this
security anymore
When the directory is removed, the sync will error out saying that the
journal cannot be loaded or created
2014-03-28 10:23:09 +01:00
Olivier Goffart
2ba62b79b4
Make the size of the log maximum 1MiB
2014-03-28 10:13:35 +01:00
Olivier Goffart
e0b6395d18
Use sane datastructure in Utility::StopWatch
...
We don't want to logging to be O(N^2)
Also avoid usage of macro when possible
2014-03-28 09:50:13 +01:00
Olivier Goffart
ba896b0550
Avoid copies of the StopWatch
2014-03-28 09:39:50 +01:00
Olivier Goffart
36a2c861c2
Only build the static library when BUILD_LIBRARIES_ONLY is defined
2014-03-28 09:34:21 +01:00
Olivier Goffart
7f975e0b2f
Avoid macro when it can easily be done with a local variable
2014-03-28 09:27:05 +01:00
Jenkins for ownCloud
359dd2b986
[tx-robot] updated from transifex
2014-03-28 02:07:21 -04:00
Mr. Jenkins
a636fd7801
[tx-robot] updated from transifex
2014-03-28 01:26:40 -04:00
Olivier Goffart
69fcbd3b0d
Fix Qt4 compilation
...
And a typo
2014-03-27 18:19:56 +01:00
Olivier Goffart
d6525a979d
Do not let user change it's login while using shibbolet
...
Fixes #915
2014-03-27 17:59:50 +01:00
Markus Goetz
67f4d0c85b
CSync: Debug message if no exclude file defined
2014-03-27 17:11:19 +01:00
Markus Goetz
54313338cd
SyncEngine: new aboutToPropagate signal
2014-03-27 17:04:31 +01:00
Markus Goetz
09e6207ce9
SyncEngine: Fix typo
2014-03-27 15:19:02 +01:00
Denis Dzyubenko
000e0bb600
Fast forwarded qtmacgoodies
2014-03-27 10:39:56 +01:00
Olivier Goffart
353f21e856
Add a FAQ item for the .eml problem
...
Fixes #1403
2014-03-27 09:55:25 +01:00
Mr. Jenkins
51e961e694
[tx-robot] updated from transifex
2014-03-27 01:26:35 -04:00
Olivier Goffart
de2335c1db
Show the folders when in the accountsettings in the first start
2014-03-26 19:31:37 +01:00
Olivier Goffart
332c6cf726
Fix invalid signal connection
2014-03-26 19:31:37 +01:00
Klaas Freitag
5481215813
Remove unused variable.
2014-03-26 18:18:20 +01:00
Klaas Freitag
086dd07d69
Log the processed items to a logfile.
2014-03-26 18:16:27 +01:00
Klaas Freitag
dd6b71bad6
Use a stopwatch to meassure the time consumed.
2014-03-26 18:16:27 +01:00
Klaas Freitag
9af2339596
Store the request duration and timestamp to final item
2014-03-26 18:16:27 +01:00
Klaas Freitag
0fcef5f604
Add data to store interesting info from the sync run (other tree)
2014-03-26 18:16:27 +01:00
Klaas Freitag
c41935d49d
Add a class to write a machine readable sync log file.
2014-03-26 18:16:27 +01:00
Klaas Freitag
7b84defd56
Add a stopwatch utility class with lap times.
...
Allows to meassure the duration of something that started at a
point of time, with some small convenience methods.
2014-03-26 18:16:27 +01:00
Klaas Freitag
505429b582
Add a duration and the repsonse timestamp to the jobs.
2014-03-26 18:16:27 +01:00
Klaas Freitag
033fee6f53
Fix include path
2014-03-26 18:16:27 +01:00
Klaas Freitag
67ae541e2a
Safe use of c_strdup
2014-03-26 18:16:27 +01:00
Klaas Freitag
11bbad79e2
Use QTimer as object member rather than pointer based.
...
Avoid crashes if timer is zero.
2014-03-26 18:16:27 +01:00
Klaas Freitag
6e6f647c63
Change data type for fileId to QByteArray.
2014-03-26 18:12:22 +01:00
Klaas Freitag
c5100a789b
Collect data from the "other" tree for the treewalk functions.
...
This enables us to log all relevant information that were used
to decide on sync activity.
2014-03-26 18:12:22 +01:00
Olivier Goffart
2ad7b0aae0
Fix crash on first run when no account are configured
2014-03-26 17:42:05 +01:00
Olivier Goffart
588633a0f2
Fix leak: don't leak the settings
2014-03-26 17:42:05 +01:00
Markus Goetz
d5659442b2
SyncEngine: Sanity bail out if DB does not exist suddenly
...
The update/reconcile worked for me, but the Propagate step had an invalid DB
path but still went on (and then messed things up)
2014-03-26 16:57:50 +01:00
Markus Goetz
c6e5f39f7f
SyncJournalDb: Verbose log on load failure
2014-03-26 16:40:00 +01:00
Markus Goetz
7bef166d6c
CSync: Debug file_id on walk
2014-03-26 15:32:45 +01:00
Olivier Goffart
38344589c4
Exxtract the exception message from reply to PUT
...
Might be usefull to debug Internal Server Error
Fixes #1366
2014-03-26 12:02:22 +01:00
Olivier Goffart
98d7ff5116
Don't create .ctmp of sync journal
...
Fixes #1559
2014-03-26 10:25:50 +01:00
Denis Dzyubenko
6c28151e0f
Fast forwarded qtmacgoodies submodule
2014-03-26 10:15:35 +01:00
Daniel Molkentin
411cffd3d5
NSIS: libcrypto-10 dependency got lost somehow
2014-03-26 09:10:01 +01:00
Daniel Molkentin
1c4af687ea
Compile on Mac again
2014-03-26 07:20:24 +01:00
Mr. Jenkins
2de83b95e3
[tx-robot] updated from transifex
2014-03-26 01:26:42 -04:00
Daniel Molkentin
c3d37efa6c
Fix OS X compilation
2014-03-25 23:33:46 +01:00
Daniel Molkentin
7c7fad78f7
Qt5: QtLocation is not needed
2014-03-25 22:52:28 +01:00
Daniel Molkentin
3ac1849963
Don't moc twice
2014-03-25 20:55:04 +01:00
Olivier Goffart
b4f992b944
Merge pull request #1446 from owncloud/remove-tooltip
...
remove superfluous tooltip from server address input field
2014-03-25 20:16:26 +01:00
Daniel Molkentin
1c8e5ef4ee
Fix typo
2014-03-25 20:05:06 +01:00
Daniel Molkentin
45ec489f71
Merge branch 'master' of github.com:shadone/mirall into shadone-master
...
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
src/CMakeLists.txt
src/mirall/owncloudgui.cpp
2014-03-25 19:56:45 +01:00
Daniel Molkentin
1b5e14fbc5
Update owncloudcmd docs
...
Fixes #1587
2014-03-25 19:04:05 +01:00
Daniel Molkentin
dddec8b250
-fPIC is implied on Windows
2014-03-25 19:04:05 +01:00
Daniel Molkentin
06082b585a
Add translations when using Qt5 as well
2014-03-25 19:04:05 +01:00
Daniel Molkentin
4bf0a2b188
NSIS: depend on Qt5-based installations
2014-03-25 19:04:05 +01:00
Daniel Molkentin
e2fe4972d9
Don't show ocsync version, it's part of mirall now
2014-03-25 19:04:05 +01:00
dragotin
efee9c689c
Merge pull request #1611 from Absolight/freebsd-port
...
Freebsd port - Thanks a lot!
2014-03-25 17:28:06 +01:00
Mathieu Arnold
84b4872938
And make it runnable on FreeBSD too.
...
Patch by: Tobias Berner
2014-03-25 17:23:11 +01:00
Mathieu Arnold
3f9bd1d72a
Fix build on FreeBSD.
...
We use libinotify, so the linux folderwatcher works.
Based on a patch by: Tobias Berner
2014-03-25 17:22:54 +01:00
Mr. Jenkins
1898e32b6a
[tx-robot] updated from transifex
2014-03-24 01:26:24 -04:00
Mr. Jenkins
9addd9bc27
[tx-robot] updated from transifex
2014-03-23 01:26:21 -04:00
Markus Goetz
91f416ffc7
Fix compile after changing Account::davPath()
2014-03-22 09:41:32 +01:00
Mr. Jenkins
28559ab657
[tx-robot] updated from transifex
2014-03-22 01:26:24 -04:00
Sandro Knauß
47274f1075
Merge remote-tracking branch 'respect-XDG_CONFIG_HOME' into 1.5
2014-03-21 17:20:15 +01:00
Markus Goetz
384eef4d6d
csync_owncloud: Add a debug message
2014-03-21 17:19:07 +01:00
Markus Goetz
ff95cbd04b
Account: Don't hardcode WebDAV path
2014-03-21 17:14:04 +01:00
Markus Goetz
cc5fabdab0
Engine: Introduce jobCompleted() signal
2014-03-21 17:13:02 +01:00
Markus Goetz
ff95e233bc
Token Credentials: Support actual tokens
2014-03-21 17:12:26 +01:00
Markus Goetz
f72e1cc837
Log: Don't override level for csync
...
The level shall be set from Folder or owncloudCmd only.
2014-03-21 13:52:35 +01:00
Olivier Goffart
8e6674e784
Merge branch '1.5'
...
Conflicts:
src/owncloudcmd/owncloudcmd.cpp
2014-03-21 10:06:45 +01:00
Olivier Goffart
8aace3284f
owncloudcmd: Fix an error during update phase would not terminate
...
the QApplication::quit() would be run before the exec() and would
be a noop, and then exec would just wait forever.
2014-03-21 10:03:11 +01:00
Olivier Goffart
922e004fc6
Make it an error instead of a crash when dav_connect fails.
...
Fixes #1591
2014-03-21 09:54:26 +01:00
Mr. Jenkins
2fc61479f7
[tx-robot] updated from transifex
2014-03-21 01:26:37 -04:00
Olivier Goffart
bb9d6b34c7
Remove FIXME and TODO
...
They are outdated
2014-03-20 16:42:43 +01:00
Olivier Goffart
07025c7432
Remove a FIXME
...
The commit message say that this line should be necessary to show
the information when the setting dialog is open, but this is working
now via the signals
2014-03-20 16:42:43 +01:00
Olivier Goffart
b65601aaa4
Remove FIXME
...
This has been refactored since the comment was added and is no longer a hack
2014-03-20 16:42:43 +01:00
Olivier Goffart
756e1c4a12
Prefer the use of _isDirectory over item._type == SyncFileItem::Directory
2014-03-20 16:42:42 +01:00
Olivier Goffart
c5f8a2555d
Rename _dir to _direction
...
(to avoid confusion with directory)
2014-03-20 16:42:42 +01:00
Olivier Goffart
a1ab9c84c7
Remove FIXME in syncengine
2014-03-20 16:42:42 +01:00
Klaas Freitag
e4966ec9d1
Added documentation about owncloudcmd.
2014-03-20 16:35:43 +01:00
Olivier Goffart
23f3a6b319
restore the last change menu
...
It was not yet implemented after the progress refactoring
2014-03-20 14:43:10 +01:00
Olivier Goffart
ebeb668a62
QNAM jobs: Make sure there is an etag is proper and not changed when one resume
...
Those tests are existing on the legacy jobs.
We check there is an etag so we make sure a proxy is not in between.
(We have seen user complaining because their proxy is replacing the
pages with one that says they need to enter their login and password)
Also it is important to check that the etag has not changed if we resume
(this may happen if the file is changed on the server between the update
phase and the propagate phase, and that we resume this file)
2014-03-20 13:31:42 +01:00
Klaas Freitag
d2e1923694
Fix compile warning.
2014-03-20 12:57:57 +01:00
Klaas Freitag
a5ede054d6
Fix statedb tests.
2014-03-20 12:35:16 +01:00
Klaas Freitag
ba2ff4ec46
Copy test database into the build tree.
2014-03-20 12:35:16 +01:00
Klaas Freitag
ca536f467a
Proper initialization to avoid build warnings.
2014-03-20 12:35:16 +01:00
Olivier Goffart
05d3273591
Detect the error that may happen when downloading a file
2014-03-20 11:35:30 +01:00
Klaas Freitag
39924d79cb
Add new test to test the csync database code.
2014-03-20 11:15:28 +01:00
Klaas Freitag
f7866aabde
Add C++ extern "C"
2014-03-20 11:15:28 +01:00
Klaas Freitag
eb59f98ec9
Fix quoting of query by text.
2014-03-20 11:15:28 +01:00
Klaas Freitag
c3cee3426e
Improved database access code for csync.
...
- Use precompiled database statements
- Store them in the csync context struct
- Hand whole context as parameter to db access functions
2014-03-20 11:15:28 +01:00
Klaas Freitag
f21dd05c2d
Streamline logging.
2014-03-20 11:15:28 +01:00
Klaas Freitag
6005b9c16e
Remove some superflous logging.
2014-03-20 11:15:28 +01:00
Mr. Jenkins
77bf37c6f6
[tx-robot] updated from transifex
2014-03-20 01:26:23 -04:00
Mr. Jenkins
8e133dc8ea
[tx-robot] updated from transifex
2014-03-19 01:26:24 -04:00
Daniel Molkentin
d10aec6055
NSIS: Install owncloudcmd on Windows
2014-03-18 23:56:50 +01:00
Klaas Freitag
9d1208baa4
Also allow http and https protocols.
2014-03-18 17:10:03 +01:00
Klaas Freitag
8e914deb99
Revert "Do not rely on the url scheme owncloud(s) any more."
...
This reverts commit 34dd3b207e .
It can be implemented simpler.
2014-03-18 16:57:01 +01:00
Klaas Freitag
34dd3b207e
Do not rely on the url scheme owncloud(s) any more.
...
If it is not owncloud or ownclouds, rely on the scheme
that was given by the user.
2014-03-18 14:16:50 +01:00
Klaas Freitag
68e8d659fb
Remove unused code.
2014-03-18 14:16:06 +01:00
Mr. Jenkins
f79765a536
[tx-robot] updated from transifex
2014-03-18 01:26:28 -04:00
Daniel Molkentin
eef57032f8
OCUpdater: Compare to the current version
...
Fixes #1548
2014-03-18 00:28:26 +01:00
Olivier Goffart
6377dca4b0
Add the file and line number of the debug in the debug view
2014-03-17 12:15:45 +01:00
Olivier Goffart
f05320c32c
Clean the debug a bit
2014-03-17 12:15:16 +01:00
Olivier Goffart
b0f8a24c20
CSyncThread was renamed, give proper names in Folder
...
take in account that the object live in the same thread
2014-03-17 11:47:23 +01:00
Olivier Goffart
c841b9c0c4
Remove unused libsync_HEADERS
...
This was unused and is redudent with owncloudsync_HEADERS
2014-03-17 11:36:53 +01:00
Olivier Goffart
7b482c0e96
Rename CSyncThread to SyncEngine
...
CSyncThread has not been a thread for a long time now
2014-03-17 11:34:51 +01:00
Olivier Goffart
bf5091d862
Merge branch '1.5'
2014-03-17 11:26:28 +01:00
Olivier Goffart
5c45ede4a5
Read the quota as double
...
The server is sending floating point number when the amount of storage
is set to a custom number (say 1.2GB)
This should fix #1374
2014-03-17 10:37:06 +01:00
Olivier Goffart
cabcdd890e
Only run the CheckQuota job if the account is connected
...
We use another job to check the connection.
And this may cause wrong password failure as we are still in the wizzard
Fixes #1567
2014-03-17 10:35:43 +01:00
Olivier Goffart
0a5e691ba3
Remove debug output that might cause a crash
...
The account may not be finilized when this is called while the
wizzard is still running on first connection
2014-03-17 10:22:14 +01:00
Olivier Goffart
ba300c2fc1
Fix memory leak: Don't use raw pointers
2014-03-17 10:04:42 +01:00
Mr. Jenkins
c74e7550af
[tx-robot] updated from transifex
2014-03-17 01:26:59 -04:00
Jenkins for ownCloud
0f385db314
[tx-robot] updated from transifex
2014-03-16 03:17:49 -04:00
Mr. Jenkins
2396831846
[tx-robot] updated from transifex
2014-03-16 02:19:35 -04:00
Mr. Jenkins
adb868a63b
[tx-robot] updated from transifex
2014-03-15 01:26:42 -04:00
Olivier Goffart
62e95e540b
Remove Progress::Kind
...
It's not really used, one need to look at the instruction of the items
being processed to see what happens
2014-03-14 18:43:23 +01:00
Olivier Goffart
d744b5e481
Fix the file count in the progress
...
And clear the ignored files between syncs
2014-03-14 18:29:23 +01:00
Olivier Goffart
f9b82d852c
Do not destroy the settings dialog when it is hidden.
...
That way the protocol widget stay filled.
And the state is kept
2014-03-14 17:39:20 +01:00
Olivier Goffart
33289bde29
Merge remote-tracking branch 'origin/1.5'
...
Conflicts:
CMakeLists.txt
VERSION.cmake
src/CMakeLists.txt
2014-03-14 17:27:50 +01:00
Olivier Goffart
9053662fe8
remove Progress::SyncProblem and the problem slots
...
They are merged into normal progress
2014-03-14 17:18:26 +01:00
Markus Goetz
07904e078a
CSyncThread: Emit a signal for each file before propagate
...
This can be used to display info before the sync is happening
2014-03-14 14:08:32 +01:00
Olivier Goffart
aacc278583
Refactor the progress
...
Consider that there might be several files processed at the same time
2014-03-14 13:32:32 +01:00
Klaas Freitag
57aa86910c
Add dependency on mingw32-sqlite, needed for make package
2014-03-13 14:02:48 +01:00
Mr. Jenkins
7071c895df
[tx-robot] updated from transifex
2014-03-13 01:26:36 -04:00
Daniel Molkentin
87f3755b1f
Deploy with Qt5
2014-03-13 00:52:01 +01:00
Daniel Molkentin
3f4bcbbd62
Find Qt5 version of QtKeychain when built with Qt5
2014-03-12 18:38:59 +01:00
Daniel Molkentin
955b932806
Qt5: QtLocation is not required
2014-03-12 18:23:45 +01:00
Daniel Molkentin
e7b6560c39
cmake: Remove debug
2014-03-12 18:20:45 +01:00
Daniel Molkentin
80e583c337
Error out if a Qt module is missing
...
Fixes #1487
2014-03-12 18:18:02 +01:00
Daniel Molkentin
bc3d298491
Find QtKeychain on multiarch Debian/Ubuntu
2014-03-12 18:17:43 +01:00
Daniel Molkentin
28cf9ce1a4
Properly abort if QtKeychain is not found
...
Fixes #1486
2014-03-12 17:55:30 +01:00
Markus Goetz
d5fd6309ed
CMake: Fix target_link_libraries parameters
2014-03-12 15:03:11 +01:00
Markus Goetz
a2467b5dea
CMake: Do options one directory above
...
This fixes linking when keychain was not desired.
2014-03-12 14:20:38 +01:00
Mr. Jenkins
f723d11d90
[tx-robot] updated from transifex
2014-03-12 01:25:59 -04:00
Denis Dzyubenko
aee4c06b8d
Renamed a member variable to have underscore prefix for consistency
2014-03-11 20:34:00 +01:00
Denis Dzyubenko
89a4833cae
Fixed a memory leak in FSEvents folderwatcher backend
2014-03-11 20:34:00 +01:00
Denis Dzyubenko
255d255217
Fixed ignored paths matching on OS X.
...
We now listen to changes to files and when an event is received we first match
the file name to the "ignored paths list" and only if the the file that was
changed didn't match figure out which directory needs to be synced.
2014-03-11 20:34:00 +01:00
Denis Dzyubenko
902de2dc93
Fixed a memory leak in FSEvents file system watcher
2014-03-11 20:34:00 +01:00
Denis Dzyubenko
f7c075099b
Removed bogus commented out line
2014-03-11 20:34:00 +01:00
Markus Goetz
0bbcee7354
CMake: Fix else
2014-03-11 17:56:29 +01:00
Markus Goetz
8a18cf811e
CMake: Fix warning
2014-03-11 17:33:45 +01:00
Markus Goetz
4e7e25c569
Improve libowncloudsync
...
* Introduce TokenCredentials
* Introduce static compiling
* Have compile flags for smaller compile
2014-03-11 17:05:44 +01:00
Markus Goetz
c24c97703a
CMake: Ignore failure when working as submodule
2014-03-11 17:05:44 +01:00
Mr. Jenkins
de84e8012e
[tx-robot] updated from transifex
2014-03-11 06:50:19 -04:00
Thomas Müller
f6ff20ca17
Switching to transifex.com
2014-03-11 11:46:50 +01:00
Thomas Müller
b7a85525cd
Switching to transifex.com
2014-03-11 11:45:16 +01:00
Klaas Freitag
bc41e6bc99
Allow proper translation for sync activity through GuiLog.
...
This fixes bug #1550
2014-03-11 10:55:20 +01:00
Klaas Freitag
aa4e90acfc
Put ocsync to a private library - WIP
2014-03-11 10:18:07 +01:00
Klaas Freitag
c8a8eb35fa
Disable the folder if it is going to be removed.
2014-03-10 12:22:06 +01:00
Daniel Molkentin
2656cc70d1
1.5.3 final
2014-03-10 10:15:50 +01:00
Jenkins for ownCloud
4018338725
[tx-robot] updated from transifex
2014-03-10 02:06:43 -04:00
Mr. Jenkins
e33c1b2b75
[tx-robot] updated from transifex
2014-03-10 01:25:57 -04:00
Mr. Jenkins
75d6c26e2e
[tx-robot] updated from transifex
2014-03-09 01:25:59 -05:00
Mr. Jenkins
7f2deaf722
[tx-robot] updated from transifex
2014-03-08 01:26:02 -05:00
Klaas Freitag
8bf2c54b56
Install include dirs app name aware.
2014-03-07 13:05:17 +01:00
Klaas Freitag
0c85100c93
Updated build instructions.
...
Conflicts:
doc/building.rst
2014-03-07 10:02:51 +01:00
Jenkins for ownCloud
d617c40ee7
[tx-robot] updated from transifex
2014-03-07 02:07:26 -05:00
Mr. Jenkins
8aebbefb28
[tx-robot] updated from transifex
2014-03-07 01:26:50 -05:00
Olivier Goffart
7cab77e879
Call the start method assyncroniously
...
That was my intention, which is why i did not do a direct call to start.
This should fix issue #1536
2014-03-06 21:01:08 +01:00
Olivier Goffart
feb49b2768
Saner defaults
2014-03-06 20:34:11 +01:00
Olivier Goffart
4e25595520
Better error classification
2014-03-06 20:33:17 +01:00
Olivier Goffart
4aaa256b11
Do not beleive that the credidential are wrong when the job is cancelled
...
Otherwise, aborting the sync will make the client beleive the credidentials
are wrong.
2014-03-06 20:31:48 +01:00
Markus Goetz
630f61142a
Proxy: Try to fix issue
...
See eb7074e9f0 for discussion
2014-03-06 17:48:18 +01:00
Olivier Goffart
ac393c6374
Do not sent more chunk and cancel the upload when the file change while uploading chunks
2014-03-06 16:04:32 +01:00
Olivier Goffart
114c8de814
Remove the check_csync_treewalk
...
because it runs csync_update which need to browse the owncloud directory
And there is no server
2014-03-06 15:30:36 +01:00
Olivier Goffart
5e012366ab
Keep string translatable
...
(In french, one may want to add a space before the colon.
Other languages may want to change the order)
Also use the two argument version of arg() to avoid issues if the first
string contains a '%1' sign
2014-03-06 15:01:34 +01:00
Olivier Goffart
ed1294d668
Avoid double delete
2014-03-06 14:28:58 +01:00
Olivier Goffart
7f07385fd7
Remove check_csync_treewalk_remote
...
Since we removed the vio abstraction, we cannot use the file system anymore
as a remote. and because we unfortunately can't use a real server,
just disable that test.
2014-03-06 14:24:53 +01:00
Olivier Goffart
ed2316a53f
Add missing line break
...
(silent warning)
2014-03-06 14:10:42 +01:00
Olivier Goffart
e5a8cd4521
Merge branch '1.5'
...
Conflicts:
VERSION.cmake
2014-03-06 14:10:08 +01:00
Olivier Goffart
3f3577d0b1
Merge pull request #1534 from owncloud/clarify-space-usage
...
Clarify space usage
2014-03-06 14:07:25 +01:00
Mr. Jenkins
950ffc6418
[tx-robot] updated from transifex
2014-03-06 01:26:40 -05:00
Klaas Freitag
f348499bbe
For Windows, add the __USE_MINGW_ANSI_STDIO=1 switch
2014-03-05 15:39:49 +01:00
Jan-Christoph Borchardt
5ce4763868
move percent indicator of space usage to correct location
2014-03-05 12:55:32 +01:00
Jan-Christoph Borchardt
bafc90cfd8
clarify which space is used, fix #1517
2014-03-05 12:54:47 +01:00
Klaas Freitag
7a3abac833
Bump version to 1.5.3rc1
2014-03-05 10:49:58 +01:00
Mr. Jenkins
b5349b66c6
[tx-robot] updated from transifex
2014-03-05 01:26:40 -05:00
Markus Goetz
eb7074e9f0
csync: Don't free proxy settings on commit
...
Should fix #1502 and #1524
and #1459 and #1521
2014-03-04 18:44:52 +01:00
Klaas Freitag
66b152ac69
Remove left over member variables.
2014-03-03 18:12:12 +01:00
Olivier Goffart
6df00ad08c
Only removes the password from the credidentials if it has been fetched before
...
Also only run the propfind job if the credidentials are readon, and fetch them
otherwise
2014-03-03 17:55:15 +01:00
Olivier Goffart
76b24ff00d
Revert "Do not wipe the credentials from config for reconnect."
...
This reverts commit 9eb3452a71 .
We need that or wrong password can never be changed
2014-03-03 17:21:20 +01:00
Olivier Goffart
60a1d50ec9
Keep the rentrency flag when asking the user for the password
2014-03-03 17:16:57 +01:00
Klaas Freitag
9eb3452a71
Do not wipe the credentials from config for reconnect.
...
This should fix bug #1491
2014-03-03 16:39:38 +01:00
Klaas Freitag
228de7eede
Make the CheckServerJob ignoring credential fails.
2014-03-03 16:37:29 +01:00
Klaas Freitag
2164f5d9b7
Remove a superflous MessageBox. User is asked for Password instead.
2014-03-03 16:36:59 +01:00
Klaas Freitag
4240010046
Add method clearCookieJar which wipes QNAMs cookies.
2014-03-03 16:36:30 +01:00
Klaas Freitag
1eb0875518
Use the mirall config file for all Keychain jobs.
...
Also set the job as parent to get proper deletion of the
settings object.
2014-03-03 16:35:57 +01:00
Klaas Freitag
b8e52304bd
Do proper initialization of _fetchJobInProgress.
...
That confused win32, since this flag was true very often.
2014-03-03 16:33:59 +01:00
Mr. Jenkins
8d2c43a9f0
[tx-robot] updated from transifex
2014-03-01 01:26:14 -05:00
Markus Goetz
6906b8d30c
csync: Remove outdated tests
2014-02-28 16:43:15 +01:00
Olivier Goffart
0658802048
Fix layout of the network tab
...
Fixes #1491
2014-02-28 13:17:04 +01:00
Olivier Goffart
eeb68919bf
Do not erase the username and password from the config if we never connected
...
If we never fetched the credidentials, the _user and _password will be empty,
we should therefore not try to save them because it would just erase them.
Version 1.5.2 always try to fetch the creds at startup. But now we only
do it if we detect an internet connection
2014-02-28 12:51:06 +01:00
Olivier Goffart
9a60732542
Do not erase the full account config if an old version of the client stored the password
2014-02-28 12:51:06 +01:00
Daniel Molkentin
f8d996258e
OS X: Make script more even robust
2014-02-28 11:16:25 +01:00
Daniel Molkentin
c8714be1d2
mac os sign script: quote all params
2014-02-28 10:23:02 +01:00
Markus Goetz
1c8f279214
csync: Remove more vio abstraction
2014-02-28 09:13:40 +01:00
Mr. Jenkins
0cc0eed8a8
[tx-robot] updated from transifex
2014-02-28 01:26:23 -05:00
Daniel Molkentin
36cd9d9ced
Shibboleth: Move browser window to the offset of the setup wizard
2014-02-27 17:07:59 +01:00
Daniel Molkentin
9c70ee68d2
Mask password lineedit
2014-02-27 17:07:59 +01:00
Olivier Goffart
e809a59049
Remove spurious error message.
...
Sometimes 'success' is false without apparent reason.
Just remove the message
2014-02-27 17:03:42 +01:00
Olivier Goffart
96c535d712
Make the parrallel uploaded also check for problem in Shared
2014-02-27 14:13:22 +01:00
Markus Goetz
5d58a8164c
csync: Remove get_etag
2014-02-27 14:03:17 +01:00
Markus Goetz
71cc74a0d6
csync: Remove csync_get_local_username
2014-02-27 13:55:34 +01:00
Markus Goetz
77d9256e03
csync: Remove more unneeded code
2014-02-27 13:52:30 +01:00
Markus Goetz
e7fb84a491
csync: Remove capabilities
2014-02-27 13:42:20 +01:00
Markus Goetz
a652fec5a0
csync: Remove more unused stuff
2014-02-27 13:33:22 +01:00
Markus Goetz
0d34a2bca5
csync: Remove unused vio stuff
2014-02-27 13:25:31 +01:00
Markus Goetz
a2e8bfd962
csync: Remove unix_extensions
2014-02-27 13:23:35 +01:00
Daniel Molkentin
33ae2eb19f
Try to handle auth requests by a Shibboleth IdP
2014-02-27 13:18:53 +01:00
Markus Goetz
eff2427a03
csync: Remove time_sync_required
2014-02-27 13:12:21 +01:00
Olivier Goffart
d4fa955950
Don't fetch credidentials from application.cpp
...
They will be fetched by the connection validator after doing
the status.php check
2014-02-27 13:06:29 +01:00
Olivier Goffart
869793592d
Merge branch '1.5'
...
Conflicts:
VERSION.cmake
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
2014-02-27 11:40:34 +01:00
Mr. Jenkins
417dbcc9ac
[tx-robot] updated from transifex
2014-02-27 01:26:23 -05:00
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
Jenkins for ownCloud
3cb6fc82dd
[tx-robot] updated from transifex
2014-02-25 02:07:10 -05:00
Mr. Jenkins
7d398b20f2
[tx-robot] updated from transifex
2014-02-25 01:26:24 -05: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
Mr. Jenkins
b03e49f492
[tx-robot] updated from transifex
2014-02-23 01:26:46 -05:00
Mr. Jenkins
3ed5f43e90
[tx-robot] updated from transifex
2014-02-22 01:26:39 -05: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
Markus Goetz
4630244b51
Windows: Special case csync_vio_local_stat
...
By not calling tstat _and_ GetFileInformationByHandle, but only
GetFileInformationByHandle, we can save some precious msec in the local
update phase.
2014-02-21 14:15:34 +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
Mr. Jenkins
7ec534067e
[tx-robot] updated from transifex
2014-02-21 01:26:44 -05: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
dragotin
c38c3ce6e2
Merge pull request #1450 from owncloud/remove-file-string
...
remove 'File' word from notification
2014-02-20 17:31:57 +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
Mr. Jenkins
aa02ce2481
[tx-robot] updated from transifex
2014-02-20 03:17:59 -05:00
Markus Goetz
6a55324261
OwncloudCmd: Struct needs to be zeroed
...
Else the --silent was always true on Windows where memory did not get
zeroed.
2014-02-19 17:50:15 +01:00
Markus Goetz
f1fa1f125d
Fix previous commit
2014-02-19 17:39:11 +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
Markus Goetz
141f005c34
Ignore conflict files all the time
...
The OwncloudCmd currently does not load the exclude files.
It is safer to just always ignore conflict files.
2014-02-19 17:16:10 +01:00
Mr. Jenkins
e32ca49c31
[tx-robot] updated from transifex
2014-02-19 09:42:10 -05:00
Olivier Goffart
f5e16540a1
Merge branch '1.5'
...
Conflicts:
src/mirall/owncloudpropagator.cpp
2014-02-19 15:38:03 +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
Markus Goetz
65ffe53c20
Register metatype at better place
2014-02-19 14:53:31 +01:00
Markus Goetz
06f2989ac8
Fix build on Qt4
...
Unfortunately I had to remove the 'static'
2014-02-19 13:29:00 +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
Markus Goetz
399b08ad40
OwncloudCmd: Register a meta type
2014-02-19 12:00:38 +01:00
Olivier Goffart
5b561e4462
Use AUTOMOC
...
This should also fix the compilation of owncloudcmd.cpp
Since we have a Q_OBJECT in a .cpp file and qt_wrap_cpp would not generate
the moc file.
2014-02-19 11:55:08 +01:00
Olivier Goffart
1be322579c
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/owncloudcmd/owncloudcmd.cpp
2014-02-19 11:19:56 +01:00
Markus Goetz
b7c7c9f3eb
Accountsettings: Fix warning
2014-02-19 10:59:57 +01:00
Markus Goetz
9237293cc0
OwncloudCmd: Fixup URL
...
Allow users to specify owncloud(s) or http(s)
2014-02-19 10:57:29 +01:00
Markus Goetz
63083a558b
OwncloudCmd: Print update phase duration values
2014-02-19 10:51:04 +01:00
Olivier Goffart
d4bd327fef
Merge branch 'parallel_upload'
...
Conflicts:
src/mirall/csyncthread.cpp
2014-02-19 10:24:34 +01:00
Olivier Goffart
2de288c5f3
Merge remote-tracking branch 'origin/1.5'
...
Conflicts:
VERSION.cmake
2014-02-19 10:21:23 +01:00
Markus Goetz
fcc0e89044
Update phase: Allow benchmarking / progress update
2014-02-18 21:41:20 +01:00
Jan-Christoph Borchardt
8267b9e590
remove 'File' word from notification
2014-02-18 18:42:49 +01:00
Jan-Christoph Borchardt
5a68e5f58d
remove superfluous tooltip from server address input field
2014-02-18 17:21:25 +01:00
Klaas Freitag
e4965ab06b
Mac FS watcher: ignore events from the same process
2014-02-18 16:28:25 +01:00
Olivier Goffart
496d900fee
Refactor the renameReplace in its own function
...
Share a bit more code between legacy and qnam download job
2014-02-18 14:05:52 +01:00
Olivier Goffart
58bda69f8b
PropagateRemoteRename is not a legacy job
...
move it back to propagatorjobs.cpp
2014-02-18 13:52:40 +01:00
Olivier Goffart
89b5ddec56
Fix the logs in the update phase
...
Since csync use a thread local variable for the logs, we need
to reset it when we enter the update thread
2014-02-18 13:48:13 +01:00
Olivier Goffart
f7419094f3
move the file system helpers in their own file
2014-02-18 12:54:40 +01:00
Olivier Goffart
432f377750
Use the legacy jobs when using bandwidth limiting
...
Or if a environement variable is set
2014-02-18 12:24:35 +01:00
Olivier Goffart
c32beb957d
Move the jobs around between files
...
Renamed owncloudpropagator_qnam to propagator_qnam
Move the jobs in propagatorjobs.cpp
Move the neon jobs that have a qnam equivalent into propagator_legacy.cpp and
rename the jobs accordingly
2014-02-18 12:21:05 +01:00
Jenkins for ownCloud
ee7c8d3c94
[tx-robot] updated from transifex
2014-02-18 06:14:46 -05:00
Mr. Jenkins
3a15502a62
[tx-robot] updated from transifex
2014-02-18 04:23:22 -05:00
Denis Dzyubenko
a51cb0982b
Added Mac-specific settings dialog that looks more native
2014-02-18 02:22:16 +01:00
hefee
1b03dc759b
fixing typo
...
GNU Public License-> GNU General Public License
2014-02-17 22:42:51 +01:00
Olivier Goffart
a39caa1cda
Make owncloudcmd work with the parallel upload/download
...
Also make it work when there syncing a remote subfolder
2014-02-17 17:31:03 +01:00
Olivier Goffart
a4ee8d6f6f
Remove unused function
2014-02-17 15:25:47 +01:00
Olivier Goffart
b35e38f80f
Parallel download
2014-02-17 13:48:56 +01:00
Jenkins for ownCloud
e34122ad54
[tx-robot] updated from transifex
2014-02-15 07:19:10 -05:00
Mr. Jenkins
03824baba4
[tx-robot] updated from transifex
2014-02-15 06:22:15 -05:00
Mr. Jenkins
34b86cb0db
[tx-robot] updated from transifex
2014-02-14 05:08:22 -05: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
Olivier Goffart
7b6269b4bf
Fix chunking
...
- Do not start them in parallel, start them in sequence instead, as they are quite
and there are already other jobs running in parallel normaly
- Do not load the fill into memory
- Support resuming
2014-02-13 14:02:05 +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
Jenkins for ownCloud
842c6c0e9e
[tx-robot] updated from transifex
2014-02-13 03:19:10 -05:00
Mr. Jenkins
a81d7823a9
[tx-robot] updated from transifex
2014-02-13 03:09:11 -05:00
Daniel Molkentin
aa26fc1e80
Bump version
2014-02-12 21:20:54 +01:00
Daniel Molkentin
beb9752f09
Merge remote-tracking branch 'origin/1.5'
2014-02-12 21:17:06 +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
a4442ebb40
Merge branch 'master' into parallel_upload
...
Conflicts:
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
2014-02-12 16:50:45 +01:00
Olivier Goffart
93f31fa9d7
Merge branch '1.5'
2014-02-12 16:44:24 +01:00
Olivier Goffart
f35b1f8a2b
Only starts 6 jobs in parallel
2014-02-12 16:33:55 +01:00
Olivier Goffart
6db8daabf7
Make abort work even when there are parallel uploads
2014-02-12 16:33:55 +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
Olivier Goffart
7ae40e13ec
Update the docs now that csync is included
2014-02-12 11:32:19 +01:00
Olivier Goffart
a5379ef2aa
make BUILD_WITH_QT4 off by default
...
Rationale:
When Qt5 is not found, the script will automatically use Qt4.
However, without this change, when Qt4 is not found, it will not
try to find Qt5 because BUILD_WITH_QT4 is ON by default forbidding the
use of Qt5 even if it is installed.
Also, other packages default to Qt5 including qtkeychain
See also issue #1418
2014-02-12 11:25:08 +01:00
Olivier Goffart
01c0a3c099
use Utility::sleep
2014-02-12 11:16:27 +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
Jenkins for ownCloud
9815ccb760
[tx-robot] updated from transifex
2014-02-12 02:14:56 -05:00
Mr. Jenkins
814f40c1c7
[tx-robot] updated from transifex
2014-02-12 02:05:48 -05:00
Markus Goetz
19c128ba12
Update building.rst
2014-02-11 11:45:00 +01:00
Thomas Müller
0322a44be5
Adding quotes - necessary for themes containing spaces in APPLICATION_NAME
2014-02-11 11:24:10 +01:00
Thomas Müller
60ca442728
Adding quotes - necessary for themes containing spaces in APPLICATION_NAME
2014-02-11 11:23:34 +01:00
Jenkins for ownCloud
3ffd7034c9
[tx-robot] updated from transifex
2014-02-11 02:07:14 -05:00
Mr. Jenkins
95469a9886
[tx-robot] updated from transifex
2014-02-11 01:26:45 -05:00
Markus Goetz
8c9a65635f
Propagator: Fix compilation
...
It is still protected on Qt4
2014-02-10 15:46:09 +01:00
Markus Goetz
104cf680a6
OS X: Workaround Qt5 QNAM bug
...
This made the sign out/sign in handling not work.
2014-02-10 15:42:46 +01:00
Klaas Freitag
b84253054a
Read configuration from /etc/ownCloud/t1.cfg
2014-02-10 15:08:40 +01:00
Markus Goetz
43345dc236
Icon: Make png2ico / windres failure non-fatal
2014-02-10 14:36:32 +01:00
Markus Goetz
79d14f0760
Propagator: Use cross platform sleep function
2014-02-10 14:34:48 +01:00
Klaas Freitag
6387777c18
Added chunking for the new uploading.
2014-02-10 13:00:22 +01:00
Mr. Jenkins
1e9c508c92
[tx-robot] updated from transifex
2014-02-10 06:17:19 -05:00
Jenkins for ownCloud
88e9014dad
[tx-robot] updated from transifex
2014-02-09 04:30:28 -05:00
Mr. Jenkins
313ad56d11
[tx-robot] updated from transifex
2014-02-09 04:20:08 -05:00
Jenkins for ownCloud
8152b7ebcf
[tx-robot] updated from transifex
2014-02-08 02:21:31 -05:00
Mr. Jenkins
e36d314218
[tx-robot] updated from transifex
2014-02-08 01:26:49 -05:00
Klaas Freitag
593d528b6a
Removed unused function.
2014-02-07 11:57:10 +01:00
Klaas Freitag
3649869650
Optimize restoring of the remote tree from database.
...
If the etag of a directory hasn't changed, the content for the csync
tree can be restored from database. The code doing that is now optimized
so that this does not take so long any more.
2014-02-07 11:53:58 +01:00
Klaas Freitag
41a4f1fc37
Only wait half a second before the next folder sync is started.
2014-02-07 11:53:58 +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
f67d2e6418
Start all the jobs in parallel
2014-02-06 12:11:45 +01:00
Olivier Goffart
9a6275a5e3
use QNAM for the PUT
...
Not yet supported:
- chunking
- if the file changes while uploading
- aborting
- owncloudcmd (because of the dependency to the account and the credidentials)
2014-02-06 11:50:16 +01:00
Olivier Goffart
2d9c0b6c31
Move CSyncThread in the main thread, and just do the neon jobs in a thread
...
It is important because then we can do assynchronious job that needs
QNAM in the main thread
2014-02-05 20:18:03 +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
hefee
4e0496f74d
respect XDG_CONFIG_HOME for getting user config dir.
...
Under linux the XDG Base Directory Specification define different
enviroment variables where to store what.
2013-12-31 02:10:44 +01: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
Tom Swartz
738f026c41
Merge pull request #1 from owncloud/master
...
Merge with owncloud:master
2013-11-25 12:29:22 -08: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
Tom Swartz
32e205f6ce
Add exclusion for OSX ._<filename> files
...
Exclude older OSX metadata ._<filename> files from sync, improving
cross-platform sync experience.
Tested-on: arcturus <20 Nov 2013>
2013-11-20 10:26:36 -05: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
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
8b224e2c0a
Don't warn about a finished sqlite3 query.
2013-09-03 11:47:19 +02:00
Klaas Freitag
ce554eb44a
Let csync exclude report the exclude reason.
2013-09-02 17:23:17 +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
bff9b3843f
0.83.0
2013-08-23 14:35:45 +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
Olivier Goffart
9527b9f4d2
Compile fix
...
That file was removed
2013-08-21 12:59:22 +02:00
Klaas Freitag
98efab83a1
Compile against ocsync based on csync 0.50
2013-08-20 13:26:03 +02: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
835813a86f
Fix the tests after merge
2013-08-18 20:13:27 +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
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
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
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
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
Olivier Goffart
38a5ff42e0
show the errno in the debug when renaming the db fails
2013-08-15 13:51:57 +02:00
Olivier Goffart
e4128cd5d8
progress with new propagator
2013-08-14 19:59:16 +02:00
Klaas Freitag
274da3ad0b
std: Fix uninitialized rc that polutes return value.
2013-08-14 19:03:36 +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
Daniel Molkentin
f054ca3f72
Disable Werror by default, set CSYNC_STRICT=ON to disable
2013-08-08 16:19:44 +02:00
Klaas Freitag
74b7d441c8
Bump version to 0.81.0
2013-08-08 16:00:20 +02:00
Klaas Freitag
1df602be26
Updated changelog for 0.81.0
2013-08-08 15:51:30 +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
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
Klaas Freitag
26c0bbd0eb
open test db in test correctly.
2013-08-07 15:39:30 +02:00
Klaas Freitag
0191fa43e0
Fix tests after statedb_open had moved.
2013-08-07 12:43:32 +02:00
Klaas Freitag
76ee4cb3ba
Add symlinks to the file tree with instruction IGNORE
2013-08-07 12:14:29 +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
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
Daniel Molkentin
045a3f17ba
_USE_GNU -> _GNU_SOURCE
2013-08-05 21:11:14 +02:00
Krzesimir Nowak
3979d002bd
Add an owncloud-specific redirect callback.
2013-08-05 19:21:38 +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
Daniel Molkentin
54b8f4d89b
transfer parameter is unused, mute
2013-08-02 11:35:03 +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
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
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
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
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
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
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
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
f06fead44f
fix test
2013-07-25 10:55:57 +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
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
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
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
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
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
Klaas Freitag
917cc7faab
Base overall progress data on both trees not just one
2013-07-22 12:55:24 +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
Klaas Freitag
45cdcb7502
Add a progress callback for overall and individual file up and download
...
progress.
2013-07-19 12:26:48 +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
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
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
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
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
Klaas Freitag
4489eb6cc0
Allow newly created database in test.
2013-07-09 17:31:06 +02:00
Klaas Freitag
b7d549e5a0
Check for zero size database file.
2013-07-09 17:30:40 +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
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
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
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
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
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
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
Daniel Molkentin
77653747ac
0.70.93
2013-06-20 19:45:18 +02:00
Olivier Goffart
0dbecb129e
Log the fact that csync was aborted
2013-06-19 18:41:30 +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
Andreas Schneider
3043b97815
cmake: Use pkg-config for libsmbclient.
2013-06-16 21:37:03 +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
92b9bf59a7
0.70.92
2013-06-12 11:10:34 +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
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
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
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
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
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
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
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
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