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
