wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
30363 commits 157 branches 562 tags 714 MiB
Commit graph

30363 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
4056cca427 Only dispatch the delete event, when the deletion was successful 2016-02-05 12:39:07 +01:00
Joas Schilling
97b907335a Dispatch an event when a console command is run 2016-02-05 12:24:54 +01:00
Thomas Müller
7dde2c773f Merge pull request #22146 from owncloud/delete-email-address 
Allow to delete the email address in user management
 2016-02-05 11:54:12 +01:00
Thomas Müller
e6bab280a6 Merge pull request #22143 from owncloud/fix_12385 
When a user is removed we should remove the right shares
 2016-02-05 11:53:28 +01:00
Thomas Müller
a92a480967 Merge pull request #22149 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2016-02-05 11:52:40 +01:00
Joas Schilling
733db5c14a Add a filter for comment activities 2016-02-05 11:30:53 +01:00
Joas Schilling
070ff71a2d Add activities for comments 2016-02-05 11:30:53 +01:00
Joas Schilling
e86dcdacc8 Dispatch events when adding, updating and deleting comments 2016-02-05 11:30:53 +01:00
Roeland Jago Douma
b50edf3222 Add intergration test 2016-02-05 10:54:32 +01:00
Scrutinizer Auto-Fixer
466a085253 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-02-05 09:38:43 +00:00
Morris Jobke
f0752d7ba1 Allow to delete the email address in user management 2016-02-05 10:27:18 +01:00
Thomas Müller
342c2aac98 Merge pull request #20920 from owncloud/issue_20888 
Add dialog to enter credentials on errored mount point
 2016-02-05 10:05:23 +01:00
Roeland Jago Douma
5f521067d8 When a user is removed we should remove the right shares 
* This means all the shares directly shared with them
* Or all group shares having a special share with them

This patch fixes the operator precedece (AND before OR).
So before this patch:

(share_with = <deleted user> AND share_type = 0) OR share_type=2

So it deleted all user specific shares

Now:
share_with = <deleted user> AND (share_type = 0 OR (share_type=2)
 2016-02-05 10:05:22 +01:00
Thomas Müller
c8e136b7dc Merge pull request #22118 from owncloud/post_update_permissions_hook 
[Share 2.0] Add missing post_update_permissions hook
 2016-02-05 10:04:41 +01:00
Thomas Müller
96ccbca2e3 Merge pull request #22135 from owncloud/global-auth-warning 
fix warning caused by global auth
 2016-02-05 10:04:22 +01:00
Jenkins for ownCloud
0ed2108b7f [tx-robot] updated from transifex 2016-02-05 01:56:20 -05:00
Roeland Jago Douma
169874957a Path should be relative 2016-02-04 19:19:10 +01:00
Roeland Jago Douma
b57aac0a89 [Share 2.0] Add missing post_update_permissions hook 2016-02-04 19:18:25 +01:00
Thomas Müller
f9aa5d2971 Merge pull request #22133 from owncloud/add-check-for-content 
Add check for content
 2016-02-04 17:40:31 +01:00
Vincent Petry
d4da2f0ac7 Improve credentials dialog usability a bit 
Automatically focus on the first field.
Pressing enter submits the form.
 2016-02-04 17:18:21 +01:00
Robin Appelman
b7d27ab141 fix warning caused by global auth 2016-02-04 16:53:13 +01:00
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