aa598fc701
Merge pull request #21664 from owncloud/comments-dav
...
Comments DAV implementation
2016-01-26 17:20:32 +01:00
cfb6539b01
Merge pull request #21921 from owncloud/use-proper-tag
...
Do not use duplicated tag
2016-01-26 17:19:37 +01:00
8bdf2f5c25
Do not use duplicated tag
...
Fixes "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.", the tag can only be there once. Also set to 9.0 as this will be the next major release.
2016-01-26 16:42:31 +01:00
f383332d83
Merge pull request #21912 from owncloud/issue-21908-trashbin-flickering
...
Hide the delete button, until we know its a custom avatar
2016-01-26 16:16:21 +01:00
6deb553dc2
Merge pull request #21833 from owncloud/use-proper-shared-uri-for-contacts
...
Reassemble behavior on shared address books with respect to uri and d…
2016-01-26 16:13:32 +01:00
22010517f5
Merge pull request #21752 from owncloud/files-delete-fix
...
Only check selection for delete permissions, not parent folder
2016-01-26 16:13:10 +01:00
022ac12ab4
Merge pull request #21916 from owncloud/sftp-handle-no-user
...
Handle no user set in sftp constructor
2016-01-26 16:12:38 +01:00
ce84c36d6e
Merge pull request #21920 from owncloud/fix-firstrunwizard-button
...
fix first run wizard button not wrapping
2016-01-26 16:12:14 +01:00
3b7ded863b
files_sharing requires int as file id
2016-01-26 15:45:37 +01:00
44415a29ba
fix first run wizard button not wrapping
2016-01-26 15:28:19 +01:00
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
7b678a8c17
Reassemble behavior on shared address books with respect to uri and displayname
2016-01-26 15:07:50 +01:00
54e58b520c
Handle no user set in sftp constructor
2016-01-26 14:48:45 +01:00
c090d709e7
We must resolve to the proper usergroup share
2016-01-26 14:14:54 +01:00
e5ba28f934
adjust unit tests
2016-01-26 13:16:14 +01:00
8afa39682c
Revert "utilize elementMap for parsing DateTime string input argument for REPORT method"
...
This reverts commit 2027bf2686
2016-01-26 13:04:41 +01:00
751e99512a
Hide the delete button, until we know its a custom avatar
2016-01-26 12:59:58 +01:00
49c8f3d6e4
return 404 instead of 403 when attempting to create a comment on an not existing or unavailable file
2016-01-26 12:47:33 +01:00
2027bf2686
utilize elementMap for parsing DateTime string input argument for REPORT method
2016-01-26 12:40:05 +01:00
11ae468c89
smaller changes related to reviews
2016-01-26 12:10:56 +01:00
ed546bd2a5
Comments DAV implementation
2016-01-26 12:10:14 +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
Thomas Müller
Lukas Reschke
Arthur Schiwon
Jan-Christoph Borchardt
Vincent Petry
Robin Appelman
Roeland Jago Douma
Joas Schilling
Morris Jobke
Jenkins for ownCloud