Markus Goetz
4784b327e7
Folder Status: Use same fat ... icon as web
2015-11-06 16:10:50 +01:00
Markus Goetz
1a1541ecd6
macdeployqt: Forgot comma
2015-11-06 15:18:14 +01:00
Klaas Freitag
cf9fec73cf
ActivityView: Add a second treeview for sync issues.
...
So there are three views now: One displaying the server activities, one for
the sync protocol and a third one for ignored files and issues.
2015-11-06 11:43:43 +01:00
Klaas Freitag
a1551ef6ab
ActivityDelegate: Make the row height public accessible.
...
Now it can be used to be set on the other two treeviews.
2015-11-06 11:41:32 +01:00
Markus Goetz
0163839cfb
OS X: Fix toolbar oddity #3719
2015-11-06 10:18:09 +01:00
Roeland Douma
914a942e33
Merge pull request #4055 from owncloud/user_group_sharing
...
User group sharing
2015-11-06 09:35:42 +01:00
Jenkins for ownCloud
5e482ad4f7
[tx-robot] updated from transifex
2015-11-06 02:19:01 -05:00
Markus Goetz
6901fc9e38
macdeployqt: Also copy bearer plugins
...
See #3449
2015-11-05 18:15:45 +01:00
Markus Goetz
0070835330
macdeployqt: Hack to make Qt 5.5 work
2015-11-05 17:19:49 +01:00
Roeland Jago Douma
6431a2aa46
[Sharing] Build sharee list on every search
2015-11-05 15:01:29 +01:00
Niels van Adrichem
572d9bdf1a
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/gui/share.h
2015-11-05 14:42:26 +01:00
Roeland Jago Douma
4cf2422a83
[Sharing] Clear completer on activation
2015-11-05 13:16:52 +01:00
Roeland Jago Douma
806ec98eab
[Sharing] Properly delete widget
2015-11-05 13:10:32 +01:00
Roeland Jago Douma
20fd349e17
[Sharing] Filter sharee list properly
...
You can't share with a user/group that you've already shared with
You can't share with yourself
2015-11-05 12:30:34 +01:00
Markus Goetz
dae724b21c
QtVersionAbstraction: Quick not neeed on OS X
2015-11-05 11:35:42 +01:00
Roeland Jago Douma
3e4612a1f0
[Sharing] Reorganized sharedialog code
...
Now we have 1 simple dialog that includes 2 widgets.
* ShareLinkWidget (for link shares)
* ShareUserGroupWidget (for user/group shares)
The ShareUserGroupWidget is only included if the server version is >=
8.2.0
For <8.2.0 the old behavior is preserved
2015-11-05 09:58:16 +01:00
Jenkins for ownCloud
6052e49bcc
[tx-robot] updated from transifex
2015-11-05 02:19:06 -05:00
Roeland Jago Douma
90cbd461ab
[Sharing] Allow sharing with users/groups from desktop
2015-11-04 22:00:35 +01:00
Lukas Reschke
517f2ed03d
Add coverity badge
2015-11-04 21:06:48 +01:00
Daniel Molkentin
5fccc25f36
Fix Qt4 build
2015-11-04 19:28:54 +01:00
Klaas Freitag
cb1571c6c5
ActivityWidget: Rather use accountState pointer directly.
...
Do not use it via a smart pointer class.
2015-11-04 16:40:22 +01:00
Markus Goetz
99b0d659bd
Merge pull request #4073 from RealRancor/backport_4052_2.0
...
Backport #4052 to 2.0
2015-11-04 16:32:34 +01:00
RealRancor
854264c3d2
Backport #4052 to 2.0
2015-11-04 15:55:07 +01:00
Markus Goetz
d2a6cae695
Merge pull request #4052 from RealRancor/fix_autoupdate
...
Make registry key a code block in autoupdate docs.
2015-11-04 15:11:45 +01:00
Markus Goetz
be9ed2f6a9
Merge pull request #4058 from owncloud/client-updates
...
some doc fixes & updates
2015-11-04 15:11:28 +01:00
Markus Goetz
3ee8beb8a3
Exclude: Add .nfs*
...
From eltrai at #4017
2015-11-04 15:06:05 +01:00
Jenkins for ownCloud
f816e5e2af
[tx-robot] updated from transifex
2015-11-04 08:32:32 -05:00
Jenkins for ownCloud
448d8bff18
[tx-robot] updated from transifex
2015-11-04 08:30:20 -05:00
Daniel Molkentin
b82ffb52c7
Merge remote-tracking branch 'origin/2.0'
2015-11-04 14:25:14 +01:00
Klaas Freitag
3bccfb8993
ActivityView: Add information about the account.
2015-11-04 13:22:03 +01:00
Roeland Jago Douma
6fb4e59120
[Sharing] First step towards proper group sharing
2015-11-04 12:56:06 +01:00
Roeland Jago Douma
309be57a12
[Sharing] Add user/group sharing dialog
...
Dialog can now retrive current shares for path, set the permissions on
those shares and delete the share.
2015-11-04 12:53:07 +01:00
Roeland Jago Douma
37098c96f9
[Sharing] Add setpermission to sharing code
...
For user/group/remote shares we were just missing the setPermissions
functionality
2015-11-04 12:53:02 +01:00
Jenkins for ownCloud
03cc67a2b1
[tx-robot] updated from transifex
2015-11-04 02:19:04 -05:00
Klaas Freitag
cb4fba7658
ActivityWidget: Created a delegate for prettier display of the activities
2015-11-03 17:54:37 +01:00
Niels van Adrichem
0bcb13f02e
Fixxed compile error on src/gui/share.h
2015-11-03 13:44:59 +01:00
Niels van Adrichem
42ef09e3bb
Updated documentation for Non Shibboleth authentication and customized WebDAV Paths
2015-11-03 13:43:26 +01:00
Niels van Adrichem
1ab44655e0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/cmd/cmd.cpp
2015-11-03 11:58:45 +01:00
Jenkins for ownCloud
89734b95c4
[tx-robot] updated from transifex
2015-11-03 02:19:04 -05:00
Niels van Adrichem
8f5658bc01
Added Non Shibboleth WebDAV authentication and Dav Path customization to owncloudcmd
2015-11-02 22:57:17 +01:00
Carla Schroder
a59c3ef278
some doc fixes & updates
2015-11-02 11:18:31 -08:00
Klaas Freitag
b600ac882a
ActivityListModel: Add method to refresh one Account (WIP)
2015-11-02 17:52:04 +01:00
Klaas Freitag
71849c4372
ActivityListModel: Add the page and pagesize parameter to ocs query.
2015-11-02 17:51:12 +01:00
Klaas Freitag
9545af0d43
JSONApiJob: Add method to add additional query parameter.
2015-11-02 17:37:23 +01:00
Klaas Freitag
6c6ee358d4
ActivityListModel: Check if the account is connected when fetching more.
2015-11-02 16:39:33 +01:00
Klaas Freitag
060f4f291b
SettingsDialog: Add a tab with the SyncProtocol to ActivityWidget.
2015-11-02 15:46:00 +01:00
Klaas Freitag
3fb43d2322
ActivityWidget UI: Remove the preconfigured tabs from the tabwidget.
...
It is better to create the tabs from the code in SettingsDialog.
2015-11-02 15:45:17 +01:00
Klaas Freitag
4895683bab
ActivityWidget: Do a proper asynchronous model to display the activity.
2015-11-02 15:44:13 +01:00
Klaas Freitag
43800e3d1c
Merge pull request #4049 from Naereen/patch-1
...
Reviewing, improved style, and a initializing message
2015-11-02 10:14:07 +01:00
Klaas Freitag
3b8e1dcd89
SettingsDialog: Make ActivityWidget a member.
2015-11-01 22:30:46 +01:00
