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
Markus Goetz