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
