Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

00b042a3

Commit 00b042a3 authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into server2server_tls

parents a53946a8 0271e8e6

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

docs/client-server/specification.rst 3 additions, 14 deletions

docs/client-server/specification.rst
docs/specification.rst 146 additions, 22 deletions

docs/specification.rst
webclient/app-controller.js 30 additions, 6 deletions

webclient/app-controller.js
webclient/app-filter.js 40 additions, 1 deletion

webclient/app-filter.js
webclient/app.css 4 additions, 0 deletions

webclient/app.css
webclient/index.html 13 additions, 0 deletions

webclient/index.html
webclient/recents/recents-controller.js 4 additions, 3 deletions

webclient/recents/recents-controller.js
webclient/recents/recents.html 1 addition, 1 deletion

webclient/recents/recents.html
webclient/room/room-controller.js 15 additions, 38 deletions

webclient/room/room-controller.js
webclient/room/room.html 4 additions, 15 deletions

webclient/room/room.html

with 260 additions and 100 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment