f881c11b8a
Merge pull request #21913 from owncloud/fix_resolve_user_group_share
...
[Share 2.0] Resolve to correct usergroup share
2016-01-26 15:20:03 +01:00
c090d709e7
We must resolve to the proper usergroup share
2016-01-26 14:14:54 +01:00
3da78c8f1c
Merge pull request #21901 from owncloud/fix-setup
...
Fix setup page
2016-01-26 11:42:55 +01:00
6cb95f4e42
Merge pull request #21853 from owncloud/tags-fixpropertyma
...
Fix oc:tags tag list serializer
2016-01-26 11:37:37 +01:00
5285460669
Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-change
...
Changing the avatar of the user emits the changeUser event which trig…
2016-01-26 11:37:17 +01:00
2bafb1c649
Merge pull request #21894 from owncloud/refactor-csrf
...
Add new CSRF manager for unit testing purposes
2016-01-26 11:36:56 +01:00
2ecc202843
Fix setup page
...
* fixes #21897
2016-01-26 09:05:10 +01:00
ecf2d178b1
[tx-robot] updated from transifex
2016-01-26 01:56:06 -05:00
4c9e328211
Merge pull request #21892 from owncloud/issue-21890-parameters
...
Add parameters types to IQueryBuilder
2016-01-25 21:13:41 +01:00
a1ca9de0f5
Trigger change on avatar delete
2016-01-25 20:56:04 +01:00
68ef6e1bdd
Assert that User::triggerChange is called upon avatar change
2016-01-25 20:05:11 +01:00
f165ad8864
Changing the avatar of the user emits the changeUser event which triggers update of the system addressbook
2016-01-25 20:05:11 +01:00
12b22c2759
Regenerate CSRF token upon login
...
Otherwise somebody else might be able to note down the CSRF token before login on a shared computer.
2016-01-25 20:03:40 +01:00
a977465af5
Add new CSRF manager for unit testing purposes
...
This adds a new CSRF manager for unit testing purposes, it's interface is based upon https://github.com/symfony/security-csrf . Due to some of our required custom changes it is however not possible to use the Symfony component directly.
2016-01-25 20:03:40 +01:00
fe08700b59
Merge pull request #21885 from owncloud/add-size-minus-zero-to-avatar
...
Adding support of -1 as size to be passed into get and getFile
2016-01-25 19:54:15 +01:00
a4ea3563e7
Merge pull request #21830 from owncloud/systemtags-sidebar-permissions
...
Systemtags sidebar permissions
2016-01-25 17:33:40 +01:00
09ae160463
Replace other usages
2016-01-25 17:17:36 +01:00
c5046fb2a9
Add parameters to public interface
2016-01-25 17:17:20 +01:00
728caf13f8
Adding support of -1 as size to be passed into get and getFile
2016-01-25 16:54:40 +01:00
0a1350d5ac
System tags sidebar selector now respects permissions
...
For admins: display the namespace behind the tag name.
For users: no namespace, don't display non-assignable tags in the
dropdown, display already assigned non-assignable tags with a different
style
2016-01-25 10:45:02 +01:00
d4198607ec
Expose whether user is an admin through a method
...
Which is nicer than an obscure global variable
2016-01-25 10:07:47 +01:00
ce753231eb
Merge pull request #18444 from owncloud/occ-config-types
...
occ config:system:set can now set other value types
2016-01-25 10:02:51 +01:00
9d36972e0f
Merge pull request #21401 from owncloud/dav-cache-getchildren
...
Put nodes from Directory->getChildren in the ObjectTree cache
2016-01-25 10:02:32 +01:00
d69167caff
Merge pull request #21424 from owncloud/appversions
...
Use appConfig to get app versions
2016-01-25 10:02:02 +01:00
adf532fe4e
Merge pull request #21806 from owncloud/mdusher-master
...
[jenkins] Added ' to characters allowed in the username
2016-01-25 10:01:43 +01:00
44043cb1d7
Merge pull request #21811 from owncloud/fix-unauthenticated-avatar
...
Show default placeholder if avatar image can't be fetched
2016-01-25 10:01:23 +01:00
ef4fca22d1
Merge pull request #21844 from owncloud/drop-image-path
...
Remove OC_Helper::imagePath and use the proper public interface
2016-01-25 10:00:21 +01:00
f90dccf172
Merge pull request #21862 from owncloud/sync-certificates-with-upstream
...
[master] Sync certificates with upstream
2016-01-25 10:00:05 +01:00
d62ea66645
Merge pull request #21878 from owncloud/fix-apps-management-templating
...
Include author and license in l10n string to be able to change order
2016-01-25 09:59:45 +01:00
e84a663b05
Merge pull request #21879 from owncloud/remove-unused-code
...
remove unused variable
2016-01-25 09:58:33 +01:00
287e6d36bf
remove unused variable
2016-01-25 09:29:44 +01:00
37f5f5077a
Merge pull request #21877 from owncloud/fix_dav_app
...
Add missing use statements for IGroupManager and IUserSession
2016-01-25 08:50:41 +01:00
605df6c36b
Includ author and license in l10n string to be able to change order
...
* fixes #21874
2016-01-25 08:44:43 +01:00
d0799af484
Add missing use statements for IGroupManager and IUserSession
2016-01-25 08:05:53 +01:00
a331979a67
[tx-robot] updated from transifex
2016-01-25 01:54:39 -05:00
75e6734ef4
Remove OC_Helper::imagePath and use the proper public interface
2016-01-24 18:04:20 +01:00
82d3852815
[tx-robot] updated from transifex
2016-01-24 01:54:40 -05:00
f92119e02f
[tx-robot] updated from transifex
2016-01-23 01:55:35 -05:00
c0640f7998
Sync certificates with upstream
2016-01-22 22:10:17 +01:00
0a4142d5df
Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-download
...
Streaming download from Swift in files_external
2016-01-22 17:27:41 +01:00
99e9c81c8b
Merge pull request #21841 from owncloud/share2_deletefromself
...
[Share 2.0] Add deleteFromSelf method
2016-01-22 17:27:17 +01:00
a203089cfd
Merge pull request #21836 from RomanKreisel/master
...
Solves #21835 (https://github.com/owncloud/core/issues/21835 )
2016-01-22 17:26:28 +01:00
7731b29136
Merge pull request #21719 from owncloud/move-notification-api-to-ocp
...
Move the notification API to public namespace
2016-01-22 16:20:26 +01:00
21131d133a
Merge pull request #21814 from owncloud/systemtags-backend-permissions
...
Fix DAV backend to respect system tags permissions
2016-01-22 16:08:22 +01:00
2ef62b0115
Fix TagList serializer
2016-01-22 15:55:54 +01:00
a6600e95dc
[Share 2.0] Add deleteFromSelf method
...
This allows recipient to delete a share. For user shares this is the
same as deleting (at least for now).
But for group shares this means creating a new share with type 2. With
permissions set to 0.
2016-01-22 15:06:50 +01:00
2d569d92eb
Merge pull request #21850 from owncloud/more-output-for-integrity-check
...
Print output for integrity check during ./occ upgrade
2016-01-22 14:59:29 +01:00
2f3e62a27f
Fix oc:tags tag list serializer
...
Fixes propfind/proppatch of oc:tags
2016-01-22 14:07:26 +01:00
e7aab8f31f
Print output for integrity check during ./occ upgrade
2016-01-22 13:18:00 +01:00
9b4c9a0357
Merge pull request #18531 from owncloud/ext-user-credentials
...
External storage 'Login credentials' auth mechanism
2016-01-22 13:14:14 +01:00
Vincent Petry
Roeland Jago Douma
Thomas Müller
Morris Jobke
Jenkins for ownCloud
Lukas Reschke
Joas Schilling