Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NEW] New avatar storage types #6788

Merged
merged 51 commits into from
Jun 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
0a4c04d
Add S3 storage type to avatars
sampaiodiego Apr 20, 2017
a2de9f5
Add Google Cloud Storage support to avatars
sampaiodiego Apr 25, 2017
d40d639
Add GridFS support to avatars
sampaiodiego Apr 27, 2017
4785fd4
Better handling for GridFS avatars
sampaiodiego Apr 28, 2017
b7fc7b6
Use new collection for avatars only
sampaiodiego Apr 28, 2017
f4bde3f
Merge remote-tracking branch 'origin/develop' into new-avatar-storage…
rodrigok Apr 29, 2017
ce812e8
Delete converted file
rodrigok May 1, 2017
1c72057
Avatar: Add support to FileSystem and various fixes
rodrigok May 1, 2017
536fba7
Avatar: Refactor some code, allow set avatar from server for FS and G…
rodrigok May 1, 2017
001dd3a
Add FileUpload to .eslintrc
rodrigok May 2, 2017
8360b86
Fix ESLint error
rodrigok May 2, 2017
06d966c
Remove RocketChatFileAvatarInstance
rodrigok May 2, 2017
014241c
Make Amazon S3 work again
rodrigok May 2, 2017
451b055
Fix upload for Google Cloud Storage
rodrigok May 2, 2017
b62496a
Merge remote-tracking branch 'origin/develop' into new-avatar-storage…
rodrigok May 18, 2017
55cbd4a
Merge remote-tracking branch 'origin/develop' into new-avatar-storage…
rodrigok May 22, 2017
a9b89bd
Add backwards compatibility
rodrigok May 22, 2017
8cdeca6
Add support to AmazonS3 Server for uploads
rodrigok May 25, 2017
e02d5dc
Implement AmazonS3 Server for Avatars
rodrigok May 25, 2017
d2e1924
Add Google Cloud Storage Server option
rodrigok May 25, 2017
a8519ba
Remove use of slingshot from client
rodrigok May 25, 2017
5ba6e00
Reduce client code for uploads
rodrigok May 25, 2017
2783e70
Init GridFS move to upload package
rodrigok May 25, 2017
75b0a19
Move GridFS to uploads package and resuse more code
rodrigok May 25, 2017
1a788f8
Uploads: Reuse more code
rodrigok May 25, 2017
4a86f97
Add only options Uploads and Avatars to client
rodrigok May 26, 2017
b44a186
Uploads: Improve code reusage
rodrigok May 26, 2017
3504753
Merge remote-tracking branch 'origin/develop' into new-avatar-storage…
rodrigok May 27, 2017
e6e7f74
Uploads: Remove uncessary code
rodrigok May 27, 2017
e2666af
Uploads: Use correct store for import and slack bridge
rodrigok May 27, 2017
e9ba87d
Uploads: Migration
rodrigok May 27, 2017
7b5d45d
Uploads: Migrate old FS and GridFS store names
rodrigok May 28, 2017
9ee948e
Uploads: Fix avatar upload from services
rodrigok May 28, 2017
0ce0be0
Uploads: Fix review
rodrigok May 29, 2017
a6aea83
Fix ESLint errors
rodrigok May 29, 2017
a4aecea
Merge remote-tracking branch 'origin/develop' into new-avatar-storage…
rodrigok May 29, 2017
6eb06e6
Uploads: Delete from correct store
rodrigok May 29, 2017
b29b03d
Remove RocketChatFileAvatarInstance from eslintrc
rodrigok May 29, 2017
d0735ac
Uploads: Migrate old avatars
rodrigok May 29, 2017
f3108d7
Remove old avatar settings
rodrigok May 29, 2017
a1fed82
Uploads: Add avatar migration
rodrigok May 29, 2017
9f9cc9d
Merge remote-tracking branch 'origin/develop' into new-avatar-storage…
rodrigok May 29, 2017
69a76ce
Uploads: Better file organization
rodrigok May 30, 2017
e14e73d
Uploads: Implement range for google storage read
rodrigok May 30, 2017
4d94d13
Uploads: Finish migration
rodrigok May 30, 2017
3586b26
Fix avatar migration removing new avatar entries
sampaiodiego May 31, 2017
9a01e20
Merge remote-tracking branch 'origin/develop' into new-avatar-storage…
rodrigok May 31, 2017
545eeac
Fix tests
rodrigok May 31, 2017
0a43285
Merge remote-tracking branch 'origin/develop' into new-avatar-storage…
rodrigok May 31, 2017
b827c57
Unit: Fix mentions tests
rodrigok May 31, 2017
bfd693f
Merge remote-tracking branch 'origin/develop' into new-avatar-storage…
rodrigok May 31, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
"EJSON" : false,
"Email" : false,
"FlowRouter" : false,
"FileUpload" : false,
"HTTP" : false,
"getNextAgent" : false,
"handleError" : false,
Expand All @@ -132,7 +133,6 @@
"ReactiveVar" : false,
"RocketChat" : true,
"RocketChatFile" : false,
"RocketChatFileAvatarInstance": false,
"RoomHistoryManager" : false,
"RoomManager" : false,
"s" : false,
Expand Down
89 changes: 0 additions & 89 deletions lib/fileUpload.js

This file was deleted.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
"supertest": "^3.0.0"
},
"dependencies": {
"@google-cloud/storage": "^1.1.1",
"aws-sdk": "^2.55.0",
"babel-runtime": "^6.23.0",
"bcrypt": "^1.0.2",
"codemirror": "^5.26.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-api/server/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class API extends Restivus {
try {
result = originalAction.apply(this);
} catch (e) {
this.logger.debug(`${ method } ${ route } threw an error:`, e);
this.logger.debug(`${ method } ${ route } threw an error:`, e.stack);
return RocketChat.API.v1.failure(e.message, e.error);
}

Expand Down
65 changes: 0 additions & 65 deletions packages/rocketchat-file-upload/client/lib/FileUploadAmazonS3.js

This file was deleted.

64 changes: 0 additions & 64 deletions packages/rocketchat-file-upload/client/lib/FileUploadFileSystem.js

This file was deleted.

This file was deleted.

55 changes: 0 additions & 55 deletions packages/rocketchat-file-upload/client/lib/FileUploadGridFS.js

This file was deleted.

Loading