Skip to content

Commit

Permalink
Merge branch 'develop' into ResultadosDigitais#208-add-room-groups
Browse files Browse the repository at this point in the history
  • Loading branch information
phiter authored Jun 27, 2020
2 parents db8ff47 + 8d4c8b6 commit f53522d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 3 deletions.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,16 @@
]
},
{

"login": "g-nogara",
"name": "Guilherme Nogara",
"avatar_url": "https://avatars0.githubusercontent.com/u/48070989?v=4",
"profile": "https://github.com/g-nogara",
"contributions": [
"code"
]
},
{
"login": "phiter",
"name": "Phiter Fernandes",
"avatar_url": "https://avatars2.githubusercontent.com/u/12252332?v=4",
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
</tr>
<tr>
<td align="center"><a href="https://github.com/Jarzamendia"><img src="https://avatars2.githubusercontent.com/u/14064715?v=4" width="100px;" alt=""/><br /><sub><b>João Ernesto Arzamendia</b></sub></a><br /><a href="https://github.com/ResultadosDigitais/matrix/commits?author=Jarzamendia" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/g-nogara"><img src="https://avatars0.githubusercontent.com/u/48070989?v=4" width="100px;" alt=""/><br /><sub><b>Guilherme Nogara</b></sub></a><br /><a href="https://github.com/ResultadosDigitais/matrix/commits?author=g-nogara" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/phiter"><img src="https://avatars2.githubusercontent.com/u/12252332?v=4" width="100px;" alt=""/><br /><sub><b>Phiter Fernandes</b></sub></a><br /><a href="https://github.com/ResultadosDigitais/matrix/commits?author=phiter" title="Code">💻</a></td>
</tr>
</table>
Expand Down
3 changes: 1 addition & 2 deletions backend/app/app.server.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import express from "express";
import cookieSession from "cookie-session";
import bodyParser from "body-parser";
import path from "path";
import morgan from "morgan"

Expand All @@ -21,7 +20,7 @@ const app = express();

app.use(morgan("tiny"));
app.use(cookieSession(getSessionConfig()));
app.use(bodyParser.urlencoded({ extended: false }));
app.use(express.urlencoded({ extended: false }));

// set the template engine ejs
app.set("view engine", "ejs");
Expand Down
1 change: 0 additions & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
},
"dependencies": {
"@godaddy/terminus": "^4.3.1",
"body-parser": "^1.19.0",
"cookie-session": "^1.4.0",
"ejs": "^2.6.2",
"express": "^4.17.1",
Expand Down
3 changes: 3 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed

### Changed
- `express` now has the responsibilities previously attributed to `body-parser`
- fixed behavior when inviting user to external meeting, now matrix will not open a new jitsi room


## [2.0.1] 2020-05-05
### Added
- New `ctrl+click` to open a embeded Jitsi Meet in a new Tab.
Expand Down

0 comments on commit f53522d

Please sign in to comment.