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
Olivier Goffart
b59fc39d13
Fix warnings about unused parametters
2015-07-16 18:15:07 +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
Daniel Molkentin
770ca77673
Merge pull request #3467 from owncloud/remove_nsis_appdata_page
...
Win32: Remove confusing option to remove AppData
2015-07-16 17:09:51 +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
Daniel Molkentin
d53eaf8fd6
Win32: Remove confusing option to remove AppData
...
- This only works for the current user (while being a HKLM installer)
- The naming is confusing.
Fixes #3461
2015-07-16 16:22:00 +02:00
Daniel Molkentin
2bcfb734b0
Change repo for src/3rdparty/qtmacgoodies
...
Changes required by 3d55191573
are not yet in shadone's upstream repo
2015-07-16 15:09:48 +02:00
Daniel Molkentin
50bf0ee85e
Change repo for src/3rdparty/qtmacgoodies
...
Changes required by 3d55191573
are not yet in shadone's upstream repo
2015-07-16 15:08:17 +02:00
Klaas Freitag
951c9812f1
CPack: Use APPLICATION_SHORTNAME rather than APPLICATION_NAME
...
especially at places where the file system is hit. APPLICATION_NAME
may contain colons and other strange chars. APPLICATION_SHORTNAME
has to be a clean name.
This fixes client#3445
2015-07-16 14:38:59 +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
c72b6fb8e6
csync_update: Reorg the code a bit to make it easier to read and understand
2015-07-15 15:54:41 +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
ddf7419aca
csync: Initialize the hidden files flag properly.
2015-07-15 15:54:41 +02:00
Klaas Freitag
27e0f9d132
csync: Updated and added some documentation.
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
e11f59af32
csync_update: store the remote ignore information into tree (from tmp)
...
This way the propagator is able to skip a remove if ingored files are
exiting.
2015-07-15 15:49:27 +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
c940762b7c
csync_update: set has_ignored_files in case of hidden files.
...
Re-arragned the code a bit for better overview on whats happening.
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
Klaas Freitag
e0abbc0b83
vio_local: Properly detect if files are hidden.
...
On Linux and Mac, check for the leading dot. On Windows,
there is an flag set in the result struct of fetFileInformationByHandle.
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
Christian Kamm
3b0f76f853
Fix test build... again.
...
The issue was unrelated to moc! We just need to make sure QT_VERSION
etc. are actually defined when we use them for a test!
2015-07-15 09:47:42 +02:00
Christian Kamm
89df528090
Fix test build.
...
The older moc doesn't expand macros and wouldn't evaluate
QT_VERSION_CHECK.
2015-07-15 09:26:39 +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
371fc0ffa2
Qt4 test build: QTemporaryDir only exist since Qt5
...
Disable that test for older versions of Qt
2015-07-14 15:06:42 +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
Markus Goetz
cd64d3ae2c
CSync: Split csync_vio_local.c
...
This is to make room for further improvements #880
2015-07-13 15:54:09 +02:00
Olivier Goffart
aabad22cef
Wizard: show an error if the folder already exists
...
Issue #3444
2015-07-13 15:37:01 +02:00