Commit Graph

30342 Commits

Author SHA1 Message Date
Thomas Müller e22b2d8b63 Merge pull request #22130 from owncloud/fix-jsunit-filesclient
Fix jsunit filesclient
2016-02-04 16:49:58 +01:00
Thomas Müller d8faeab421 Merge pull request #21766 from farukuzun/master
Add some mimetypes
2016-02-04 16:49:31 +01:00
Robin Appelman d83b1f3b8b fix error code for unconfigured user provided auth 2016-02-04 16:47:41 +01:00
Robin Appelman b12d449ec7 set read permissions on failed mount root 2016-02-04 16:41:27 +01:00
Robin Appelman e420ae068c handle exception in availibilty check 2016-02-04 16:33:08 +01:00
Robin Appelman 53fbaf70c0 fix input type 2016-02-04 16:33:08 +01:00
Robin Appelman 2e3a5ccaaa show failed external storages properly 2016-02-04 16:33:08 +01:00
Robin Appelman 4b4bf87f95 Use handlebars template 2016-02-04 16:33:08 +01:00
Jesús Macias 7162d66373 Fix PR from comments 2016-02-04 16:33:08 +01:00
Jesús Macias 8fa96435b0 Add credentials dialog for user provided auth 2016-02-04 16:33:08 +01:00
Thomas Müller 089b60cd25 Merge pull request #22107 from owncloud/external-auth-global
Add global auth backend for files external
2016-02-04 16:18:23 +01:00
Thomas Müller 1619968a03 Merge pull request #22111 from owncloud/use-intermediate-certificate
Use intermediate root authority + sign other release channels
2016-02-04 16:17:47 +01:00
Robin Appelman 76d9586339 add tests 2016-02-04 16:14:17 +01:00
Lukas Reschke 5ba6148bfe Add check for content
The response may be a redirect which is always followed by jQuery. Thus leading to false positives depending on the server configuration (e.g. when it issues a 302)

