Daniel Molkentin
31e584e3e3
Fix win32 build
2015-01-12 13:53:40 +01:00
Klaas Freitag
ad09f6491b
ShareDialog: Fix const ref for arguments.
2015-01-12 11:35:11 +01:00
Klaas Freitag
efbe033bfb
Sharedialog: Fix merge problem (use AccountPtr) plus cleanup.
2015-01-12 11:30:02 +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
b680788f48
Sharedialog: Allow setting and retrieving of experiation data for public urls
2015-01-12 10:14:45 +01:00
Daniel Molkentin
488f993f45
Fix compilation on Windows
2015-01-12 09:40:11 +01:00
Roeland Jago Douma
811cbc27c0
Sharedialog: Construct correct public url for existing shares
2015-01-11 14:16:49 +01:00
Roeland Jago Douma
25e90ff658
Sharedialog: use Q_FOREACH
2015-01-11 13:56:23 +01:00
Roeland Jago Douma
fa390299f9
Added Q_FUNC_INFO at several places
2015-01-11 13:41:15 +01:00
Roeland Jago Douma
accb036507
Removed some unused outcommented code
2015-01-11 13:36:45 +01:00
Roeland Jago Douma
44690ff596
ShareDialog: fixed "" -> QString
2015-01-11 13:27:32 +01:00
Roeland Jago Douma
e20f819c1d
Sharedialog: QString("") -> QString()
2015-01-11 13:24:40 +01:00
Roeland Jago Douma
1d011a2f9a
ShareDialog: make visible text translatable
2015-01-11 13:22:48 +01:00
Roeland Jago Douma
bc84a78b0f
ShareDialog: Made slot arguments const
2015-01-11 11:19:12 +01:00
Daniel Molkentin
6034bd0946
Wizard: Never attempt to hide server page
...
The wizard code used to call hide() on hardcoded wizards.
This means that for a brief moment, the first page with the URL
(disabled line edit) may be seen. I think that's completely
legitimate from a feedback perspective. The alternative would
be to unhide on error, but this is rather unelegant...
2015-01-11 07:38:09 +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
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
Christoph Dann
309ff2997c
potential fix for #1865
...
Do not show ignored files in context menu
2015-01-08 11:42:14 +01:00
Daniel Molkentin
8e8ca97eec
Fix build
2015-01-08 09:42:26 +01:00
Daniel Molkentin
51d7559a2c
Simplify checkDowngradeAdvised logic
...
Also, show() and back() belong into slotConnectionCheck only
2015-01-07 18:22:44 +01:00
Daniel Molkentin
5c4f706fe4
Setup Wizard: Make sure to reset auth type when URL changes
2015-01-07 18:01:18 +01:00
Daniel Molkentin
7ac32a19b5
Do not show the HTTP-reconnect popup when its not warranted
...
Fixes usability issues in the workaround of #2607
2015-01-07 18:01:11 +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
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
Roeland Jago Douma
ee2e6e5dce
Also allow sharing if we only sync a part
2014-12-28 20:13:11 +01:00
Roeland Jago Douma
facb6b2e81
Check box public link now works multiple times
...
When deleting a share (public link) and recreating it we need to store the new
id.
2014-12-28 20:13:11 +01:00
Roeland Jago Douma
ec3c83c0c9
Minor sharedialog.ui fixes
2014-12-28 20:13:10 +01:00
Roeland Jago Douma
0ad4fb7273
Create valid poststring
2014-12-28 20:13:10 +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
bd7f45e398
Everything works now, albeit without error checking.
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
a9da5ebff6
Wizard: Sometimes preserve folders when folder config is skipped.
...
* When folder config is used, other folder definitions are always
removed.
* Fix a bug with the wizard becoming stuck when 'skip folder config'
is used.
2014-12-18 15:39:51 +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
6c7acd585e
Account: Split into libsync/Account and gui/AccountState.
...
This allows all the account state information to live in gui
while the sync-relevant data stays in libsync.
I also moved quotainfo to gui since it depends on the account state.
2014-12-18 15:39:51 +01:00
Christian Kamm
a006c6962c
Move account state related logic into Account.
...
The account state is now managed mostly by the Account itself
instead of through Application. The gui can still control whether
an account is signed out or not.
2014-12-17 12:01:10 +01:00
Olivier Goffart
414838cae8
Settings dialog: remove the code that was updating the account icon
...
I just wanted to fix the warning:
QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108
It turns out we don't need anymore the signal or any of the code that
was updating the account icon in the settings dialog since it we now have a fixed icon
2014-12-16 11:36:52 +01:00
Olivier Goffart
3ee14164db
network jobs: Refactor the redirect handling in AbdtractNetworkJob
...
Move the redirect handling from CheckServerJob to AbstractNetworkJob, so we can
later use it in any job (in preparation for task #2614 )
2014-12-16 11:27:02 +01:00
Christian Kamm
1a3041690f
ConValidator: Simplify and cleanup.
...
* This way using it with multiple accounts will be easier.
* Timeouts on the authed requests are handled.
2014-12-11 14:48:01 +01:00
Christian Kamm
d8c59fcb73
Use connection validator to ping the server. #2485
...
* Stop the quota job from having an effect on account status
as it can sometimes take a long time to reply. See #2485 and
owncloud/core#12744 .
* Instead of indirectly using the quota job, use the connection
validator to regularly ping the server with a basic PROPFIND for
'getlastmodified' on /.
This request was usually fast for users even when the quota PROPFIND
was slow.
2014-12-10 13:40:11 +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
d034f10af3
Fix compilation
2014-12-08 19:25:57 +01:00
Daniel Molkentin
a2b817f0c0
mirall.qrc -> client.qrc
2014-12-08 18:00:29 +01:00
Daniel Molkentin
d5f2c36abd
Mirall -> (Desktop) Client
2014-12-08 17:54:32 +01:00
Daniel Molkentin
b7323dc403
Merge branch 'master' into rename_client
2014-12-02 14:33:28 +01:00
Daniel Molkentin
c6d74d6c12
Fix typo
2014-12-02 14:33:17 +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
Daniel Molkentin
3f5887cc03
Merge pull request #2565 from owncloud/accountsettings_itemsontop
...
Refactor generic settings dialog
2014-12-01 15:01:45 +01:00