Phil Davis
b8ccbbc72a
GUI comment and message typos for master
2015-10-05 10:06:19 +05:45
Christian Kamm
641f56664e
FolderStatus: Show 'waiting for other folder' #3619
...
We monitor the scheduling queue and show messages like
"Waiting for 5 other folders...".
2015-09-04 10:42:21 +02:00
Olivier Goffart
d853b4f083
FolderDefinition: Escape the alias of a folder before writing to the config
...
Issue #3707
2015-09-02 16:07:34 +02:00
Christian Kamm
c2c924931b
Ignore hidden: Default to enabled #2086
...
It was 'false' for migrated folders and folders created by the OC
setup wizard.
2015-08-10 11:15:39 +02:00
Daniel Molkentin
72b2c52e15
Merge branch 'master' into linux_restart_on_new_version
...
Conflicts:
src/gui/application.cpp
src/gui/owncloudsetupwizard.cpp
2015-08-06 11:11:52 +02:00
Olivier Goffart
ec86d1a151
Wizards: allow adding a folder in a non-existing directory and create that folder
...
The owncloud wizard already created the directory, but the recent addition
of FolderMan::checkPathValidityForNewFolder stopped allowing unexisting directories.
So change FolderMan::checkPathValidityForNewFolder to allow non existing directory
and whange the FolderWizard to create the directory if it does not exist.
Issue #3492
2015-07-28 12:14:52 +02:00
Klaas Freitag
92513207eb
Application: On Linux, restart the app if a different version is on HD.
...
Together with the updater timer, check on linux, if the version on the
disk has still the same version string as the one that is running. If
not, restart if nothing is currently syncing.
2015-07-17 12:12:00 +02:00
Olivier Goffart
4dbe0693df
FolderMan::checkPathValidityForNewFolder
...
factorize the function to check the validity of a new folder out of
the folder wizard to the FolderMan.
There is even a test for it now.
That way we can also use it in the normal wizard
2015-07-13 14:35:19 +02:00
Christian Kamm
2fa00168cf
Sync scheduling: fix per-account scheduling. #3379
...
application.cpp still had a global folder syncing on/off switch
when an account connected or disconnected. That couldn't work with
multiaccount.
Instead FolderMan listens to accountStateChanged messages and
schedules or de-schedules the folders for accounts that change state.
2015-07-01 14:53:07 +02:00
Daniel Molkentin
66e8aaeabc
Use doxygen style everywhere
2015-06-29 18:56:09 +02:00
Daniel Molkentin
0735aa1fbd
Structure developer documentation
...
- rename target "doc-dev"
- group into modules
- move to doc/dev
2015-06-29 18:43:21 +02:00
Christian Kamm
10aaf18129
FolderMan: Make folderSyncStateChange() signal reliable. #3354
2015-06-26 10:09:03 +02:00
Klaas Freitag
214bc6b29b
Folder: Simplify Folder constructor: No need for AccountState.
...
Do not pass AccountState in constructor of Folder, set with a
new method called setAccountState after creation. Thus the
parameter does not need to be passed through all over.
2015-06-17 14:54:51 +02:00
Olivier Goffart
f8cbed34c2
Should fix coverity build
...
Issue #3346
2015-06-15 17:59:08 +02:00
Olivier Goffart
984434c728
AccountSettings: move the progress handling in FolderStatusModel
...
This is required to compile with Qt4 because signals were protected.
And the logic anyway belongs to the model
2015-06-02 19:45:23 +02:00
Olivier Goffart
299fa2dee6
FolderMan: fix a #warning in the migration path
2015-05-12 16:49:37 +02:00
Olivier Goffart
de9770f52a
FolderMan: fix some signal-slot broken connection
...
In many cases the alias was changed to a Folder pointer
2015-05-12 15:50:38 +02:00
Olivier Goffart
e02f1a222e
FolderMan: refactor some function to take a Folder* instead of an alias
...
I want to remove this dependency of alias in the code because we might get
rid of it entierly later
2015-04-28 17:49:05 +02:00
Olivier Goffart
e4694a6db8
Setup wizard: Do not remove all the folders of all theother acocunts when adding an account
...
Also we need the alias to be unique
2015-04-28 17:46:45 +02:00
Christian Kamm
27159104a9
Folders: Store inside account config.
2015-04-24 13:42:35 +02:00
Christian Kamm
e381143a8f
Ensure good sync state if in-progress folder is deleted. #2896
...
The slotFolderSyncFinished() didn't reliably trigger because
the folder was being deleted before the syncFinished signal could
fire.
2015-02-27 12:39:19 +01:00
Christian Kamm
145df8ec67
Pause between sync runs (particularly long ones) #2355
2015-01-22 08:55:52 +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
Olivier Goffart
7671ae8df7
Application: Initialize the folderman after we checked for existance
...
So we don't start the SocketAPI if we are going to quit.
We also do not log any message anymore before we install the hooks
Should solve #2666
2015-01-08 16:52:23 +01:00
Daniel Molkentin
c3468b7ed6
Merge remote-tracking branch 'origin/master' into accountstate
...
Conflicts:
src/gui/owncloudsetupwizard.cpp
src/gui/owncloudsetupwizard.h
src/libsync/propagatedownload.cpp
src/libsync/propagatedownload.h
2015-01-08 15:33:39 +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
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
38ebfec1fb
Use global Account/AccountState less.
...
* Use a shared pointer to Account everywhere to ensure
the instance stays alive long enough for a sync to terminate
* Folder is now tied to an AccountState
* SyncEngine and OwncloudPropagator tie to an Account and use that
for all jobs they run
Issue: Since the setup wizard currently always replaces the
account, it will always wipe all folder definitions, even when
the actual changes to the account were minor.
2014-12-18 15:39:51 +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
Christian Kamm
0fe7a69b39
FolderWatcher: Detect own changes. #2297
2014-11-20 13:16:29 +01:00
Daniel Molkentin
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01: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
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
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