To prevent that there is also a check performed on the response content.
2016-02-04 16:13:27 +01:00
Vincent Petry 23f0515771 Fix JS DAV files client unit tests
Instead of trying to mock the promise, just stub davclient.js' request
object.
2016-02-04 15:39:18 +01:00
Vincent Petry 8782004742 Small fixes in Dav files client
Remove double leading slash in path.
Add utf-8 in default content type.
2016-02-04 15:38:54 +01:00
Robin Appelman 71992f9d29 update import logic for the new export logic 2016-02-04 15:31:05 +01:00
Robin Appelman e3eda917ef Show the proper auth identifier when listing mounts as json 2016-02-04 15:31:05 +01:00
Thomas Müller 52ce83993d Merge pull request #22124 from owncloud/comments-author-check
Check for authorship on edit attempt
2016-02-04 15:16:33 +01:00
Thomas Müller c62d499a89 Merge pull request #22126 from owncloud/share2_lazy_shares
Lazy shares
2016-02-04 15:16:16 +01:00
Robin Appelman 9dfe9f77f2 Add global auth backend for files external 2016-02-04 14:57:17 +01:00
Roeland Jago Douma 0f22a8db1d Also add type (file/folder) to IShare object
We need this for the hooks :(
2016-02-04 14:28:09 +01:00
Roeland Jago Douma 2c0cb5a00e Unit test for delete lazy shares 2016-02-04 13:30:42 +01:00
Roeland Jago Douma e0bc128eb5 Add unit tests 2016-02-04 13:05:05 +01:00
Thomas Müller 899444103a Merge pull request #22121 from owncloud/comments-deleteduser
Special label for deleted users in comments list
2016-02-04 13:03:18 +01:00
Arthur Schiwon a480b2261b Check for authorship on edit and delete attempts 2016-02-04 12:57:48 +01:00
Roeland Jago Douma fc215d0980 Make the share object lazy
Share providers can now just pass in a fileId. And the node will only be
created once needed.
2016-02-04 12:51:23 +01:00
Faruk Uzun 6ffd8f3e0d Introduce some mimetypes for richdocuments
* application/vnd.lotus-wordpro
* application/vnd.visio
* application/vnd.wordperfect
* application/msonenote
2016-02-04 13:48:21 +02:00
Thomas Müller cd16ba5cb3 Merge pull request #22025 from owncloud/21838-jenkins
[jenkins] + rebased, of #21838
2016-02-04 11:58:45 +01:00
Vincent Petry 2e46576e83 Special label for deleted users in comments list 2016-02-04 11:26:11 +01:00
Thomas Müller b594aa18ee Merge pull request #22110 from owncloud/comment-types-always-plural
types shall always be plural
2016-02-04 10:55:49 +01:00
Thomas Müller d3c86bdd67 Merge pull request #22103 from ErikPel/tag-css-fix
Fixes #22097
2016-02-04 10:49:41 +01:00
Thomas Müller e64044d43e Merge pull request #21964 from owncloud/calendar-sharing-3
Add calendar sharing
2016-02-04 10:48:36 +01:00
Thomas Müller 6a5b0eafa5 Merge pull request #22108 from owncloud/comments-edit
Comment owner can now edit or delete
2016-02-04 10:47:49 +01:00
Thomas Müller 2c41a266c0 Merge pull request #22072 from vincchan/trim-newusername-whitespace
Do not allow username to have whitespace at the beginning or at the end
2016-02-04 10:33:30 +01:00
Jenkins for ownCloud a022584e4a [tx-robot] updated from transifex 2016-02-04 01:55:08 -05:00
Arthur Schiwon e370b601db fix unit tests 2016-02-03 22:45:33 +01:00
alexweirig cd19b648c6 change error logging
replaced variable with print_r call
2016-02-03 21:50:27 +01:00
alexweirig f4d4bed10b Fixed undefined variable $dnGroup and variable name
I renamed $memberURL into $dynamicGroup and print that variable in the writeLog.

I think this makes more sense.
2016-02-03 21:50:27 +01:00
alexweirig 39aac2c66b Refactored code to avoid performance problem
Moved the dynamic group processing to the top and removed condition in memberOf processing.

Also, changed variable name $value to $memberUrl
2016-02-03 21:50:27 +01:00
Alex Weirig 0d797637f3 code changes for user_ldap Dynamic Group Membership
Added new setting of “Dynamic Group Member URL”
(ldapDynamicGroupMemberURL) - see LDAP settings advanced tab.

Added public function getDynamicGroupMembers.

Updated function _groupMembers.

Updated function getUserGroups.
2016-02-03 21:50:27 +01:00
Lukas Reschke 4db5638505 Add proper line ending 2016-02-03 21:38:13 +01:00
Vincent Petry 805ba20bae Added unit tests for edit/delete comments 2016-02-03 21:06:55 +01:00
Vincent Petry 1caee3ac2e Move comment delete action into edit mode 2016-02-03 21:06:55 +01:00
Vincent Petry bbefe1ed64 Comment owner can now edit or delete 2016-02-03 21:06:55 +01:00
Thomas Müller da04620155 Merge pull request #22101 from owncloud/comments-filerow
Add file row indicator for unread comments
2016-02-03 20:53:40 +01:00
Thomas Müller dd2f62e3e4 Merge pull request #22088 from owncloud/share2_ishare
[Share 2.0] Pass around userid/groupid/federatedid
2016-02-03 20:53:25 +01:00
Thomas Müller 81b9721700 Remove entries in dav_shares on deletion of a calendar 2016-02-03 20:18:56 +01:00
Lukas Reschke eee6d1f41b Also check daily and testing channel 2016-02-03 20:08:40 +01:00
Lukas Reschke 5f300ac275 Allow specifing the signing path 2016-02-03 20:08:40 +01:00