Olivier Goffart
ab52c8bcd7
Merge #3611
2015-08-14 13:32:48 +02:00
Markus Goetz
1ad80878b2
Account: Additional on top fix for #3617
2015-08-14 12:37:19 +02:00
Olivier Goffart
81c19232a5
Account Settings: Remove the ability to select
2015-08-14 12:12:16 +02:00
Olivier Goffart
dcfa6b97e3
Account Settings: add more margin on the overall text
...
Attempt to fix https://github.com/owncloud/client/issues/3584#issuecomment-131009787
2015-08-14 12:01:28 +02:00
Olivier Goffart
593016718d
Account Settings: Align the progressbar with the icon #3567
2015-08-14 11:52:09 +02:00
Olivier Goffart
2dbe822972
Account Settings: remove the storage use label #3567
2015-08-14 11:52:09 +02:00
Markus Goetz
38b8508f15
Account: Save accepted SSL certs immediatly #3617
2015-08-14 11:31:01 +02:00
Klaas Freitag
76ce5adbf0
Abort the request and reset the QNAM if user does not ACK a new cert.
...
This is supposed to fix bug #3283
(cherry picked from commit 75b38d1a2f
)
2015-08-14 10:31:20 +02:00
Markus Goetz
2a14c121db
Account settings: Make version selectable/copyable #3600
2015-08-13 17:27:18 +02:00
Markus Goetz
01855302a0
Shibboleth: Use sslErrors() handler of rest of client #3593
2015-08-13 17:09:39 +02:00
Olivier Goffart
5c9b865cec
Setup wizard: remove some spacing in the result page #3588
2015-08-13 15:22:43 +02:00
Olivier Goffart
5f832b5b39
Account Settings: Reorder the options in the context menu #3584
2015-08-13 15:07:51 +02:00
Olivier Goffart
b75b5a5a0c
Account Settings: remove the down arrow in the 'more' button #3584
...
It's ugly on mac
2015-08-13 14:11:13 +02:00
Olivier Goffart
f32c8d0570
Account settings: add a button to show the context menu #3584
2015-08-13 12:34:22 +02:00
Olivier Goffart
b49e9e8f30
Account Settings: rename and re-order the options in the context menu
2015-08-13 12:32:59 +02:00
Olivier Goffart
bf20a0d2f8
Account Settings: remove unused signals
2015-08-13 11:55:51 +02:00
Olivier Goffart
6fcb48a0c7
Account settings: Double click no longer open in the file browser #3585
...
Add a separate option in the context menu for it
2015-08-13 11:53:00 +02:00
Olivier Goffart
5685aa7ff0
Setup Wizard: add more space in the result page: #3588
2015-08-13 11:27:41 +02:00
Olivier Goffart
3238d61ef6
SocketApi: fix small leak (found with valgrind) #3369
2015-08-13 10:42:54 +02:00
Olivier Goffart
299faae830
Fix compiler warning
2015-08-13 10:26:35 +02:00
Olivier Goffart
6b003f96f5
Theme: add a method to hide the 'add account' button #3517
2015-08-13 09:39:44 +02:00
Kirill Bychkov
1fe82ac70c
define OpenBSD
2015-08-13 09:54:53 +03:00
Kirill Bychkov
7786f1f9a9
Fix linking with libinotify on OpenBSD.
2015-08-13 09:44:55 +03:00
Markus Goetz
ace847d177
ShareDialog: Improve UX #3526
...
Don't spin progress while user needs to set a password.
Have password input as Call To Action.
2015-08-12 18:22:51 +02:00
Markus Goetz
dc44ebf41b
UI: Fix up 6152ce4187
#3595
2015-08-12 09:08:30 +02:00
Daniel Molkentin
aa6c09d942
Rename "Sync all files with" to "Sync selected files with"
...
as per discussion with Jan
2015-08-12 08:31:54 +02:00
Daniel Molkentin
a9acb185a0
SettingsDialog: Fixup default action setting
...
This broke silently when switching from pure actions to widgets
2015-08-11 21:45:27 +02:00
Daniel Molkentin
3267c15aff
SettingsDialog: Use separator instead of custom spacer
...
... and make sure to hide if when there are no accounts
2015-08-11 21:44:35 +02:00
Daniel Molkentin
f25df3311c
Remove debug output
2015-08-11 21:42:30 +02:00
Daniel Molkentin
9c63740d26
Fix compilation on Windows
2015-08-11 18:15:46 +02:00
Daniel Molkentin
379beb268f
More improvements for high contrast themes
...
- Invert icon color depending on the darkness of the theme
- Ensure icons and colors are changed when theme or colors
get changed during application run
Final patch for #3582
2015-08-11 17:56:11 +02:00
Christian Kamm
5bd631e8e7
Rename jobCompleted -> itemCompleted.
...
Because that's what's going on. A job can 'complete an item' or 'finish'.
Note that several jobs could complete the same item: a new directory
will complete on the PropagateRemoteMkdir and the PropagateDirectory
jobs.
2015-08-11 15:19:09 +02:00
Christian Kamm
fe42c1a818
Activity: Skip PropagateDirectory jobs #3580
...
Previously, PropagateDirectory jobs didn't emit the completed() signal.
Now that they do, we need to make sure to not add extra lines to the
protocol widget for them.
To accomplish that, the jobCompleted() signal now also contains the job
that completed the item.
2015-08-11 15:19:09 +02:00
hefee
a87602af3f
use SHAREDIR for i18n
...
SHAREDIR is used in src/gui/application.cpp and should also use that in
CMakeLists.txt.
2015-08-11 15:14:59 +02:00
Markus Goetz
6152ce4187
UI: Avoid showing folder alias #783 #3576
2015-08-11 15:12:43 +02:00
Markus Goetz
3b59960fb3
Fix Qt4 build (SSL sessionTicket())
2015-08-11 13:53:21 +02:00
Markus Goetz
bd71fdc388
SslButton: Fix harder #3534 #3536
2015-08-11 12:18:25 +02:00
Markus Goetz
6110a99afc
SyncEngine: Fix previous cherry-pick
2015-08-11 11:35:12 +02:00
Christian Kamm
0dd20ccf3b
Remove deleted accounts from tool bar #3583
2015-08-11 11:33:04 +02:00
Daniel Molkentin
9698324c4e
More color scheme adjustments
2015-08-11 11:32:00 +02:00
Olivier Goffart
9dcce01e54
csync: ignore files/folder for which stat fails
...
instead of pretending it suicceed and not recursing in it.
This fixes a bug in which a folder with a too long name would be properly
created, then removed on the server in the next sync.
(cherry picked from commit 4bbf7669091cde7ec726b1708d8c54427b68f016)
Conflicts:
csync/src/csync.h
csync/src/csync_exclude.h
csync/src/csync_update.c
2015-08-11 11:17:20 +02:00
Christian Kamm
e0cf5c3920
Progress: Robust against bad 'completed' values #3579
...
Increasing the 'total' for bogus values of 'completed' is a bad idea.
2015-08-11 10:44:27 +02:00
Christian Kamm
3ab49143e1
Progress: Guard against decreasing progress #3579
...
Ensure that progress going backwards won't lead to outrageous
transfer speeds.
2015-08-11 10:38:04 +02:00
Daniel Molkentin
fad9a3056c
Settings dialog: Try to improve adherance to high contrast schemes
...
Adresses #3582
2015-08-11 07:42:52 +02:00
Christian Kamm
0176ffd25d
FolderWatcher win: Skip unneeded notifications #3353
2015-08-10 14:59:05 +02:00
Daniel Molkentin
385c3882a7
Fix regression in PassiveUpdateNotifier
...
When overriding backgroundCheckForUpdates(), also call the original
implementation.
2015-08-10 14:26:57 +02:00
Christian Kamm
85f5424a13
SocketAPI: Show excluded hidden files as ignored #2086
2015-08-10 13:41:19 +02:00
Christian Kamm
3c82f66219
Windows: Limit tray tooltip length #3412
2015-08-10 13:23:31 +02:00
Lukas Reschke
9bbf9b86b7
Use HTTPS links
...
No need to have an additional redirect
2015-08-10 12:30:33 +02:00
Lukas Reschke
f74053f8ed
Use HTTPS links
...
No need to have an additional redirect
2015-08-10 12:15:45 +02:00
Christian Kamm
a6d70c9c63
IgnoreEditor: Rename confusing checkbox
...
The label was the negation of its name.
2015-08-10 11:15:39 +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
6b4a9d9cd9
Settings dialog: improve layout a bit
2015-08-10 10:51:05 +02:00
Jocelyn Turcotte
55e55b0806
Windows: Fix the progress bar with high contrast themes #2654
...
Setting the palette seems to interfere with Qt's Windows Vista theme
and this isn't set on the QStyleOptionProgressBarV2 by QProgressBar.
2015-08-10 09:55:31 +02:00
Olivier Goffart
b967359a74
Account setting: properly disable the 'add account' button #3571
...
When upgrading from 1.8 and syncing the whole account, then the
remote folder is empty
2015-08-07 14:32:51 +02:00
Olivier Goffart
ae7b2509a5
Selective sync: When applying selective sync, put new folder that were just checked in the white list
...
Issue #3560
Otherwise the just checked folder will be chacked again for their size.
We do not want that.
2015-08-07 13:37:52 +02:00
Olivier Goffart
8b52a121bb
AccountSettings: Show the wizard to add an account when the last account was deleted #3564
2015-08-07 13:15:02 +02:00
Daniel Molkentin
b906c70a86
ownSql: Do not use sqlite3 method not present in older version
...
Was only used for debug output anyway and broke RHEL/CentOS6
2015-08-07 11:14:14 +02:00
Daniel Molkentin
ecf545a0b9
Updater: update Linux updater code to work with changes in master
...
master moved much of the responsibility of the updating process
to the updater class.
This also fixes a build failure
2015-08-06 19:34:23 +02:00
Markus Goetz
7c52e925b9
Propagator: Use fetchAndAddAcquire to get parallelism
2015-08-06 18:13:48 +02:00
Markus Goetz
b5edc635a1
Windows: Don't use UTF-8 arrows #3095
2015-08-06 18:08:05 +02:00
Daniel Molkentin
6a20ea5e73
Merge pull request #3472 from owncloud/linux_restart_on_new_version
...
On Linux restart if new version is found on disk
2015-08-06 17:47:10 +02:00
Markus Goetz
2d49f4c844
AbstractNetworkJob: Make sure to print URL on timeout
2015-08-06 17:33:33 +02:00
Markus Goetz
049d49eba8
OwnSql: Show potential error on close #3421
2015-08-06 15:47:38 +02:00
Markus Goetz
593aa003d6
Propagator: Re-order statement of previous commit
...
The user should be allowed to override.
For issue #3382
Will also help for #3095
2015-08-06 15:28:50 +02:00
Olivier Goffart
29d7903c22
Propagator: do not use parallelism when we have bandwidth limit
...
When user wants to limit the bandwidth, he does not care about speed
anymore. And parallelism on slow network might cause problems.
For issue #3382
Will also help for #3095
(cherry picked from commit b20f29f22797367c7aa92bd74389c99b10c852a4)
2015-08-06 15:27:18 +02:00
Markus Goetz
1feb74981e
Progress: Show real speed and all filenames #3403 #3095
2015-08-06 15:25:16 +02:00
Olivier Goffart
2cf29352b8
SyncJournalDB: clear all the prepared query when closing the database
...
Not closing it may keep the file open (issue #3421 )
2015-08-06 14:28:02 +02:00
Olivier Goffart
7202bbcf5d
Fix Qt4 build
2015-08-06 13:58:03 +02:00
Markus Goetz
aee20e0ed3
1.8 Migration: Fix password overwrite #3539
2015-08-06 12:49:18 +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
Markus Goetz
7985c0d7f1
Merge pull request #3531 from jturcotte/master
...
Remove need for UPDATE_VIEW to refetch the status #2340
2015-08-06 11:03:28 +02:00
Jocelyn Turcotte
a9858d4ed2
Revert "Use dynamic library loading for detecting the correct path for links"
2015-08-06 10:41:33 +02:00
Olivier Goffart
8ec4d0f19b
Utility: use SI units for the sizes in bytes
2015-08-05 16:22:09 +02:00
Olivier Goffart
dc299b0bf9
Account settings: Fix a label
...
The feature is for all folder, not only shared folder
2015-08-05 16:12:58 +02:00
Olivier Goffart
952c249039
Selective sync: on the first sync, do not ask confirmation for every folders
...
Since we already confirmed a previous selective sync dialog
2015-08-05 16:11:59 +02:00
Olivier Goffart
0e3262b181
Theme: add a settings for configuring the default of newBigFolderSizeLimit
2015-08-05 15:33:51 +02:00
Olivier Goffart
ba896eabfb
FolderStatusModel: do not expand the unconfimred folder themselfs
2015-08-05 15:33:51 +02:00
Olivier Goffart
646890abb3
SettingsDialog: use the same short display name on Win/Linux than on Mac
...
Issue #3516
2015-08-05 15:33:51 +02:00
Markus Goetz
9a9cefbcc5
SslButton: Improve reliability and usefulness #3534 #3536
2015-08-05 13:04:30 +02:00
Olivier Goffart
38da1b7de1
AccountSettings: automatically refresh and expands the undecided folders #3541
2015-08-05 12:51:49 +02:00
Olivier Goffart
b470d0f7b8
Folderman: make the backup number starts with 2: #3512
2015-08-05 10:46:33 +02:00
Markus Goetz
f6cd2c79d5
CSync: Proper error for invalid filenames #2777 #3128 #2240
2015-08-04 22:13:38 +02:00
Phil Davis
8216727553
Notify of big folders that are greater than or equal to the limit
...
This should allow for the case when a user has set the limit to 0 and a new empty folder appears on the server. The folder will have size 0 (no files in it). Doing the >= test here will mean that the user will be prompted about the new folder, which I think is the behaviour they would expect.
The side-effect of this change is that if the user has a limit of, for example, 10,000,000 and a new folder comes along with exactly 10,000,000 of content then they will now be prompted about it. Before the change such a new folder would have been auto-synced without prompting the user. I do not think this is a big deal - I cannot believe that users will be counting exact bytes for this limit, they are just setting a rough number of MB at the UI.
Should fix https://github.com/owncloud/client/issues/3542
2015-08-04 19:28:23 +05:45
Markus Goetz
514372db6b
Exclude list: Add entries from other sync programs #2814
2015-08-04 09:40:53 +02:00
Aputsiaĸ Niels Janussen
cd19ee5020
Minor typo: Ingored -> Ignored
...
Issue raised by user 'kant' in Transifex on the 1st of August.
2015-08-03 17:35:58 +02:00
Markus Goetz
7da4a081d3
Startup: Don't notify other instance when session restored #3070
2015-08-03 17:32:41 +02:00
Jocelyn Turcotte
48624fe033
SocketApi: Force fowarding an OK STATUS for all parent directories
...
This fixes a few issues with the new FinderSync integration on OSX which
can't easily clear its status cache when receiving an UPDATE_VIEW message
except by unregistering the folder, but which causes flickering.
This fix should also make the regeneration of the cache unnecessary on other
platforms through possibly expensive RETRIEVE_FILE_STATUS commands.
2015-07-31 21:59:58 +02:00
Jocelyn Turcotte
78b63c34cb
Do not add all remote directories to the SyncItemVector
...
To allow forwarding all OK states of sync jobs to the socket API
we need to make sure that the vector doesn't contain unneeded items.
This initially was intended to force updating the metadata for parent
folders, but since then the should_update_metadata flag check was
added both here and in PropagateDirectory::finalize where the metadata
is actually updated for parent folders. We can safely remove the inclusion
of all remote directory items.
2015-07-31 21:59:58 +02:00
Jocelyn Turcotte
26d137cac6
SocketApi: Remove an unneeded emit syncItemDiscovered
...
The signal is emitted in this case if the instruction is NONE
but in the only ultimately connected slot to this signal,
SocketApi::slotSyncItemDiscovered, we return early according
to the same condition.
The emission of the same signal at the end of treewalkFile remains
and take care of the normal cases.
2015-07-31 21:59:58 +02:00
Markus Goetz
d51bd94447
FolderMan: Fix up previous commit #3528
2015-07-31 18:31:54 +02:00
Markus Goetz
a501bf5b83
FolderMan: Use sync() on config after migration #3528
2015-07-31 17:10:12 +02:00
Markus Goetz
0a93dc5e63
OS X Settings Dialog: Two-lined account name #3516
2015-07-31 14:56:14 +02:00
Markus Goetz
eafc45d83c
CheckServerJob: Only show SSL ticket warning when actually suceeded
2015-07-30 18:16:37 +02:00
Vincent Petry
79d895ed9e
cmd: properly initialize random seed to avoid transferid collisions #3522
2015-07-30 18:08:28 +02:00
Markus Goetz
fd5330b469
Propagator: Log chunk transferid
2015-07-30 17:47:06 +02:00
Klaas Freitag
817a165da7
utility: Put the config include to top of includes.
2015-07-30 16:38:30 +02:00
Klaas Freitag
6992631c4c
cmake: rather use SHAREDIR than DATADIR define.
...
DATADIR is a reserved structure name in win32, using it like us here
leads to very nifty compile problems. SHAREDIR is clean.
2015-07-30 16:38:30 +02:00
Markus Goetz
7fc7925d17
Propagator: Don't corrupt file with broken webserver #3373
2015-07-30 14:40:24 +02:00
Markus Goetz
f01b7bb5db
Propagator: More debug output for downloads/uploads
2015-07-30 14:40:24 +02:00
Markus Goetz
48dac23b0f
Folder: Version debug at end
...
Often users send us parts of logs with this information missing.
2015-07-30 14:40:24 +02:00
Markus Goetz
7f8e9a0e70
Sparkleupdater: Use qDebug not qWarning
...
Else QT_FATAL_WARNINGS triggers.
2015-07-30 14:40:24 +02:00
Klaas Freitag
527fd1ac47
Capabilities: Add macro to make win compile again.
2015-07-30 11:04:49 +02:00
Olivier Goffart
795922e2a0
Fix compilation with old GCC
...
that does not understand nullptr
Note that we can't just replace nullptr by 0 in createIndex otherwise
it would be ambiguious.
So leave it commented to show that your intention is to create it with
a null pointer (which is the default because of the default parameter)
2015-07-30 10:44:07 +02:00
Olivier Goffart
3b261bc612
Wizard: Make the name of the backup folder more user friendly
...
Issue #3512
2015-07-29 12:23:33 +02:00
Olivier Goffart
07ddf18b3b
Account Capabilities: style fixup
...
- Remove the copy constructor. The default constructor is fine. Having
a user defined copy constructor inhibit the move constructor.
- Pass QVariantMap arguments via const references
- Do not return a pointer to Capabilities from the account. It is a
value type and should not be used by pointer.
2015-07-29 12:07:57 +02:00
Jürgen Weigert
0642e63246
Merge pull request #3232 from flocke/master
...
[Unix] Install architecture-independent files to DATADIR.
DATADIR is already used elsewhere. So this even adds consistency!
Thanks!
2015-07-29 12:00:48 +02:00
Markus Goetz
dccaba98af
Merge pull request #3439 from rullzer/use_caps
...
Use server capabilities for share dialog
2015-07-29 11:50:35 +02:00
Jocelyn Turcotte
73209717ec
Update the qtmacgoodies submodule
...
Include a fix for an assert.
2015-07-28 15:19:09 +02:00
Klaas Freitag
b07ab14c31
Merge pull request #3470 from rullzer/use_ocs_url
...
If the OCS Share API returns an url use that
2015-07-28 14:26:23 +02:00
Klaas Freitag
c95bbe27e7
Merge pull request #3495 from rullzer/dont_share_root
...
Don't allow sharing of the root folder
2015-07-28 14:00:38 +02:00
Olivier Goffart
d9c52f6316
owncloudcmd: fix --httpproxy
...
It was only used for csync, but not for QNAM
Issue #3465
2015-07-28 13:33:58 +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
Olivier Goffart
22013eb528
ConfigFile: remove some unused functions
2015-07-28 12:05:34 +02:00
Roeland Jago Douma
6c8ff7c61a
Added capabilities class
2015-07-28 12:04:24 +02:00
Olivier Goffart
4016e0863f
Fix warning
2015-07-28 11:20:22 +02:00
Olivier Goffart
ff6c11f126
Confirm feature: tray noticiation message when a new folder need to be confirmed
...
Issue #3148
2015-07-27 10:33:05 +02:00
Olivier Goffart
45b598cacb
Confirm feature: default to 500MB
...
Issue #3148
2015-07-27 10:04:53 +02:00
Olivier Goffart
0ccaae9a22
Confirm feature: Confirm for any folder, not only shared ones
...
issue #3148
2015-07-27 09:54:20 +02:00
Roeland Jago Douma
6f498aea3b
Do not open the share dialog if the user tries to share the root folder
2015-07-24 10:10:41 +02:00
Roeland Jago Douma
a2f9ba47fb
If the OCS Share API returns an url use that
...
To avoid us having to construct the URL for public shares just rely on the
server to do it.
This makes it easier to maintain. For example if (in the not do distat future)
the index.php part is removed the server would just server this new url.
2015-07-23 21:10:53 +02:00
Markus Goetz
fea997c84a
Bandwidth Limit: Fix new "Automatic Download" setting #1485
2015-07-23 13:46:42 +02:00
Klaas Freitag
316427c801
Merge branch 'regular_update_check'
...
Conflicts:
src/gui/application.cpp
src/gui/application.h
src/gui/updater/ocupdater.h
2015-07-23 11:34:12 +02:00
Klaas Freitag
c34641f4f7
Updater: Added a class UpdaterSchedule.
...
It schedules the regular update checks. Keeps Application and
other classes easy.
2015-07-22 13:44:19 +02:00
Klaas Freitag
21f7cea609
ConfigFile: Let updateCheckInterval return int instead of quint64.
...
QTimer wants that in setInterval()
2015-07-22 13:42:54 +02:00
Markus Goetz
59a7ae56d4
UI: Add more tooltips #3385
2015-07-20 19:06:40 +02:00
Markus Goetz
a58cb049b2
OS X: Fix layout of quota info in SettingsDialog
2015-07-20 18:43:18 +02:00
Markus Goetz
a6f493ff94
OS X Overlay Icons: Use waitForFinished() with timeout
2015-07-20 18:32:02 +02:00
Markus Goetz
afed400ac6
SettingsDialog: Make bigger and more native on OS X
...
On OS X, the width of the dialog must not change, only its height.
2015-07-20 18:16:33 +02:00
Klaas Freitag
89b8555aa7
PassiveUpdateNotifier: Fix condition on when to show the update.
2015-07-20 15:33:44 +02:00
Klaas Freitag
320cc1c7dd
Updater: Avoid to show the update notification to often.
...
If the update is only available through the system, the notification
is only shown once.
2015-07-20 15:33:17 +02:00
Klaas Freitag
0a08a51a41
Updater: really do not forget to start the updater timer.
2015-07-20 15:32:27 +02:00
Klaas Freitag
b22e284191
Application: Remove unused connection to updater.
2015-07-20 15:32:00 +02:00
Klaas Freitag
adc239c9d0
UpdateCheck: Clean up Application class and move most to updater.
...
Add the update timer also to the update class and remove all the
proxy slots from the Application class.
2015-07-20 12:17:31 +02:00
Klaas Freitag
681466213f
ConfigFile: Return proper type for update check interval.
2015-07-20 12:10:30 +02:00
Klaas Freitag
cb4bfd8060
ConfigFile: Fix spelling.
2015-07-20 12:10:00 +02:00
Olivier Goffart
a9dfcdd463
FolderDefinition: fix uninitialized variable
2015-07-19 11:33:17 +02:00
Christian Kamm
5d9e752c71
HttpCreds: Add keychain failure hint. #3268
2015-07-17 14:39:43 +02:00
Christian Kamm
44870fae9f
Proxy auth: Fix cred invalidation on Windows.
2015-07-17 13:00:16 +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
Klaas Freitag
2cebd8bc2e
SetupWizard: remove unused variable defintion.
2015-07-17 12:09:16 +02:00
Christian Kamm
9acc9d2d44
Fix Qt4 build.
...
QMap::first is new in Qt 5.2
2015-07-17 12:07:48 +02:00
Christian Kamm
2124098f84
System proxy: Ask for credentials if needed.
...
The proxyAuthenticationRequired() signal now goes to the
ProxyAuthHandler class. That class will try to read the proxy settings
from the keychain or ask the user about them.
We won't ask the user for credentials for explicitly configured proxies.
It also does not change how the credentials for explicitly configured
proxies are stored. (see #261 )
2015-07-17 11:54:46 +02:00
Olivier Goffart
944564258c
Fix the Utility Test
...
1 should be printed as "1" and not as "1.00"
2015-07-17 10:27:03 +02:00
Olivier Goffart
0a6aa88d72
Merge remote-tracking branch 'origin/hidden_file_handling'
2015-07-17 09:32:29 +02:00
Roeland Douma
bc542a4b80
Merge pull request #3426 from rullzer/thumbnail
...
Sharedialog show thumbnail of file (if available)
2015-07-17 08:58:06 +02:00
Daniel Molkentin
59f93b77c3
Merge pull request #3468 from owncloud/3368
...
Win32: Do not silent-update if the application is already up-to-date
2015-07-16 23:02:06 +02:00
Roeland Jago Douma
7e79a78901
Use already available password field
2015-07-16 20:55:54 +02:00
Klaas Freitag
2f2ae09190
Utility: Added function versionOfInstalledBinary()
...
It calls the binary with param --version and returns the first line of
the output. For owncloud, that is the version string.
2015-07-16 18:16:16 +02:00
Olivier Goffart
b59fc39d13
Fix warnings about unused parametters
2015-07-16 18:15:07 +02:00
Klaas Freitag
d284b48db4
Application: Add a new command line switch --version.
...
It simply prints the version of the client and exists.
2015-07-16 18:12:45 +02:00
Daniel Molkentin
724c0c2953
Win32: Do not silent-update if the application is already up-to-date
...
Fixes #3368
2015-07-16 17:26:53 +02:00
Olivier Goffart
bdf5029d47
HTTP cred: properly forget the password when signing out #3462
...
QNAM do not sign out by itself, it keeps the password in cache.
Qt5 has a function to clear the cache. On Qt4 we reset the QNAM
2015-07-16 17:00:14 +02:00
Klaas Freitag
4ad9b7d72d
Change default check frequency to every ten hours.
2015-07-16 14:19:02 +02:00
Markus Goetz
3d55191573
OS X: Fix settings dialog after multi-account introduction
...
For #3459 #3386 #3401
2015-07-16 14:11:06 +02:00
Markus Goetz
55e1f8a060
OS X Overlay Icons: Don't use waitForReadyRead()
...
Somehow this sometimes glitched for me and hanged.
2015-07-16 14:08:45 +02:00
Christian Kamm
031d35de03
Network: Fix enabling of proxy auth text fields.
2015-07-16 10:27:15 +02:00
Klaas Freitag
a5528b7cd4
AccountSettings: When adding a new folder, set ignore hidden flag.
...
The value is taken from existing folder definitions, or defaults to true.
2015-07-15 15:54:41 +02:00
Klaas Freitag
cfe5150037
IgnoreListEditor: handle the ignore hidden files checkbox.
...
Write the setting of the checkbox to all folder definitions.
2015-07-15 15:54:41 +02:00
Klaas Freitag
1aa17cdb69
owncloudcmd: add option to not ignore hidden files.
2015-07-15 15:54:41 +02:00
Klaas Freitag
7195e40ffa
FolderMan: Set ignore hidden files in the folder watcher.
...
The flag is read from the folder configuration and passed on to
the folder watcher so that it ignores events to hidden files
accordingly.
2015-07-15 15:54:41 +02:00
Klaas Freitag
3ba6e20f66
Folder: Getter and Setter for ignore hidden files for folder config.
...
With these, the ignore hidden files flag can be set and get from the
folder configuration file.
2015-07-15 15:54:41 +02:00
Klaas Freitag
711ae1d347
FolderWatcher: Add flag to ignore hidden files (or not).
2015-07-15 15:54:41 +02:00
Klaas Freitag
a4336092f6
Hidden Files: Add a setting to ignore hidden files or not.
...
This setting goes to the folder definition. By default, no hidden
files are synced.
2015-07-15 15:54:41 +02:00
Klaas Freitag
3a5f66e976
SyncEngine: Remove bogus logging.
2015-07-15 15:54:41 +02:00
Klaas Freitag
9461e4ccd1
Sync: Only copy the hasIgnoredFlag for the remote side.
...
Also added some documentation about the handling.
2015-07-15 15:53:58 +02:00
Klaas Freitag
7b8dc9777e
Sync: Rename ignored file member to _serverHasIgnoredFiles.
...
This should make it more obvious that only the server state about
ignored files is stored in the db.
2015-07-15 15:51:15 +02:00
Klaas Freitag
b0aedef4b0
Sync: Store information about ignored files on the server in database.
...
That allows better handling of remove requests that should not be done
because the directory is not empty on the remote side (as it contains
ignored files).
2015-07-15 15:49:27 +02:00
Klaas Freitag
da87a47eaf
discovery: handle dot files on server as hidden.
2015-07-15 15:20:46 +02:00
Klaas Freitag
7aa2b50828
csync_update: Handling hidden files as excluded files, as intended.
2015-07-15 15:20:46 +02:00
Christian Kamm
65a3847a35
Tray menu: Make sign in/out actions more consistent.
...
In particular:
* It's always possible to sign out, even if there's currently a
network problem or the service is unavailable.
* You can only sign in when you explicitly signed out before.
2015-07-15 15:07:23 +02:00
Roeland Douma
3344249297
Merge pull request #3425 from rullzer/sharedialog_wait_for_con
...
Wait until we retrieved shares before showing checkbox
2015-07-15 14:38:38 +02:00
Roeland Jago Douma
b686a3dbdb
Sharedialog show thumbnail of file (if available)
2015-07-15 14:33:04 +02:00
Roeland Jago Douma
454e9d9906
Wait until we retrieved shares before showing checkbox
...
If we have a slow connection we do now want to show the share checkbox until we
have retrieved the shares (so we know the state). Else we might try to enable
sharing on an already shared file.
2015-07-15 14:20:35 +02:00
Christian Kamm
908881cbf7
AccountSettings: Fix label for ServiceUnavailable state.
2015-07-15 14:02:45 +02:00
Christian Kamm
2ac8646320
AccountSettings: Improve error reporting. #3084
...
Previously the errors were only visible in the tray icon tooltip!
2015-07-15 12:04:44 +02:00
Christian Kamm
7edb57e46c
Fix error message for invalid chars in filename #3432
2015-07-15 10:38:33 +02:00
Olivier Goffart
92dc3047d0
Qt4 SelectiveSyncDialog: Give a better size to the column by default
...
Issue #3239
The feature to dynamically resize the column only came with Qt5,
But give a better default size of the name column so we can read the
contents.
2015-07-14 15:18:55 +02:00
Olivier Goffart
cdb88d621c
Qt4 build: Qt::ItemNeverHasChildren was added in Qt 5.1
2015-07-14 15:01:33 +02:00
Olivier Goffart
b485e8f97f
AccountSettings: disable the add folder button when syncing the entire owncloud #3438
2015-07-14 11:03:25 +02:00
Olivier Goffart
ab23368764
FolderStatusModel: init all private members
2015-07-14 10:15:19 +02:00
Olivier Goffart
6030b4416d
Account Settings: hide the [add folder] button when syncing the entire owncloud #3438
2015-07-13 16:29:01 +02:00
Olivier Goffart
aabad22cef
Wizard: show an error if the folder already exists
...
Issue #3444
2015-07-13 15:37:01 +02:00
Olivier Goffart
247771fbba
Wizard: remove the configExists state
...
The wizard is now only used to create new account, not update existing ones
2015-07-13 15:21:18 +02:00
Olivier Goffart
e5568b5d13
Wizard: remove the check for mutliple folders
...
It does not make sens now that we have multi account
2015-07-13 14:52:24 +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
Roeland Jago Douma
c052f6d4c9
Use capabilities to not allow removing of expiredate and password
...
If the server admin has enforced the expiration date and the password our UI
should not give the user the option to remove those.
2015-07-10 15:50:01 +02:00
Roeland Jago Douma
7f893aa676
Fore password request if required by capabilities
2015-07-10 15:26:26 +02:00
Olivier Goffart
45180a024d
Rename should_update_etag to should_update_metadata
...
This should avoid some confusion
2015-07-09 15:05:37 +02:00
Olivier Goffart
992d375e90
owncloudGui: Do not reset folders when login in or out.
...
This made no sens. Folders are setup when the account is setup.
Also this had the bad side effect to shut the sync engine too early,
leaving the SyncEngine::_syncRunning to true, and leading to ASSERT later
Issue #3427
2015-07-09 13:25:27 +02:00
Olivier Goffart
644486871b
owncloudGui: Fix crash when sign in
...
The sign in action from within that menu might change the account state
and call setupContextMenu. We must not delete the menu from there
Issue #3427
2015-07-09 12:17:27 +02:00
Olivier Goffart
08fcf650eb
Fix Qt4 build
2015-07-08 19:48:57 +02:00
Klaas Freitag
e28fab0c61
Folder: let path() always end on "/" rather than on platform spec. delim.
2015-07-08 18:13:41 +02:00
Klaas Freitag
c7ba7c8e9f
Fix comment for c_path_to_UNC, plus cleanup of superflous debug.
2015-07-08 18:13:41 +02:00
Klaas Freitag
b8077d2f5b
FileSystem: Use long file name handling method from csync.
...
This helps to only maintain one version of the function.
2015-07-08 18:13:40 +02:00
Klaas Freitag
02a5a8ea3b
SyncJournal: Use proper long path handling.
2015-07-08 18:13:40 +02:00
Klaas Freitag
56954c6482
FileSystem: Add missing EXPORT macro.
2015-07-08 18:13:40 +02:00
Klaas Freitag
bb1b1ab7e3
FolderWatcher Win: Use proper lang path handling in folder watcher.
2015-07-08 18:13:40 +02:00
Klaas Freitag
e74801fd3d
Win32 long filename format for Qt functions.
2015-07-08 18:13:39 +02:00
Olivier Goffart
68668e25bd
FolderStatusModel: uses int64 for the sizes to prevent overflow
...
Issue #3420
(The change in Utility just make sure never to use the scientific notation,
even if it should never happen)
2015-07-08 14:52:58 +02:00
Olivier Goffart
e2cb6e8086
Utility: remove useless QList
...
Not used anymore
2015-07-08 11:16:32 +02:00
Olivier Goffart
d1bfc7a636
Settings: fix broken signal/slot connection:
...
No such slot OCC::GeneralSettings::slotForceRemoteDiscoveryOnFolders()
(sender name: 'OCC__IgnoreListEditor')
(receiver name: 'OCC__GeneralSettings')
The slot was in another settings page (because the button 'edit ignored files'
was moved.
Move the actual code to IgnoreListEditor where it logically belong.
Add a comment on the why this code is there.
2015-07-07 20:46:39 +02:00
Olivier Goffart
41111541c5
Confirm feature: Add an option for it
2015-07-07 16:28:48 +02:00
Olivier Goffart
f87d0139e1
AccountState: fix Sing-in of a connected account
...
Issue #3413
There was two problem:
- First, when singing in we were setting an account that was connected
to disconnected (AccountState::State)
- Second, while getting the result from the ConnectionValidator, we would
not set the state to connected if the previous call to ConnectionValidator
was ConnectionValidator::Connected, regardless of the old state of the account
2015-07-07 14:44:16 +02:00
Olivier Goffart
ceddbe248e
FolderStatusDelegate: style the Add Folder button
2015-07-06 16:04:06 +02:00
Olivier Goffart
ef1f2d2b79
FolderStatusDelegate: Fix identation and remove empty functions
2015-07-06 14:44:53 +02:00
Olivier Goffart
9c9ff886c9
Fix qt4 build
...
Qt5 automatically declares many types as QMetaType.
Qt4 needs them manually declared
2015-07-06 11:04:17 +02:00
Markus Goetz
ed0fb76cd7
Merge pull request #3404 from owncloud/fix-2702
...
Command Line: clear error hint with wrong command line options
2015-07-04 12:56:06 +02:00
Arthur Schiwon
263fa5882b
clear error hint went wrongly use command line options
2015-07-03 16:01:24 +02:00
Christian Kamm
ae69ff032b
Folders: Show as disconnected when account is disconnected.
...
Previously you could get a green folder icon even when the account
was signed out or disconnected for another reason.
2015-07-03 15:03:18 +02:00
Christian Kamm
1a58e6606c
TrayMenu: Show submenus per account.
...
This addresses the inability to sign out from one account while
keeping the other active. See #3399 , #3400 , #3379
2015-07-03 14:54:20 +02:00
Christian Kamm
e390c22f96
FolderStatusModel: Minor cleanup.
2015-07-03 14:28:04 +02:00
Christian Kamm
7053f76d1e
Password dialog: Include account name.
...
Users with accounts on multiple servers could easily use the same
username on both servers. The password dialog did not tell users
what server the password is for. I added the account name to the
dialog.
2015-07-03 11:39:44 +02:00
Christian Kamm
030d1e636b
Progress UI: Properly reset bar after a sync.
2015-07-03 11:26:03 +02:00
Christian Kamm
9ad79cfc52
TrayMenu: Ensure it updates when accounts are added or removed.
2015-07-03 11:13:19 +02:00
Olivier Goffart
76903fb55a
Settings: Aling the non-accounts button on the right
2015-07-03 11:04:03 +02:00
Olivier Goffart
0b8163fae1
Folder: the limit for the confirm featur is 100MB, not 100kB
2015-07-03 10:42:20 +02:00
Daniel Molkentin
0fb43dbc3a
Merge pull request #3397 from owncloud/uselibcpp
...
OS X: Force linkage against libc++
2015-07-02 14:26:55 +02:00
Daniel Molkentin
0610d3ea8d
Merge pull request #3347 from jturcotte/shell_integration_findersync
...
shell_i: Add a FinderSync-based implementation #2340
2015-07-02 14:20:24 +02:00
Christian Kamm
ba613a152a
FolderStatusModel: Always update on sync state change.
...
Previously the icon and progress report could easily get
somewhat stale and go out of sync with the tray icon.
2015-07-02 14:17:38 +02:00
Christian Kamm
7e6804fda8
ProgressDispatcher: Minor cleanups.
2015-07-02 14:17:38 +02:00
Daniel Molkentin
a1b6571d53
Revert "Do not use std::unique_ptr"
...
This reverts commit 2db7ab5c46
.
2015-07-02 13:31:42 +02:00
Daniel Molkentin
1d8c919645
Force linkage against libc++
2015-07-02 13:31:25 +02:00
Olivier Goffart
2db7ab5c46
Do not use std::unique_ptr
...
The class is not existing on all platform we support
(namely macos 10.7)
2015-07-02 12:55:54 +02:00
Christian Kamm
5ff733cfb7
Fix travis build.
...
It does not like 'constexpr const' and for object declarations like
this one it should indeed be redundant.
2015-07-02 11:40:16 +02:00
Christian Kamm
bf183f425d
SslConfig: Reset when QNAM is reset. #3394
...
It seems running a CheckServerJob with the existing ssl config after
resetting QNAM will produce a ssl config without a cert chain.
2015-07-02 11:28:40 +02:00
Christian Kamm
1b31f45435
SslButton: Only show menu when info is available.
...
For unencrypted connections there used to be a small arrow indicating
that more information was available, but clicking the button had no
effect. That indicator is now gone because we unset the SslButton's
menu for these cases.
2015-07-02 10:49:18 +02:00
Christian Kamm
4420d52919
QuotaInfo: Ensure label fits into progress bar. #3393
2015-07-02 10:28:33 +02:00
Christian Kamm
2d08e02dda
Propagation: Make 503 a fatal error.
...
Running further propagation jobs when the server is likely to be
503 for a time does not seem very useful.
2015-07-01 14:53:07 +02:00
Christian Kamm
8aeb3cc8d2
Improve account connectivity tooltips. #3200
...
* Show connection errors for all failing accounts in the tooltip.
* Don't hide the 'service unavailable' state. We don't want intrusive
pop ups, but we don't want to pretend we're syncing when we aren't.
* Show sync-running icon also for SyncPrepare state. In my tests I
very rarely saw the sync-running icon before.
2015-07-01 14:53:07 +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
Olivier Goffart
575ca50aac
csync: Do not ignore hard links anymore
...
There is no reason to ignore them. Downloading a file that is hardlinked
will break the link.
Will solve syncing NTFS directories #3241
2015-07-01 13:05:08 +02:00
Olivier Goffart
4a541a9ab4
Merge remote-tracking branch 'origin/maser'
2015-06-30 13:52:38 +02:00
Olivier Goffart
ec5894ef7a
Fix Qt4 build
2015-06-30 11:29:59 +02:00
Daniel Molkentin
66e8aaeabc
Use doxygen style everywhere
2015-06-29 18:56:09 +02:00
Daniel Molkentin
eff4daa00b
Merge remote-tracking branch 'origin/master' into doxygenify
...
Conflicts:
src/gui/quotainfo.h
2015-06-29 18:45:55 +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
Olivier Goffart
076f8ea105
Merge pull request #3097 from owncloud/translatable-remaining-time
...
make the remaining time string translatable and support plural forms
2015-06-29 18:30:44 +02:00
Markus Goetz
ef1e6add4f
Settings: Auto download bandwidth limit #1485
2015-06-29 17:43:25 +02:00
Olivier Goffart
ec3fc50e0e
FolderMan: store folders in a QMap instead of a QHash so they are kept in order
...
Issue #1529
2015-06-29 15:49:47 +02:00
Olivier Goffart
7a324ff25b
Utility: improve the function to conver a duration to string
...
- Make it translatable
- Make use of the %n so that it supports plurals (but this will only
take effect if we have an english translation)
- Only put two units. eg: "5 years 7 months" instead of
"5 years 7 months 12 days 34 minutes 23 seconds"
Even when it is "2 hours 23 minutes" the amount of second does not
matter, especially since the estimation is likely to be boggus anyway
Issues #2672 and #3097
2015-06-29 14:59:28 +02:00
Olivier Goffart
23ccaa2821
QuotaInfo: add a comment about long running job
...
To document the change made two commits ago
2015-06-29 10:57:32 +02:00
Olivier Goffart
51c10de672
QuotaInfo: make sure that we always check the quota every 30 seconds
2015-06-26 18:04:27 +02:00
Olivier Goffart
236951d9b3
QuotaInfo: allow only one job at the same time
2015-06-26 16:58:34 +02:00
Olivier Goffart
e7d7646151
QuotaInfo: only request the quota when the UI is visible
2015-06-26 15:43:19 +02:00
Olivier Goffart
7757886ebc
SystemTray menu: remove the quota information
...
It makes no sens anymore with multi account and users will see it
from the dialog anyway.
2015-06-26 13:32:02 +02:00
Olivier Goffart
61a1a0bb2d
PropfindJob: fix a debug output message
...
Prpfind job can be used for more than getting the quota
2015-06-26 13:32:02 +02:00
Christian Kamm
77941b5ba7
IgnoreEditor: Make UI more explicit. #3172
...
People were mistaking the checkbox for something that enables
and disables specific ignore patterns. Now it's much more
explicit.
2015-06-26 10:46:13 +02:00
Christian Kamm
10aaf18129
FolderMan: Make folderSyncStateChange() signal reliable. #3354
2015-06-26 10:09:03 +02:00
Olivier Goffart
db87d2a18e
QuotaJob: remove and use a PropfindJob instead
...
This remove code duplication because the QuotaJob was just a duplication
of the propfind jobs with the properties hardcoded.
2015-06-25 14:39:48 +02:00
Olivier Goffart
29fecb029e
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
src/gui/accountsettings.cpp
src/gui/accountsettings.h
2015-06-25 12:30:52 +02:00
Olivier Goffart
494f08de8c
Theme: add a non-inline destructor
...
That way we do not need to include QIcon in theme.h
So the header can be included (indirrectly) from cmd.cpp
which is not compiled with the QtGui include paths
2015-06-24 10:14:55 +02:00
Olivier Goffart
c56cb2235c
Missing EXPORT macro
2015-06-23 00:53:32 +02:00
Jocelyn Turcotte
9797782682
shell_i: Build the extension with the '-' identity by default
...
This allows developers to build and run the extension by default.
Official packages bundles will be re-signed after the build, we
The SocketApi prefix can be set at configure time through cmake and
should match the key that will be used to sign the whole .app bundle
(including the embedded FindexSync .appex bundle).
2015-06-22 13:55:19 +02:00
Christian Kamm
deb5e68e15
Ignores: Force a remote discovery after ignore list change #3172
...
The problem was that the modified ignore pattern was not applied
to the parts of the remote tree we simply retrieve from the db
because the folder etag didn't change.
Even worse, if one removed an ignore pattern, the un-ignored
files would not be synced correctly.
With this change, a modification to the ignore list always results
in a full remote discovery. This guarantees that we find un-ignored
files.
2015-06-19 14:58:47 +02:00
Jocelyn Turcotte
9a9897ea1e
Shibboleth: Let the webview use its own QNAM #3359
...
Since we periodically recreatet the QNAM owned by the Account,
the web view could end up holding a dangling pointer to it.
Let the web view use its own QNAM, but make sure that the cookie
jars are shared so that we can grab the session token given
by the server.
2015-06-19 12:33:11 +02:00
Olivier Goffart
bb85db6cc5
Fix windows build
2015-06-18 10:24:40 +02:00
Olivier Goffart
dd5ddf2166
AbstractNetworkJob: move to its own file
2015-06-17 17:29:11 +02:00
Jocelyn Turcotte
85938ab1f1
shell_i: Remove the ICON_PATH socket API message #2340
...
It was only used on OS X and couldn't be used by the FinderSync
extension since that one runs in a sandbox. So use the same system
to load images in the legacy extension by shipping them in the
extension bundle instead of the owncloud.app bundle.
This is also given that the legacy extension needs padded icons
while the FinderSync one needs unpadded icons.
2015-06-17 17:15:50 +02:00
Klaas Freitag
79cc902673
FolderMan: Save migratated folder definitions to Configfile.
2015-06-17 14:54:51 +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
Christian Kamm
84bae92264
AccountSettings: Fix initial visibility of sel sync panel #3355
2015-06-17 14:43:38 +02:00
Christian Kamm
191d66fc6f
Propagator: Add entry with dummy etag on local mkdir. #2761
2015-06-17 14:38:51 +02:00
Jocelyn Turcotte
c98bcc8e9e
OS X: Fix a few warnings
2015-06-17 14:32:34 +02:00
Jocelyn Turcotte
a4f519eaeb
Reduce the amount of rebuild needed after a git commit
...
Since GIT_SHA1 would need to be updated in config.h, all files
including it would be rebuilt by make.
Reduce the number of files to rebuild by moving this variable
to version.h instead.
2015-06-17 14:32:34 +02:00
Olivier Goffart
c11358219a
FolderStatusModel: fix a coverity warning
2015-06-17 12:46:49 +02:00
Christian Kamm
28d6d0dc1e
Download: Gracefully skip files with 404. #2227
2015-06-17 12:24:21 +02:00
Jocelyn Turcotte
977b1464b5
shell_i: Don't load the old extension in >= 10.10 #2340
2015-06-16 15:30:43 +02:00
Olivier Goffart
d902a37dfd
Fix Qt4 compilation
...
This header is not included in Qt4's QAbstractItemModel header
2015-06-16 12:14:04 +02:00
Olivier Goffart
0cfc518c33
Fix coverity build which does not support nsdmi
2015-06-16 09:30:29 +02:00
Olivier Goffart
f8cbed34c2
Should fix coverity build
...
Issue #3346
2015-06-15 17:59:08 +02:00
Olivier Goffart
2e177590a6
libsync: Remove some Theme dependency
...
Theme will eventually be moved to the GUI
Theme::appNameGUI and QApplicaiton::applicationName are the same, it is currently
set in the constructor of ConfigFile
2015-06-15 17:39:28 +02:00
Olivier Goffart
7f0735a955
Account: don't use the Theme from the account
...
The Theme will be moved to GUI
The server URL is anyway overriden by the wizard or the accountmanager
2015-06-15 17:39:28 +02:00
Olivier Goffart
ce0a0e3f0d
Credential: move the implementation to the gui
2015-06-15 17:39:28 +02:00
Olivier Goffart
6e337ad242
Move Account::settings to AccountState::settings
...
It is only used by the GUI. Also return a unique_ptr to make the ownership clearer
2015-06-15 17:39:28 +02:00
Jocelyn Turcotte
bfcfdeec64
shell_i: Use an NSConnection instead of a local socket #2340
...
This prepares the switch to the official FinderSync API on Yosemite
which requires the extension to run in a sandbox. This complicates
the usage of a local socket to communicate with a non-sandboxed GUI
client. An NSConnection is easier to use in this case, which we can
use as long as the server name (i.e. Mach port registered name) is
prefixed with the code signing Team Identifier.
A placeholder server implementation is also added to the client's
SocketApi which basically reproduces the interface of a QLocalSocket.
Most of the references to individual sockets we're only using
QIODevice methods so the type was simply reduced. A typedef to
replace the QLocalServer was the only other part needed.
2015-06-15 15:28:17 +02:00
Olivier Goffart
e321280eae
AccountManager: remove export macro
2015-06-15 14:53:36 +02:00
Olivier Goffart
a3c543a627
Move FolderStatusDelegate to its own file
2015-06-15 14:16:21 +02:00
Klaas Freitag
fa0faee8ba
Frequent update check: read check frequency from config file.
2015-06-15 12:24:18 +02:00
Olivier Goffart
bea8896012
Merge remote-tracking branch 'origin/master' into new-ui
2015-06-14 10:39:30 +02:00
Olivier Goffart
1dabdc7df1
discoveryphase: initialize DiscoveryMainThread::_currentGetSizeResult
2015-06-12 14:43:18 +02:00
Olivier Goffart
11c8415cd6
Coverity do not support non-static data initializer
...
Fixes #3337
2015-06-12 13:57:17 +02:00
Olivier Goffart
81c10da8dc
Accountsettings: Show a notification when there are new unconfirmed folders
2015-06-12 12:19:24 +02:00
Olivier Goffart
2296f6a4a5
Fix Qt4 build
...
QSharedPointer::create with arguments is new in Qt5
2015-06-12 08:13:08 +02:00
Olivier Goffart
53f2468430
Confirm: Set the limit to 100MB
...
TODO: make this configurable
2015-06-11 15:54:39 +02:00
Olivier Goffart
cc3543dbd2
Confirm feature: The UI part in the selective sync view
...
Folder that are over the threshold will appear in red in the
selective sync view and will be deselected by default
2015-06-11 15:46:01 +02:00
Olivier Goffart
05ed126bfd
Account config: add the size in the selective sync part
2015-06-11 14:13:09 +02:00
Olivier Goffart
5ab20e64bf
AccountSettings: fix selective sync checking
...
We need to set the root item to partially checked in case there
is some folders in the blacklist
The root item do not have checkmark so it is good
2015-06-10 17:00:08 +02:00
Olivier Goffart
e9e11d251f
Fix compilation after merge of the confirm and the new-ui branch
2015-06-10 16:22:14 +02:00
Olivier Goffart
139b28b471
Merge branch 'master' into new-ui
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/gui/folderman.cpp
2015-06-10 15:57:55 +02:00
Olivier Goffart
16786eed54
Merge pull request #3281 from owncloud/confirm
...
Confirm feature (sync engine part only)
2015-06-10 13:39:52 +02:00
Olivier Goffart
e135d4cccf
Merge remote-tracking branch 'origin/1.8'
2015-06-10 13:42:02 +02:00
Klaas Freitag
c8cb604c18
Updater: Do a tray notification if a new update is available.
2015-06-09 08:35:15 +02:00
Klaas Freitag
5b65bbf8e5
App: Do a regular check for updates, currently hardcoded every two hours.
2015-06-09 08:35:15 +02:00
Olivier Goffart
67f7892958
SocketAPI: Do not leak open DB or query
...
We could leak it in case of errors. Or when the folder is removed.
Make use of QSharedPointer to avoid leaks
2015-06-08 15:49:37 +02:00
Olivier Goffart
6df7551bdd
DiscoveryPhase: Fix the unlikely case the server resturns utf-8 in permissions
...
UTF-8 size might be bigger than the size of the QString
In that case we would end up with a non-nill terminated permissions.
2015-06-08 15:40:06 +02:00
Olivier Goffart
1b9d82679c
OwnSQL: fix initialisation of variables
2015-06-08 15:30:39 +02:00
Olivier Goffart
2c6c21d753
AccountState: do not change the state when we stay connected
...
This would cause a full sync every 30 seconds.
2015-06-08 12:14:37 +02:00
Volkan Gezer
03eb11b927
from translators on transifex
2015-06-07 14:19:59 +02:00
Klaas Freitag
fc2ceb88fb
Rename thread to SyncEngine Thread to avoid confusion about Neon.
2015-06-06 10:49:47 +02:00
Christian Kamm
ee08b3759d
SyncScheduling: Avoid new resyncs on local mkdir.
...
(cherry picked from commit bacf6166c1
)
2015-06-05 10:27:28 +02:00
Christian Kamm
bacf6166c1
SyncScheduling: Avoid new resyncs on local mkdir.
2015-06-04 15:02:24 +02:00
Christian Kamm
2ed329e025
Improve reporting of server error messages. #3220
...
In particular the 'unsupported client version' error message
is now visible to the user when trying to connect to a
server that no longer supports the current client version.
2015-06-04 10:07:24 +02:00
Christian Kamm
4c10f1e40c
Wizard: Show server error message if possible. #3220
2015-06-03 16:33:09 +02:00
Olivier Goffart
02ffbf8989
confirm feature: fix typos spotted by ckamm
2015-06-03 15:20:42 +02:00
Christian Kamm
89376e14d6
Nicer fix for the security issue #3283 .
2015-06-03 11:37:26 +02:00
Christian Kamm
e32bd5a59f
Merge remote-tracking branch 'origin/1.8'
2015-06-03 11:36:52 +02:00
Olivier Goffart
12f760535d
Fix folder concatenation with Qt4
...
QUrl in Qt4 do not simplify double slashes like Qt5 does, so we have
to take in account different slashes possibilities
2015-06-02 20:47:06 +02:00
Olivier Goffart
e1f94cea4f
FolderStatusModel: handle network error in the LSCol
2015-06-02 20:47:06 +02:00
Olivier Goffart
fc23e810fd
folderstatusmodel: clean includes
2015-06-02 20:01:13 +02:00
Olivier Goffart
e587c8e2dc
multi-account: compile with Qt4
2015-06-02 19:57:41 +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
Klaas Freitag
75b38d1a2f
Abort the request and reset the QNAM if user does not ACK a new cert.
...
This is supposed to fix bug #3283
2015-06-02 12:21:49 +02:00
Christian Kamm
2435ba7e7d
Windows: Fix unit test build.
2015-05-27 14:59:28 +02:00
Olivier Goffart
28a66cb393
SettingsDialogMac: adapt to multi-account
2015-05-26 17:37:15 +02:00
Olivier Goffart
507206367f
Merge branch 'master' into new-ui
2015-05-26 14:56:08 +02:00
Olivier Goffart
9e17ddffae
Confirm feature: document the white/black/unconfirmed lists
2015-05-26 14:41:29 +02:00
Olivier Goffart
a621223cc8
SyncEngine: add an api to set the maximum size of new shared folder that do not require confirmation
2015-05-26 14:41:01 +02:00
Olivier Goffart
7bb2834d8b
Confirm feature (The sync engine part)
2015-05-26 12:34:07 +02:00
Olivier Goffart
10d9e53159
Confirm feature: Use selective sync in the database
2015-05-26 12:34:07 +02:00
Olivier Goffart
2c67692958
JournalDb: add a table in the db for the selective sync
2015-05-26 12:33:54 +02:00
Olivier Goffart
5cb10bf6a1
PropfindJob: fix parsing of properties that have a sub element
...
The default argument of readElementText is ErrorOnUnexpectedElement which
abort the parsing of remaining elements
2015-05-26 12:33:54 +02:00
Olivier Goffart
54a42e401b
More compilation fixes after the merge
2015-05-26 12:33:19 +02:00
Olivier Goffart
6b27d2e703
Merge remote-tracking branch 'origin/1.8'
2015-05-26 12:28:31 +02:00
Klaas Freitag
6c46713701
include qtconcurrentrun header rather than QtConcurrent for Qt4
2015-05-22 14:46:29 +02:00
Olivier Goffart
3754e6c781
Disable the curruption workaround on mac and windows
...
The binaries we ship have a patched Qt
2015-05-22 14:19:44 +02:00
Olivier Goffart
6b9e123816
Merge remote-tracking branch 'origin/checksum_1.8' into 1.8
2015-05-22 10:32:37 +02:00
Olivier Goffart
fb2295fcec
Merge branch 'recall' into 1.8
2015-05-22 10:32:26 +02:00
Christian Kamm
0af2f7e5ed
ConValidator: Always run with new credentials. #3266
2015-05-22 09:38:44 +02:00
Christian Kamm
1c84d01584
Windows: Fix build of tests.
2015-05-22 09:17:24 +02:00
Olivier Goffart
3fcce08a22
recall: move the recall code in a namespace
2015-05-21 16:23:54 +02:00
Olivier Goffart
289800c1ba
Recall: make it work even if it is not in the root directory
2015-05-21 16:06:53 +02:00
Olivier Goffart
9a02a0f3a8
Recall feature: Fix some style issues
2015-05-21 16:06:52 +02:00
Jakub Moscicki
4e79093f84
recall file prototype
2015-05-21 16:06:52 +02:00
Klaas Freitag
d2fff2c3e3
Theme: Allow to change the transmission checksum through theming.
2015-05-21 15:59:24 +02:00
Klaas Freitag
8f277e46d6
TransmissionChecksumming: Remove SyncFileItem dependency.
2015-05-21 15:51:48 +02:00
Klaas Freitag
c33d962712
TransmissonChecksumValidator: Add documentation.
2015-05-21 14:32:08 +02:00
Klaas Freitag
3870915118
TransmissionChecksumValidator: Reduce verbosity.
2015-05-21 14:31:39 +02:00
Klaas Freitag
b05ca526a4
In case of empty checksum type, emit validated.
2015-05-21 14:31:18 +02:00
Klaas Freitag
4e28a24af3
Let checksumType() read the config to destinguish checksum type.
2015-05-21 14:30:21 +02:00
Olivier Goffart
aebadfcda2
FolderWizard: Add missing Q_OBJECT which prevent translations from working
2015-05-21 12:53:55 +02:00
Klaas Freitag
dec3bd4a02
Some more minor cleanups based on the pull request review.
2015-05-20 22:44:12 +02:00
Klaas Freitag
64ce0cd7a2
Improved implementation efficiency of checksum calculation.
...
Based on Oliviers suggestions the file read routine now reuses
one buffer to read the entire file.
Other cleanups.
2015-05-20 21:42:08 +02:00
Klaas Freitag
5b5a636cc1
Make TransmissionChecksumValidator child of the job for auto delete.
...
That way no explicit memory management is needed as the allocation
is freed when the job (parent) is deleted automatically.
2015-05-20 16:54:04 +02:00
Daniel Molkentin
5c6a6529a6
Merge pull request #3258 from binwiederhier/bugfix/issue3256-mkcol
...
Add 'Content-Length: 0' header to MKCOL request; fixes #3256
2015-05-20 15:48:33 +02:00
Philipp Heckel
68fa190cf7
Add 'Content-Length: 0' header
2015-05-20 14:40:20 +01:00
Olivier Goffart
d148464efe
SyncJournalDb::updateErrorBlacklistEntry: lock the mutext at the beginning
...
The mutex need to be locked before checkConnect, that's what all the other functions are doing
2015-05-20 15:30:19 +02:00
Klaas Freitag
17fe4c3b29
PropagateUpload: Fix typo in warn message.
2015-05-20 12:30:00 +02:00
Klaas Freitag
dd6c97abb6
Propagator: Added a log that tells if transmission checksumming is used.
2015-05-20 12:27:54 +02:00
Markus Goetz
330b352001
ProgressInfo: Fix Windows build
2015-05-20 11:59:33 +02:00
Klaas Freitag
ddfe3fa7ab
TransmissionChecksum: Fix identation.
2015-05-20 10:49:18 +02:00
Klaas Freitag
1f7274c2f2
TransmissionChecksum: Removed "pseudo" thread worker functions
...
Removed the Worker postfix from the method names to reflect their non
threaded character, they moved into a thread in the Validator class.
Thanks ckamm for review.
2015-05-20 10:45:20 +02:00
Klaas Freitag
8b371c42b7
Propagate Download: Handle malformed checksum header as error.
...
Plus some cleanup, bool ok was not needed actually.
2015-05-19 17:09:40 +02:00
Klaas Freitag
c7f759fedf
Propagator: Use the TransmissionChecksumValidator class.
2015-05-19 17:09:40 +02:00
Klaas Freitag
830daa40d1
Add a class TransmissionChecksumValidator, incl. unit test.
...
This does all needed to manage checksums that go with http headers
ensuring that the transmission was correct.
2015-05-19 17:09:40 +02:00
Klaas Freitag
f016d25b4c
Propagate downloads: Handle checksum transmission header.
...
Read a checksum from the HTTP header, and if its there, compare the
downloaded tmp file against it. In case of corruption, schedule a
redownload.
2015-05-19 17:09:40 +02:00
Klaas Freitag
e18fd62f34
Propagator: checksum constants go to propatorjobs header.
...
So they can be used from both up- and download propagator jobs.
2015-05-19 17:09:40 +02:00
Klaas Freitag
3701fbcbfe
PropagateUpload: Add checksum calculation if required by config.
...
If the config file has an transmissionChecksum entry, a checksum
is added to the PUT requests in a header.
2015-05-19 17:09:39 +02:00
Klaas Freitag
67d38bc87b
Filesystem Utilities: Add Checksum calculation methods.
2015-05-19 17:09:39 +02:00
Klaas Freitag
ec83295b99
Branding: Append the appName short to the user agent string.
2015-05-19 17:09:39 +02:00
Klaas Freitag
e36252a845
Theme: (minor) remove some more mirall's
2015-05-19 17:09:39 +02:00
Klaas Freitag
d0d8de9f2f
MirallConfigFile: Add an option of transmission checksumming.
2015-05-19 17:09:39 +02:00
Daniel Molkentin
9693048f78
Find & use QtConcurrent
2015-05-19 17:09:39 +02:00
Klaas Freitag
101d2268ff
SyncFileItem class: Add member _checksum
2015-05-19 17:09:39 +02:00
Klaas Freitag
2fcad760b9
StopWatch: return the duration from the stop() command.
2015-05-19 17:09:39 +02:00
Olivier Goffart
f595fc2f9c
Fix opening external links for some labels
...
Issue #3135
2015-05-15 18:44:19 +02:00
Markus Goetz
06c889630c
AccountState: Run only a single validator, allow error message overriding #3236 #3153
2015-05-15 12:27:35 +02:00
Markus Goetz
8a39748654
SyncJournalDB: Don't use NULL value
...
Olivier says we should try to not be the same as the possible value
for not existing entries.
2015-05-13 14:57:14 +02:00
Markus Goetz
3556ed416c
SyncJournalDB: Simplify code
2015-05-13 13:15:53 +02:00
Olivier Goffart
d7fa03cf2e
Systray menu: consider multiple account to choose the status
2015-05-13 13:10:14 +02:00
Markus Goetz
e5e2ce2b22
SyncEngine: Force re-read of folder Etags for upgrades from 1.8.0 and 1.8.1
...
This is a better fix than the previous one for the local-files-missing bug
because it does not depend on the sync run to run fully through.
2015-05-13 12:54:49 +02:00
Olivier Goffart
af94e8943d
Systray menu: show one entry per account to open in a browser
2015-05-13 12:54:31 +02:00
Markus Goetz
39d103adf7
OwnSql: Fix numRowsAffected()
2015-05-13 12:54:03 +02:00
Jakob Nixdorf
a0e3858a7c
Install architecture-independent files to DATADIR.
...
Change the installation target for the translations and the .desktop
file to the architecture-independent DATADIR.
2015-05-13 09:54:01 +02:00
Markus Goetz
08184d07cf
Merge branch '1.9'
2015-05-12 23:03:45 +02:00
Markus Goetz
ac0e08cc91
Merge branch '1.8' into 1.9
2015-05-12 23:02:58 +02:00
Olivier Goffart
76166c6252
SyncEngine: Fix comment
...
A comment should descibe the code, and not a patch.
2015-05-12 17:53:02 +02:00
Olivier Goffart
dd5a49bc78
Application: Disable to workaround of QLockFile bug for Qt versions that are fixed
2015-05-12 17:26:32 +02:00
Markus Goetz
2a45ebde33
Networkjobs: Fix Qt 4 compile (again)
2015-05-12 17:19:17 +02:00
Markus Goetz
cdfafa2180
Propagator: Mention name of conflict file (for debugging)
2015-05-12 17:11:21 +02:00
Olivier Goffart
299fa2dee6
FolderMan: fix a #warning in the migration path
2015-05-12 16:49:37 +02:00
Olivier Goffart
c2dacd03a5
BandwidthManager: fix warnings
...
Unused variables
2015-05-12 16:35:27 +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
389c4f8ef9
AccountManager: remove unused variable
2015-05-12 15:38:16 +02:00
Olivier Goffart
3a7bd3f95c
AccountManager: save the config after removing an account
2015-05-12 15:37:16 +02:00
Olivier Goffart
1136b969b2
Folder: fix compilation after merge
2015-05-12 15:27:20 +02:00
Olivier Goffart
716b0c68da
Merge remote-tracking branch 'origin/master' into new-ui
2015-05-12 15:20:40 +02:00
Olivier Goffart
1edd46b995
Multi-Account: add possibility to delete an account
2015-05-12 15:16:32 +02:00
Markus Goetz
00a075b0d8
Merge branch '1.9'
2015-05-12 13:49:55 +02:00
Markus Goetz
3b34d5b54e
Account: Fix Qt4 compile
2015-05-12 13:49:07 +02:00
Jocelyn Turcotte
0f51de20c4
Fix the neon build
2015-05-12 13:04:47 +02:00
Jocelyn Turcotte
ea39e457f5
Fix the build
2015-05-12 10:35:57 +02:00
Daniel Molkentin
b54f2b3b31
Merge remote-tracking branch 'origin/1.9'
...
Conflicts:
VERSION.cmake
src/libsync/propagatedownload.cpp
src/libsync/propagateupload.cpp
2015-05-12 10:03:38 +02:00
Daniel Molkentin
a36df4aa4b
Merge remote-tracking branch 'origin/1.8' into 1.9
2015-05-12 09:57:22 +02:00
Markus Goetz
9e7779a476
Bandwidth Manager: Comment out qDebug
...
We have not received any grave bug reports for it, not needed anymore.
2015-05-11 16:07:34 +02:00
Markus Goetz
625e61516f
Propagator: Limit length of temporary file name #2789 (fixup)
...
Fix 22c35c4d15
2015-05-11 15:42:35 +02:00
Klaas Freitag
41614ec851
Application: ifdef lock file issue as it only happens on Qt>5.1
...
However, the fix breaks Qt4 compile, so it needs to be ifdefed.
Not viel hilft viel.
2015-05-11 13:35:04 +02:00
Markus Goetz
22c35c4d15
Propagator: Limit length of temporary file name #2789
2015-05-08 16:42:03 +02:00
Christian Kamm
9507bb4be6
ShareDialog: Password ui fixes. #3189
...
* Change the textedit-empty text to be just "Password"
* Hide the 'Copy link' button when the share isn't created yet
* Show the checked and disabled 'Password required' checkbox
when a password is required.
2015-05-08 14:53:38 +02:00
Markus Goetz
f2004da867
SSL: Re-use encryption session for different TCP connections #3159
...
This also improves the SSL configuration creation and fixes #3027
2015-05-08 14:21:27 +02:00
Christian Kamm
e1c370a9a2
Fix startup hang by removing QSettings lock file. #3175
...
In some situations the .lock file would stay around and
cause subsequent starts of the client to get stuck before
showing the ui.
2015-05-08 14:02:44 +02:00
Christian Kamm
b9eafaaf24
Wizard: Allow SSL cert dialog to show twice. #3168
...
Normally we never ask twice for the same url, but in the setup wizard
it makes sense to do so.
2015-05-08 12:32:14 +02:00
Christian Kamm
909368025f
ProtocolWidget: Fix rename message. #3210
...
For remote renames that are replicated locally the _file member is
overwritten by the target file name when the new entry is added to
the metadata table. Using _originalFile here guarantees that
the affected local file is mentioned.
2015-05-08 11:33:34 +02:00
Markus Goetz
0359c775e0
Discovery: Test better, treat invalid hrefs as error #3176
2015-05-07 17:19:48 +02:00
Jocelyn Turcotte
1053153ec4
Fix the Qt4 build
...
Following a6500d8068
Qt4's moc doesn't expand macros and wouldn't evaluate QT_VERSION_CHECK.
2015-05-07 14:49:01 +02:00
Christian Kamm
79ac61684c
Propagator: Overwrite local data only if unchanged. #3156
2015-05-07 14:43:33 +02:00
Christian Kamm
441eca86c4
ShareDialog: Improve error reporting for share API fails.
...
This would have made debugging #3204 and #3136 easier.
2015-05-07 14:16:13 +02:00
Markus Goetz
f07d3d069e
Updater on OS X: Only allow if in /Applications #2931
2015-05-07 13:04:25 +02:00
Markus Goetz
e300e3c744
Wizard: Fix lock icon #1447
2015-05-07 13:04:25 +02:00
Christian Kamm
73e2254a80
AccountState: Treat *any* 503 as a temporary error. #3113
2015-05-07 09:21:52 +02:00
Jocelyn Turcotte
7ea1baaf2d
Merge pull request #2920 from remixtj/utility_SHGetKnownFolderPath
...
Use dynamic library loading for detecting the correct path for links
2015-05-06 17:22:46 +02:00
Daniel Molkentin
77a28a81eb
Bump to 1.9
2015-05-06 17:01:05 +02:00
Jocelyn Turcotte
a6500d8068
Work around the Qt PUT corruption bug with Qt < 5.4.2 #2425
...
Since QNonContiguousByteDeviceThreadForwardImpl::reset will
call UploadDevice::reset with a BlockingQueuedConnection, this
allows us to reset the HTTP channel along with its buffers
before they get the chance to be reused with a subsequent request.
2015-05-06 16:56:50 +02:00
Luca Lorenzetto
027365aaa6
Additional code cleanup
2015-05-06 15:09:41 +02:00
Jocelyn Turcotte
58867baf33
Merge pull request #3183 from christian-burger/fix-for-windows-explorer-extension-when-syncing-whole-drive
...
Windows Explorer: fix issues when syncing whole drive.
2015-05-06 14:54:19 +02:00
Daniel Molkentin
bceb40ed80
Disable setSslConfiguration calls for older Qt version
...
This is only required for client certs, which currently have
no GUI anyway and are experimental.
2015-05-06 11:20:16 +02:00
Daniel Molkentin
f315423811
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
2015-05-06 10:04:22 +02:00
Christian Kamm
9e3c3353bd
IgnoreListEditor: Remove invalid connect. #3201
...
This has been around ever since the ignore editor was
added and the slot never existed.
2015-05-06 09:34:45 +02:00
Christian Burger
79f7ea0965
refactoring as requested in pull request
2015-05-05 16:34:01 +01:00
Markus Goetz
07ffff3d77
SyncEngine: Fix accidental re-discovery because of broken version table
...
Bug had been triggered by d63abef718
Broken version table in there since some time it seems like.
2015-05-05 17:07:13 +02:00
Luca Lorenzetto
f3bdfef9cf
Integrating feedbacks provided by jturcotte
2015-05-05 16:42:34 +02:00
Daniel Molkentin
bfba6f752c
Remove dead code
2015-05-05 10:23:59 +02:00
Klaas Freitag
d63abef718
SyncEngine: Handle upgrade case from 1.8.0
...
If 1.8.0 caused missing data in the local tree, this patch gets it
back. For that, the usage of the journal for remote repository is
disabled at the first start.
2015-05-04 13:40:25 +02:00
Christian Burger
018cc54a94
Windows Explorer: fix issues when syncing whole drive.
...
When the local sync target is just a drive letter (e.g. "X:\"), neither
the display of the sync status via file icon overlay, nor the creation of a
share link works. In the latter case no pop-up comes up and no server
request is done.
QDir::cleanPath() usually removes trailing slashes, but not if the path to
be cleaned is just "X:\". In that case the trailing slash is kept. This
commit accounts for that exception.
2015-05-04 10:29:25 +01:00
Markus Goetz
4700c604b1
Proxy: Register meta type #3170
2015-04-29 14:54:08 +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
Olivier Goffart
e5ad1b27b4
Settings dialog: show the first account page at start
2015-04-28 11:39:27 +02:00
Olivier Goffart
92e259c276
Add folder: Do not add at other accounts folder to know if you can add a folder
2015-04-28 11:29:35 +02:00
Olivier Goffart
f81918173b
Account settings: show the folder of the right account
2015-04-27 19:09:48 +02:00
Olivier Goffart
4006bcdaed
Wizard: Setup the folder in the right account
2015-04-27 17:43:07 +02:00
Olivier Goffart
3e4886725a
Folder: remove the member references to the FolderDefinition members
2015-04-27 17:33:59 +02:00
Olivier Goffart
f688bda759
Wizard: Save the settings after adding an account
...
So the account persist even if the client is not properly closed
2015-04-27 17:19:46 +02:00
Olivier Goffart
ac855858de
owncloud gui: move a comment where it belongs
...
The code was moved long time ago in commit ea1c95100
but the comment
stayed. I have no idea if the comment is still accurate
2015-04-27 17:14:25 +02:00
Olivier Goffart
ae17f58b80
HTTP Creds: Do not send the password at every request
2015-04-27 16:28:37 +02:00
Olivier Goffart
23dc464ea2
Folderman: Fix crash when adding an account
...
Clang is picky if we forget to return a value
2015-04-27 14:34:39 +02:00
Olivier Goffart
04382c467b
Progress: Fix broken signal connection
2015-04-27 12:34:15 +02:00
Olivier Goffart
be1b39067d
Merge branch 'master' into new-ui
2015-04-27 12:32:12 +02:00
Olivier Goffart
ddfb7f3b7a
Merge remote-tracking branch 'origin/1.8'
2015-04-27 12:20:11 +02:00
Christian Kamm
78e82eb920
AccountWizard: Fix auth error handling. #3155
...
The problem was that on network error the networkError() and
finishedWithError() signals both fired. To fix it, I collapse all
error handing into a slot triggered by finishedWithError().
I tested the redirection case and the invalid credentials case.
2015-04-24 16:03:28 +02:00
Christian Kamm
27159104a9
Folders: Store inside account config.
2015-04-24 13:42:35 +02:00
Christian Kamm
a13a974e2d
Account: Generate shorter account ids.
2015-04-24 09:54:42 +02:00
Markus Goetz
3a52db46ad
Discovery: Fix another empty-local-directory bug
2015-04-23 16:15:13 +02:00
Christian Kamm
f184d66ea2
Save and restore multiple accounts.
2015-04-23 16:08:20 +02:00
Christian Kamm
11927d625d
Fix crash on exit by not making Account parent of AccountState.
2015-04-23 16:08:20 +02:00
Christian Kamm
abfdc574d4
Add a basic random Account::id()
2015-04-23 15:47:49 +02:00
Christian Kamm
d64373c610
Never use 'new Account' directly, prefer Account::create()
2015-04-23 15:47:49 +02:00
Christian Kamm
28306e5dfb
Move AccountState::displayName to Account.
2015-04-23 15:47:49 +02:00
Christian Kamm
89bb58ac30
Ensure 'user' is available early enough for ui in httpcreds
2015-04-23 15:47:49 +02:00
Christian Kamm
3cc2e1a968
Fix bad connect/disconnects.
2015-04-23 14:24:54 +02:00
Christian Kamm
8390b0b930
Determine right account in ownCloudGui::slotShowShareDialog
2015-04-23 14:14:28 +02:00
Christian Kamm
dbddabfcd7
Remove SelectiveSyncText
...
It is unused and there were compiler warnings about it not
appearing it various switch() statements.
2015-04-23 14:13:33 +02:00
Christian Kamm
0d30e01e98
Add explanations to fixmes
2015-04-23 14:13:13 +02:00
Markus Goetz
137bce6dd0
Folder: Clear _syncResult better
...
I had a situation here where we were showing stale desktop notifications when a remote folder
errored out and then sync finished with _syncResult data from previous sync.
2015-04-23 13:30:30 +02:00
Christian Kamm
7c1281dd06
Windows: Fix rename of finished file. #3073
...
The file was still open and therefore couldn't be renamed...
2015-04-22 14:46:04 +02:00
Christian Kamm
68bf22f469
Revert "AccountSettings: Update progress only twice per second. #3014 "
...
This reverts commit 0f33e266ce
.
The change was not meant to be merged, see discussion in #3014 .
2015-04-22 11:46:00 +02:00
Christian Kamm
96ecdb866d
Time estimate: Refactor remaining time guess. #2328
2015-04-22 11:20:31 +02:00
Christian Kamm
7d68c628db
Time estimation: Use a consistent check for size dependence. #2328
2015-04-22 10:45:41 +02:00
Christian Kamm
509b83e73e
Time estimation: Avoid a progress reset before finish. #2328
...
The current algorithm doesn't care much, but resetting progress
to 0 just before completing a job is confusing anyway.
2015-04-22 10:45:41 +02:00
Christian Kamm
0f33e266ce
AccountSettings: Update progress only twice per second. #3014
2015-04-22 10:45:41 +02:00
Markus Goetz
6c5ca055c4
ShareDialog: Unused/invalid forward declaration
2015-04-21 10:33:38 +02:00
Olivier Goffart
cf5100a20b
Merge remote-tracking branch 'origin/1.8'
2015-04-20 14:58:45 +02:00
Jocelyn Turcotte
ffbf2fb6ce
Fix the neon build
2015-04-20 11:31:02 +02:00
Olivier Goffart
b039c2ce86
More change to compile with 5.5
...
The problem is again that QStringList no longer include QDataStream
2015-04-20 09:47:25 +02:00
Olivier Goffart
ba65187ad3
Fix compilation with Qt 5.5
...
Because of commit 90e7cc172a7521396bb2d49720ee4ceb9a9390b3 in qtbase,
we now need to explicitly include QDataStream
Fixes #2809
2015-04-19 11:02:43 +02:00
Jocelyn Turcotte
12d7484b85
Pass SyncFileItems by pointer instead of by value
...
Use a QSharedPointer to keep the same ownership and
continue passing the SyncFileItems as a const& when
ownership isn't taken. This allows sharing the same
allocations between the jobs and the result vectors.
This saves about 20MB of memory (off 120MB) once all
jobs are created.
2015-04-18 14:26:40 +02:00
Olivier Goffart
a932eac832
Multi-account WIP
2015-04-17 17:56:17 +02:00
Jocelyn Turcotte
155c965866
Prevent another crash in ~SocketApi #3118
...
Since the QLocalServer parent of the QLocalSockets gets destroyed
after the _listeners QList, onLostConnection might try to update
an already destroyed list.
Fix the issue by simply making sure that _localServer is destroyed
first.
2015-04-17 12:42:40 +02:00
Olivier Goffart
6c73f25747
HTTP creds: Fix translation of the password input dialog
...
tr() needs Q_OBJECT
2015-04-17 12:19:37 +02:00
Olivier Goffart
2da3bfb96f
Merge branch 'master' into new-ui
2015-04-16 12:50:21 +02:00
Olivier Goffart
5dffd11755
Merge branch '1.8'
2015-04-16 12:49:31 +02:00
Olivier Goffart
8bb4af067a
Propagate download: Fix restoring files for which the conflict file exists
...
For issue #3106
1) Always use the actual timestamp from the file in the file system
to create the conflict file. This is important because if one edit a
file several time, they should have different name. Also it makes more
sens to have the mtime of the modified file.
2) Give the correct size to the job so we know when the temporary file
is complete in case of resuming.
2015-04-16 11:36:01 +02:00
Olivier Goffart
458f336405
PropagateDownload: Read the mtime from the file system after writing it
...
Because file system like FAT only have two second accuracy and would result
in a upload if the mtime in the database is not the same as the one that was
downloaded
Issue #3103
2015-04-15 15:50:20 +02:00
Markus Goetz
7c9cffa5ae
ConfigFile: Remove unused functions
2015-04-15 14:58:27 +02:00
Daniel Molkentin
ed80a712ab
Sort folder sizes SelectiveSyncTreeView numerically
...
Fixes #3112
2015-04-14 20:00:42 +02:00
Markus Goetz
2866e56c51
LsColXMLParser: More testing 2
2015-04-14 14:56:25 +02:00
Klaas Freitag
4283ab3b44
LsColJob: Create a XML parser object for better unit testability.
2015-04-14 13:43:05 +02:00
Klaas Freitag
c579069071
LsColXMLParser: let parse return bool.
2015-04-14 13:41:51 +02:00
Markus Goetz
9ffacd4ecd
Discovery: Explicitly check for XML parser errors
...
..instead of relying that our state machine does not do anything in that case.
2015-04-13 16:04:24 +02:00
Markus Goetz
9d5f5ea3bc
Discovery: Initialize error with EIO in constructor
...
This is safer, initializing it in remote_vio_opendir_hook was enough though.
2015-04-13 15:54:08 +02:00
Markus Goetz
2dbd27af76
Discovery: Initialize error with EIO
2015-04-13 15:36:07 +02:00
Markus Goetz
0634a4d0c6
Discovery: Add a sanity check when results are parsed
2015-04-13 15:10:04 +02:00
Klaas Freitag
7b99877c68
owncloudcmd: Filter out empty lines in selectivesync
2015-04-12 12:59:25 +02:00
Klaas Freitag
ec81cdefb0
Networkjobs: Only log a subset of the account url.
...
This avoids disclosing of user and password in the logfile which can
happen in some cases.
2015-04-12 12:37:14 +02:00
Christian Kamm
9d8fc4aa4d
ProtocolWidget: Fix adding of seconds. #2535
2015-04-10 12:11:35 +02:00
Christian Kamm
57ac1d9ea2
AuthRedirect: Use the configured DAV path. #3082
2015-04-10 09:24:25 +02:00
Christian Kamm
d9ea6936ab
Handle redirect of auth request. #3082
2015-04-10 09:18:15 +02:00
Olivier Goffart
afdd01488f
AccountManager: Move out of libsync
...
The AccountManager does not belong in the libsync because it is not
part of the synchronisation algorithm, but is just an helper class
for the UI to maintain the account and read/save the config
2015-04-09 16:19:17 +02:00
Olivier Goffart
f3cb5f8a9d
Merge remote-tracking branch 'origin/1.8'
2015-04-09 14:24:26 +02:00
Olivier Goffart
85ff245aef
Account settings: add the progress back on the new ui
2015-04-09 12:06:47 +02:00
Christian Kamm
adcf40afc3
Discovery: Speed up initial run. #2796
2015-04-08 15:43:49 +02:00
Christian Kamm
d986011067
Sync: Fix sync of deletions during 503. #2894
2015-04-08 10:50:08 +02:00
Roeland Jago Douma
5a83636f81
Only show share dialog if we are connected.
2015-04-08 09:53:57 +02:00
Jocelyn Turcotte
4a890eae38
SyncEngine: Fix a crash caused by an invalid DiscoveryDirectoryResult::iterator #3051
...
The default constructor of the iterator points to NULL, which makes
it != end() but invalid to dereference.
Use an integer index instead to keep 0 as a valid default value that
can always correctly be checked against size().
Also make sure that no data is shared between threads by making the
csync_vio_file_stat_t copyable and passing it as const.
2015-04-08 09:35:43 +02:00
Christian Kamm
760e11bc5d
Sharedialog: Fix compiler warnings.
2015-04-08 08:59:36 +02:00
Klaas Freitag
4a6f4919d7
More GUI refinements.
2015-04-07 13:38:01 +02:00
Klaas Freitag
b98040c7d5
ShareDialog: handle resize properly with elided text
2015-04-07 13:38:01 +02:00
Klaas Freitag
1240a8163d
ShareDialog: Some GUI rework requested by Jan.
2015-04-07 13:38:01 +02:00
Olivier Goffart
e15b9b5358
Merge remote-tracking branch into 1.8
2015-04-07 10:42:27 +02:00
Olivier Goffart
1617c9d482
PropfindJob: fix xml parsing
...
It would only find the first property
2015-04-07 10:35:27 +02:00