Jenkins for ownCloud
d9af837974
[tx-robot] updated from transifex
2015-11-07 02:19:09 -05:00
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
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
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
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
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
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
Jenkins for ownCloud
89734b95c4
[tx-robot] updated from transifex
2015-11-03 02:19:04 -05: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
Jenkins for ownCloud
3f85694394
[tx-robot] updated from transifex
2015-11-01 02:18:55 -05:00
RealRancor
8c5ef2f1c3
Make registry key a code block in autoupdate docs.
2015-10-31 19:05:21 +01:00
Lilian Besson
aa1a2d1247
Reviewing, improved style, and a initializing message
...
- Add an "Initializing owncloud-client-nautilus extension" message
2015-10-31 13:07:18 +01:00
Olivier Goffart
3993a7f636
OwnSQL: add asserts in case of error that should not happen
2015-10-30 14:05:58 +01:00
Olivier Goffart
aaf16ff0e8
SyncJournalDB, clear all the queries before closing the database
2015-10-30 14:03:08 +01:00
Olivier Goffart
16c078963b
owncloudcmd: add --max-sync-retries #4037
...
And limit by default to 3 retries
2015-10-30 13:36:31 +01:00
Olivier Goffart
0c467ef5b4
Sync engine: fix signal/slot connection
2015-10-30 13:21:34 +01:00
Olivier Goffart
49cd53ee44
FolderStatusModel: attempt to detect removed undecided files #3612
2015-10-30 12:43:33 +01:00
Olivier Goffart
0e6a463564
Discovery: Don't leak DiscoveryDirectoryResult in case of error
...
Also remove redundent Q_FUNC_INFO
2015-10-30 12:43:33 +01:00
Roeland Douma
d38b190317
Merge pull request #4033 from owncloud/share_object
...
Add share manager and the share objects
2015-10-30 11:01:03 +01:00
Klaas Freitag
29558cb7bb
Merge pull request #4040 from owncloud/phil-davis-changelog-master
...
ChangeLog typos that reverted in merge from 2.0
2015-10-30 10:36:38 +01:00
Jenkins for ownCloud
d2cd237e25
[tx-robot] updated from transifex
2015-10-30 02:19:00 -04:00
Roeland Jago Douma
c7b814337a
Use proper QFlags
...
Now the ShareTypes and Permissions are part of the Share class (which is
a bit better abstracted away).
2015-10-29 21:47:47 +01:00
Phil Davis
ced51813c7
ChangeLog typos that reverted in merge from 2.0
...
Hopefully the last place I need to submit this again :)
2015-10-29 23:35:48 +05:45
Roeland Jago Douma
dd8d02b8ef
Act properly if OCS endpoint returned an error (OCS error)
...
For now pass it on to the gui. So at least they know something is wrong.
2015-10-29 16:56:23 +01:00
Olivier Goffart
c3cf6aef7d
SyncEngine: Don't whipe the white list if the sync was aborted
...
Issue #4018
2015-10-29 16:47:39 +01:00
Olivier Goffart
38a8e5ee03
Discovery: conding style: use const references for function parameters
2015-10-29 16:47:36 +01:00
Klaas Freitag
46269dac4e
Merge branch '2.0'
...
Conflicts:
ChangeLog
2015-10-29 16:34:15 +01:00
Roeland Jago Douma
8c0297f688
Use QLatin1Char
2015-10-29 16:03:47 +01:00
Klaas Freitag
bc5890d8b5
Add version suffix git.
2015-10-29 15:46:02 +01:00
Klaas Freitag
ee65315520
Merge branch '2.0.2' into 2.0
...
Conflicts:
ChangeLog
2015-10-29 15:44:56 +01:00
