Kirill Bychkov
7786f1f9a9
Fix linking with libinotify on OpenBSD.
2015-08-13 09:44:55 +03:00
Jenkins for ownCloud
28c732af33
[tx-robot] updated from transifex
2015-08-13 02:19:00 -04:00
Jenkins for ownCloud
5429ab4a85
[tx-robot] updated from transifex
2015-08-13 01:15:36 -04: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
Individual IT Services
c6ff73f3e5
checking if file or folder is to be shared to fix issue #3556
2015-08-12 21:48:04 +05:45
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
Jenkins for ownCloud
00c56aab02
[tx-robot] updated from transifex
2015-08-12 02:18:50 -04: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
Jenkins for ownCloud
cfb16a6eef
[tx-robot] updated from transifex
2015-08-11 02:18:58 -04: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
Daniel Molkentin
3ce210f298
Merge pull request #3578 from owncloud/LukasReschke-patch-1
...
Use HTTPS links
2015-08-10 12:29:23 +02:00
Lukas Reschke
f74053f8ed
Use HTTPS links
...
No need to have an additional redirect
2015-08-10 12:15:45 +02:00
Jocelyn Turcotte
854bfb870d
Revert "Silence verbose cmake policy warnings on Windows"
...
This causes an error since those policies aren't known by
2.8.12, so better seeing those warnings on Windows for now.
This reverts commit 4441d3b342
2015-08-10 11:57:05 +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
Jocelyn Turcotte
4441d3b342
Silence verbose cmake policy warnings on Windows
2015-08-10 09:55:29 +02:00
Jenkins for ownCloud
147c59c6d8
[tx-robot] updated from transifex
2015-08-10 02:18:43 -04:00
Jenkins for ownCloud
f36b95d6b0
[tx-robot] updated from transifex
2015-08-10 01:15:25 -04:00
Jenkins for ownCloud
0ca5f4a382
[tx-robot] updated from transifex
2015-08-09 02:18:46 -04:00
Jenkins for ownCloud
60863b14bb
[tx-robot] updated from transifex
2015-08-08 02:18:35 -04:00
Jenkins for ownCloud
06515d4e96
[tx-robot] updated from transifex
2015-08-08 01:15:24 -04: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
df625f0d49
Make version check test conditional for now
2015-08-07 12:42:18 +02:00
Olivier Goffart
68cff5cd10
Merge branch '2.0'
2015-08-07 11:31:44 +02:00
