Daniel Molkentin
7ba88cc9e3
Merge remote-tracking branch 'origin/2.0'
2015-11-17 12:57:31 +01:00
Daniel Molkentin
914df32587
Documentation: Fix PDF logo, version number
2015-11-17 12:55:41 +01:00
Olivier Goffart
e0f54428d0
ShareDialog: softer line separator ( #3737 )
2015-11-17 12:02:20 +01:00
Markus Goetz
52a11b0835
Activities: Fix on Mac #4083
2015-11-17 11:53:49 +01:00
Markus Goetz
ef17dc6482
Connectivity: Improve log output
2015-11-17 11:02:53 +01:00
Markus Goetz
9978dc3f6c
QNAM: Use invalid configuration instead of default configuration
...
For #3969 and others.
2015-11-17 11:02:53 +01:00
Olivier Goffart
f618ed3dfb
gui: Fix some icons in highdpi
...
QIcon does not need to use Theme::hidpiFileName because QIcon takes care
of the @2x images
2015-11-17 10:48:45 +01:00
Olivier Goffart
ef915fb2e5
SharedDialog: Fix the delete icon on windows and mac ( #3737 )
2015-11-17 10:40:45 +01:00
Olivier Goffart
6e42405113
ShareDialog: remove the search button ( #3737 )
2015-11-17 10:24:35 +01:00
Olivier Goffart
11ef07c74a
ActivityWidget: fix compiler warnings
2015-11-17 09:54:38 +01:00
Jenkins for ownCloud
486d7690c4
[tx-robot] updated from transifex
2015-11-17 02:19:08 -05:00
Daniel Molkentin
b3c2c594bd
Add the set of currently used patches
2015-11-16 18:35:50 +01:00
Klaas Freitag
8852911f67
Merge branch 'master' of github.com:owncloud/mirall
2015-11-16 18:16:58 +01:00
Klaas Freitag
e38bc6eab8
AcitivityWidget: Moved timespan-in-words method to utility.
...
Also added a second parameter, fixed plural translation and added
a less-than-a-minute-ago term.
2015-11-16 18:08:25 +01:00
Olivier Goffart
459e200ac0
ShareDialog: add a QScrollArea (issue #4125 )
2015-11-16 18:01:11 +01:00
Klaas Freitag
c781155b60
General Settings page: Remove the add account button.
...
It is now in the toolbox on the account page.
2015-11-16 17:07:05 +01:00
Klaas Freitag
87aa1de67a
Merge branch 'newactivity'
2015-11-16 17:02:05 +01:00
Klaas Freitag
ccb871c30b
ActivityWidget: Show the subject in the Tooltip.
...
the original text might be elided.
2015-11-16 16:44:52 +01:00
Klaas Freitag
74ed0b4f09
Merge pull request #4139 from owncloud/account_toolbox
...
AccountSettings: Add a toolbox button for the account specific actions.
2015-11-16 15:53:30 +01:00
Klaas Freitag
becbb7b284
AccountSettings: Address jans suggestions in #4139
...
- Changed sequence of menu items
- lowercased entries
- removed the "Account" from entries, its in the toolbox button already
- added a little space between toolbox button label and the rectangle.
2015-11-16 15:50:32 +01:00
Klaas Freitag
ff76a842d0
Added some documentation.
2015-11-16 15:38:08 +01:00
Klaas Freitag
a56926b8d9
ActivityWidget: open local file in file manager if exists.
2015-11-16 15:31:24 +01:00
Olivier Goffart
0d21503ee5
ShareDialog: fix auto completion to actualy auto complete
2015-11-16 15:23:02 +01:00
Klaas Freitag
631cb095dd
ActivityWidget: Show the local path in a tooltip.
...
Note that the activity has also entries of files that are not synced so
that not every activity entry has to have a local pendant.
Also, one activity entry can reference multiple files, so only the first
one is shown.
2015-11-16 15:07:02 +01:00
Klaas Freitag
caba719950
Folderman: Added method to find local files for a rel. server path.
2015-11-16 15:04:59 +01:00
Roeland Douma
786b602c26
Merge pull request #4133 from owncloud/sharedialog_uit_improvements
...
[Sharedialog] Fix UI stuff
2015-11-16 13:36:00 +01:00
Jenkins for ownCloud
f4bfce153d
[tx-robot] updated from transifex
2015-11-16 02:18:48 -05:00
Jenkins for ownCloud
e1ab50b17c
[tx-robot] updated from transifex
2015-11-14 02:19:03 -05:00
Klaas Freitag
7e4c0bd515
AccountSettings: Add a toolbox button for the account specific actions.
...
Also move the 'Add Account' button from the General Tab, where it
is not properly found, to the new account toolbox.
2015-11-13 14:50:07 +01:00
Klaas Freitag
ddcec2971e
ActivityDelegate: Gray out font if account is not connected.
...
This gives a visual indication of the account not being connected
and as a result maybe outdated activity data.
2015-11-13 12:48:25 +01:00
Roeland Jago Douma
72d119a05f
[Sharing] Delete animation when share is removed
2015-11-13 11:03:51 +01:00
Roeland Jago Douma
d423cf2c7f
[Sharedialog] Fix UI stuff
...
Implemented suggestions form
https://github.com/owncloud/client/issues/3737#issuecomment-156036279
* Removed Shares text
* Permissions now next to username
* Simplified permissions by default
* Button to get more detailed permissions
2015-11-13 10:27:26 +01:00
Jenkins for ownCloud
3d847b50cf
[tx-robot] updated from transifex
2015-11-13 02:19:01 -05:00
Klaas Freitag
731a13cfd1
ActivityWidget: Take the account state (connected or not) in account.
...
Display the activity entries in a different mode if the account is not
longer connected.
2015-11-12 17:52:00 +01:00
Klaas Freitag
81296fae9d
AccountManager: new method to return AccountStatePtr from the name.
...
It uses the Account displayName to destinguish.
2015-11-12 17:50:00 +01:00
Klaas Freitag
aa38f7a4f2
ActivityWidget: implement removeAccount.
2015-11-12 15:39:07 +01:00
Jenkins for ownCloud
bac69f9984
[tx-robot] updated from transifex
2015-11-12 02:19:14 -05:00
Klaas Freitag
c46547592c
sync excludes: Add .directory files to be ignored
2015-11-11 17:27:01 +01:00
Klaas Freitag
6123fab091
CMake version abstractions: Remove some dependencies.
...
That lets us get rid of the hard dependency on Qt tools which are
not easily available everywhere.
2015-11-11 15:24:02 +01:00
Markus Goetz
fd4a5100a6
NSIS: Include Qt bearer management DLLs #3969
2015-11-11 15:19:15 +01:00
Klaas Freitag
ff4a8c9202
GeneralSettings: Remove references to protocolwidget.
...
The ProtocolWidget is now the Activitytab Widget
2015-11-11 14:49:11 +01:00
Christian Kamm
c871d721fd
Tray tooltip: Use aliasGui #4096
2015-11-11 14:35:56 +01:00
Christian Kamm
05d1cc9a94
Sharing: Fix crash with share deletion #4111
...
The problem was that Share could be deleted *before*
the OcsShareJob itself finished. Since Share was the
parent of the network job, its object would be deleted
too early.
In general, it's unnecessary to assign parents to the OcsJobs
because they delete themselves when finished.
2015-11-11 13:28:20 +01:00
Christian Kamm
196ee05fcc
Share dialog: Initialize expected expire date #4075
2015-11-11 13:01:12 +01:00
Christian Kamm
e50cfa4e1b
Recent Activity: Don't reset for no reason #3889
2015-11-11 12:48:15 +01:00
Daniel Molkentin
3224a959a4
Forward-declare QModelIndex. Fixes Qt4 builds.
2015-11-11 11:52:10 +01:00
Christian Kamm
2ccb3648c7
Recent Activity: Filter metadata updates #3963
2015-11-11 11:19:04 +01:00
Christian Kamm
01aa647527
FolderMan: Fix infinite wait on pause #4093
...
If a folder was paused while being the next item in the scheduling
queue, the whole scheduling could get stuck.
This also fixes the progress information of paused folders possibly
getting stuck.
2015-11-11 10:59:04 +01:00
Christian Kamm
eb3388de68
Fix OwnSql test
...
3993a7f636
2015-11-11 09:42:31 +01:00
Christian Kamm
beb970646b
Fix csync_exclude test
...
The exclude file was reorganized in
b6aa18bfbc
2015-11-11 09:42:31 +01:00
