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

30516 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
6b635044a7 Use official mariadb docker 2016-02-11 14:17:17 +01:00
Thomas Müller
5d1dfe1d48 Merge pull request #22322 from owncloud/fix-typo 
Fix typo
 2016-02-11 14:07:40 +01:00
Thomas Müller
4d24929e05 Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on-errors 
Remove notification on unshare and on errors
 2016-02-11 14:02:44 +01:00
Thomas Müller
27a4c9f625 Merge pull request #22308 from owncloud/shorter-ttl-find-path 
Shorter TTL on  findBinaryPath caching
 2016-02-11 14:02:24 +01:00
Thomas Müller
26939a2873 Merge pull request #22290 from owncloud/dav-upload-scan-in-lock 
scan the file in the write lock when uploading over dav
 2016-02-11 14:02:08 +01:00
Robin Appelman
80eb1aada5 encrypt passwords for files_external 2016-02-11 14:00:08 +01:00
Morris Jobke
244118580a Fix typo 2016-02-11 13:59:15 +01:00
Roeland Jago Douma
745bfda41f Fix migration step to avoind invisible shares 2016-02-11 13:29:23 +01:00
Roeland Jago Douma
0284c60c3a Add tests 2016-02-11 13:29:23 +01:00
Roeland Jago Douma
4533cb9c59 Add parent for invisible link shares 2016-02-11 13:29:23 +01:00
Morris Jobke
73e3737777 Merge pull request #22316 from owncloud/fix_22309 
Properly check for legacy methods on IShare objects
 2016-02-11 13:02:52 +01:00
Joas Schilling
8cfdc62eae Update info checker requirements 2016-02-11 11:54:13 +01:00
Roeland Jago Douma
dd630e33ea Properly check for legacy methods 
The new shares are completely without parents eventually. But for some
current legacy reasons the methods are still around. But we should
properly check for them.

Fixes #22309
 2016-02-11 11:30:52 +01:00
Roeland Jago Douma
2aa206e900 Fix unit tests 2016-02-11 11:21:12 +01:00
Joas Schilling
ee080a9bc3 Do not getShare in deleteShare, it's already there when deleting 2016-02-11 11:21:06 +01:00
Thomas Müller
ca2755ed6a Wait until mariadb is up and running 2016-02-11 11:09:03 +01:00
Roeland Jago Douma
a823485638 Reload list of shares on directory change 2016-02-11 11:06:26 +01:00
Roeland Jago Douma
f5be48d81d Calculate the share statuses in js from the OCS Response 
Right now this is only done on page load. We should do it on each
directory traversal.
 2016-02-11 11:03:11 +01:00
Thomas Müller
06af9b817e Merge pull request #22281 from owncloud/activity-100-unshare-activities 
Add translations of unshare activities
 2016-02-11 11:01:47 +01:00
Thomas Müller
2efb97ba09 Fixes #13658 2016-02-11 10:53:18 +01:00
Joas Schilling
31c9e047a8 Delete the notification when the owner unshares the remote before the user did anything 2016-02-11 10:41:55 +01:00
Joas Schilling
2263b8b693 Remove the notification if accepting/declining failed because of 404 2016-02-11 10:41:55 +01:00
Jenkins for ownCloud
5165998723 [tx-robot] updated from transifex 2016-02-11 01:55:35 -05:00
C Montero-Luque
c392cc2b8f 9.0.0 beta 1 2016-02-10 17:31:16 -05:00
Thomas Müller
3184115c3c Merge pull request #22285 from owncloud/fix_22275 
Only show link shares for the current user
 2016-02-10 20:01:41 +01:00
Lukas Reschke
63671a571e Merge pull request #22297 from owncloud/public-webdavdownloadlink 
Revert back to non-webdav download link for public URLs
 2016-02-10 19:57:51 +01:00
Vincent Petry
f79fafcf06 Revert back to non-webdav download link for public URLs 
Fixes issues with browsers not happy with the token.
Fixes activities which were not sent.
 2016-02-10 19:09:52 +01:00
Thomas Müller
6b836325cf Merge pull request #22276 from owncloud/harden-updater-auth 
Harden updater authentication
 2016-02-10 17:31:38 +01:00
