Roeland Jago Douma
|
71560ace71
|
Sharedialog: Show general info about a share
A start with some general share info in the share dialog.
|
2015-01-16 14:48:56 +01:00 |
|
Roeland Jago Douma
|
f6a83d5de2
|
ShareDialog: UI is different for files/dirs
Bunch of if statements to make sure that we do not display delete/create on
files.
|
2015-01-14 13:43:01 +01:00 |
|
Klaas Freitag
|
2c6f0950f6
|
Merge pull request #2674 from rullzer/filebrowser_integration
Add Sharing from the desktop, SocketAPI and Dialog.
|
2015-01-12 11:16:28 +01:00 |
|
Roeland Jago Douma
|
fa390299f9
|
Added Q_FUNC_INFO at several places
|
2015-01-11 13:41:15 +01:00 |
|
Klaas Freitag
|
786a877986
|
SocketAPI: Some cleanups plus added some consts
|
2015-01-09 11:44:01 +01:00 |
|
Daniel Molkentin
|
c86d8e5acf
|
Clean up BSD support patch
|
2015-01-08 22:40:47 +01:00 |
|
Olivier Goffart
|
8e3dbcb7c0
|
SocketAPi: use absoluteFilePath unstead of canonicalFilePath
Because canonicalFilePath is way too slow.
Issue #2671
|
2015-01-07 14:37:05 +01:00 |
|
Roeland Jago Douma
|
ee2e6e5dce
|
Also allow sharing if we only sync a part
|
2014-12-28 20:13:11 +01:00 |
|
Roeland Jago Douma
|
763d5f67cd
|
Some error checking on SHARE sockeAPI command
|
2014-12-28 20:13:10 +01:00 |
|
Roeland Jago Douma
|
b7d4c997a3
|
Fix rebase of branch
|
2014-12-28 20:13:10 +01:00 |
|
Alfie "Azelphur" Day
|
748440ced3
|
Initial push for filebrowser integration, not finished yet but it's a start :)
|
2014-12-28 20:13:10 +01:00 |
|
Christian Kamm
|
53d5de685c
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
|
2014-12-10 13:01:36 +01:00 |
|
Daniel Molkentin
|
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 |
|
Olivier Goffart
|
512492bf30
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/libsync/propagatedownload.cpp
|
2014-12-01 14:37:47 +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
|
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
|
c832226aa1
|
Merge remote-tracking branch 'origin/1.7' into master
|
2014-10-22 12:25:58 +02: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 |
|
Olivier Goffart
|
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 |
|
Klaas Freitag
|
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 |
|
Daniel Molkentin
|
cf12a56b4c
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/socketapi.cpp
|
2014-08-27 18:22:07 +02:00 |
|
Daniel Molkentin
|
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 |
|
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
|
3c2e43d883
|
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
|
2014-07-14 10:50:53 +02:00 |
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|