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
