a2b817f0c0
mirall.qrc -> client.qrc
2014-12-08 18:00:29 +01:00
d5f2c36abd
Mirall -> (Desktop) Client
2014-12-08 17:54:32 +01:00
b7323dc403
Merge branch 'master' into rename_client
2014-12-02 14:33:28 +01:00
c6d74d6c12
Fix typo
2014-12-02 14:33:17 +01:00
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
3f5887cc03
Merge pull request #2565 from owncloud/accountsettings_itemsontop
...
Refactor generic settings dialog
2014-12-01 15:01:45 +01:00
512492bf30
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/propagatedownload.cpp
2014-12-01 14:37:47 +01:00
afee1ee1c0
Make all ptr-based members either const or check for their existance
2014-12-01 13:08:49 +01:00
714599aeaa
Refactor generic settings dialog
...
- move items on top like on Mac OS (right is free for accounts now)
- The account icon no longer reflects the current status (in prep for multi-account)
2014-12-01 11:37:06 +01:00
0fe7a69b39
FolderWatcher: Detect own changes. #2297
2014-11-20 13:16:29 +01:00
6d09f1b6c0
Folder watcher now reports changing paths instead of dirs.
2014-11-20 12:51:16 +01:00
1ada20ac7b
Linux folderwatcher: Get full path of changed file. #2297
2014-11-20 12:42:59 +01:00
d04eedeb8d
OSX: Trust the file watcher. #2297
...
* Use a bigger default force sync interval (2h)
* Allow the file watcher to schedule a sync while a sync for
the same file is running.
2014-11-20 12:42:59 +01:00
f275002ebe
Merge branch '1.7'
2014-11-20 12:41:06 +01:00
4d7b8bdb25
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
OWNCLOUD.cmake
test/CMakeLists.txt
test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
281c0e1553
Merge branch 'master' into rename_client
...
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
2014-11-12 00:07:59 +01:00
cdac8d56d5
Merge remote-tracking branch 'origin/master' into crashreporter
...
Conflicts:
src/libsync/utility.cpp
src/libsync/utility.h
2014-11-11 23:53:38 +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
269b59c2ba
More CMake adjustments
2014-11-09 22:58:24 +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
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
f25d175b5d
Merge remote-tracking branch 'origin/1.7'
2014-11-06 19:54:20 +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
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
ece11dc3d8
Updater: Add "didn't check for updates" message. #2175
...
Don't show "Checking server..." when we are not.
2014-09-17 11:41:04 +02:00
f3cc614427
Fix apple build.
...
The apple build was broken because the elseif in the CMakeLists is never triggered.
Some code was not properly adapted for the new qtmacgoodies.
Some paths were not adapted to new split.
2014-09-12 14:24:26 +02:00
1aca22b5f8
Make crash reporter executable branded
2014-08-30 10:46:09 +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
38ff7d87c8
Hide crashreporter config option if not build with crashreporter enabled
2014-08-29 17:07:31 +02:00
6abaad1ae8
Show crash reporter if trying to read the crash-reporter-enabled config crashes
2014-08-28 16:23:14 +02:00
89aec52503
Add checkbox to general settings to disable the crash reporter
2014-08-28 16:19:17 +02:00
439bf7641e
Use include path for libcrashreporter-qt instead of lengthy relative include
2014-08-28 11:11:42 +02:00
cf12a56b4c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/socketapi.cpp
2014-08-27 18:22:07 +02:00
2b4849a2fa
Add crash reporter using libcrashreporter-qt
2014-08-26 18:15:13 +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
3c2e43d883
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
2014-07-14 10:50:53 +02:00
5041880854
Try to handle BUILD_LIBRARIES_ONLY correctly
...
Also, try to fix OS X build
2014-07-11 12:36:01 +02:00
2c904afd04
OS X explicitly requires the neon include path to be set
2014-07-11 12:11:04 +02:00
2cc13fb74a
Fix includes in mac specific headers
2014-07-11 11:38:01 +02:00
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
Daniel Molkentin