Thomas Müller
6ffb83ae19 Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-of-entries-to-cleanup 
Chunk the cleanup queries to make sure they don't time out
 2016-02-10 17:26:11 +01:00
Thomas Müller
39e6a1897b Merge pull request #22271 from owncloud/remember-login-state 
Remember previous state of remember login checkbox
 2016-02-10 17:25:34 +01:00
Thomas Müller
10613f7265 Merge pull request #22273 from owncloud/versions-fixpathasrecipient 
Fix versions path as share recipient when different than owner path
 2016-02-10 17:25:14 +01:00
Thomas Müller
8b165c5ed5 No longer evaluate appinfo/version 2016-02-10 17:24:14 +01:00
Thomas Müller
c919b41395 Adding a custom webdav property which holds the list of contacts groups 2016-02-10 17:06:13 +01:00
Roeland Jago Douma
9651defe3f Also filter the old share info endpoint 
Make sure we do not show an icon if we can't display a share
 2016-02-10 17:05:57 +01:00
Robin Appelman
edbe5d7b6d handle forbidden exceptions in smb backend 2016-02-10 16:52:13 +01:00
Robin Appelman
bef70e9448 also fix lock order for chunked dav uploads 2016-02-10 16:31:32 +01:00
Lukas Reschke
5680743c2b Harden updater authentication 
- Reset tokens after 2 hours as discussed at https://github.com/owncloud/updater/issues/220#issuecomment-182033453
- Used BCrypt for storing the password in the config.php. This makes it substantially harder in case of a leakage of the token to bruteforce it. In the future we can evaluate also an HMAC including the IP. That's a bit tricker though at the moment considering that we support reverse proxies. Didn't feel brave enough to touch that dragon now as well ;)
 2016-02-10 16:31:11 +01:00
Robin Appelman
65554ec333 scan the file in the write lock when uploading over dav 2016-02-10 16:21:13 +01:00
Roeland Jago Douma
1301ec9351 Only show link shares for the current user 
Currently we have no way to display multiple links in the UI.
So just display the link share for the current user.

Fixes #22275
 2016-02-10 16:00:55 +01:00
Joas Schilling
5dc63e34b4 Add translations of unshare activities 2016-02-10 15:42:48 +01:00
Vincent Chan
06b2f11e57 refactoring code 2016-02-10 15:28:14 +01:00
Thomas Müller
5c89cf9565 Merge pull request #22267 from owncloud/fix_encryption2 
calculate and update the version of the encryption signature correctly
 2016-02-10 15:14:52 +01:00
Thomas Müller
159a0eb597 Merge pull request #20073 from owncloud/files-should-add-download-disposition 
Serve files with an attachment disposition for new DAV endpoint
 2016-02-10 14:35:50 +01:00
Thomas Müller
c4d2f6bb25 Merge pull request #22270 from owncloud/use-cache-directly 
Use cache directly instead of QueryBuilder
 2016-02-10 14:23:04 +01:00
Thomas Müller
9e07fe289d Merge pull request #22274 from owncloud/fix_21710 
Updated davclient.js to support MKCOL in edge
 2016-02-10 14:22:36 +01:00
Thomas Müller
c1d21cf873 Merge pull request #22263 from owncloud/fix-group-principals 
Fix group principal
 2016-02-10 14:22:18 +01:00
Roeland Jago Douma
c201982598 Updated davclient.js 
Fix for MKCOL in edge
 2016-02-10 13:52:54 +01:00
Vincent Petry
63b99b614c Merge pull request #22266 from owncloud/fix_21726 
Only show link spinner if the share exists
 2016-02-10 13:46:15 +01:00
Vincent Petry
1b9e291913 Use full path of known file when handling versions 
Instead of relying on the versions API response, use the known file path
when populating version models.
 2016-02-10 13:39:25 +01:00
Vincent Petry
a6f997ddae Remove path from versions response 
The path attribute contains the path relative to the owner's home
folder, not the one from the recipient, which is useless for the client
and needlessly discloses the owner's original path.

The requested already has access to the full path of the file, so no
need to add it to the response.
 2016-02-10 13:38:38 +01:00