Christian Kamm
|
96ecdb866d
|
Time estimate: Refactor remaining time guess. #2328
|
2015-04-22 11:20:31 +02:00 |
|
Christian Kamm
|
7d68c628db
|
Time estimation: Use a consistent check for size dependence. #2328
|
2015-04-22 10:45:41 +02:00 |
|
Christian Kamm
|
9d8fc4aa4d
|
ProtocolWidget: Fix adding of seconds. #2535
|
2015-04-10 12:11:35 +02:00 |
|
Christian Kamm
|
ea985a85af
|
ProtocolWidget: Always add seconds to the DateTime locale. #2535
|
2015-03-27 11:25:30 +01:00 |
|
Daniel Molkentin
|
c7eb85ef78
|
Activity: Correctly restore column sizes
Fixes: #3005
|
2015-03-23 18:22:25 +01:00 |
|
Christian Kamm
|
3992fba168
|
Activity: Set a message for conflicts. #2792
Also show size when conflicting files are downloaded.
|
2015-03-12 10:00:45 +01:00 |
|
Daniel Molkentin
|
366f3f68b8
|
Activity view: Always add date
Fixes #2223
|
2015-02-20 10:12:19 +01:00 |
|
Christian Kamm
|
91fce3ea73
|
Make public API explicit about blacklist kind. #2301
'blacklist' can mean the selective sync blacklist or the error
blacklist. Names in public API are now explicit about which
blacklist is meant.
|
2015-01-16 10:17:19 +01:00 |
|
Olivier Goffart
|
414ac5433d
|
Merge branch '1.7'
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
|
2015-01-05 14:40:53 +01:00 |
|
Daniel Molkentin
|
2db17a57d2
|
Fix header names
|
2014-11-09 23:25:57 +01:00 |
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +01:00 |
|
Daniel Molkentin
|
f2eadacf09
|
Remove "Mirall" from class names
|
2014-11-09 22:30:29 +01:00 |
|
Daniel Molkentin
|
f25d175b5d
|
Merge remote-tracking branch 'origin/1.7'
|
2014-11-06 19:54:20 +01:00 |
|
Daniel Molkentin
|
dc1e73dcb7
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
|
2014-10-28 23:27:58 -04:00 |
|
Christian Kamm
|
7ae0338f5c
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/socketapi.h
src/libsync/syncengine.h
test/CMakeLists.txt
|
2014-10-22 10:41:55 +02:00 |
|
Daniel Molkentin
|
4fc044d368
|
Merge branch 'master' into move_lib_to_sep_dir
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
|
2014-08-12 21:08:44 +02:00 |
|
Daniel Molkentin
|
bb32831a60
|
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Conflicts:
src/gui/folderman.cpp
|
2014-07-17 11:31:45 +02:00 |
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|