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
