b54c079766
Adjust issue urls
2014-11-09 23:38:07 +01:00
2db17a57d2
Fix header names
2014-11-09 23:25:57 +01:00
a992c5b8d3
Fix build
2014-11-09 23:10:18 +01:00
d57d3cf1f6
Drop Mirall from strings
2014-11-09 22:35:29 +01:00
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
f2eadacf09
Remove "Mirall" from class names
2014-11-09 22:30:29 +01:00
9ebc41ed6f
Remove "Mirall" from cmake project files
2014-11-09 22:30:05 +01:00
98a283b4ec
Fix clang warnings
2014-11-08 11:21:48 +01:00
d524f6b395
Fix compilation errors after merge
2014-11-08 11:11:05 +01:00
6b716683e2
Merge the long PUT Poll URL feature with the new sql backend
2014-11-08 11:09:50 +01:00
ba2c33af0b
Fix the il branch merge: Move the bandwidthmanager to libsync
2014-11-08 10:52:14 +01:00
de11f602d5
Merge remote-tracking branch 'origin/il'
...
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
2014-11-08 10:48:36 +01:00
260c8e0227
fix typo
2014-11-07 17:51:15 +01:00
f25d175b5d
Merge remote-tracking branch 'origin/1.7'
2014-11-06 19:54:20 +01:00
ef16c409ef
Merge pull request #2393 from svkurowski/issue-2215
...
Switch monochrome systray icon color depending on systray brightness
2014-10-29 14:54:33 +01:00
b9b9f3c136
Propagator: Schedule a resync immediately if file is modified during upload
2014-10-29 13:10:56 +01:00
4e20a02fe5
SyncJournalDB: Add filesize column to metadata.
...
* Alter table to include column.
* Make get/set in SyncJournalDB store and load it.
* Make csync recover the stat_t's size member from it.
2014-10-29 09:53:36 +01:00
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
e5b03634ae
correct spelling on user is empty error.
2014-10-25 11:01:58 -05:00
59f18583d1
Switch monochrome systray icon color depending on systray brightness.
...
https://github.com/owncloud/mirall/issues/2215
As of version 10.10 Yosemite, Mac OS X offers the user the option to use
a dark version of the dock and menu bar. The systray icon was black even
on the dark menu bar, thus rendering it nearly impossible to spot.
2014-10-24 21:52:41 +02:00
c832226aa1
Merge remote-tracking branch 'origin/1.7' into master
2014-10-22 12:25:58 +02:00
a20375372d
Blacklist: Don't ignore error files forever. #2247
...
Instead try them again regularly, but don't show the user any
error messages if the error persists.
2014-10-22 12:25:18 +02:00
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
50e718b1e7
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
bcff1ced5e
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folderman.cpp
src/gui/wizard/owncloudadvancedsetuppage.cpp
src/libsync/account.cpp
2014-08-29 20:40:33 +02:00
89aec52503
Add checkbox to general settings to disable the crash reporter
2014-08-28 16:19:17 +02:00
cf12a56b4c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/socketapi.cpp
2014-08-27 18:22:07 +02:00
17e16f5e79
Add "Crash" entry to systray if started with --debug
2014-08-26 15:46:24 +02:00
b176ff6626
Don't use CMAKE_INSTALL_PREFIX for RPATH
2014-08-26 15:19:46 +02:00
e5471d8318
Build after merge
2014-08-26 14:33:21 +02:00
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
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
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
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
Daniel Molkentin