Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

cdb8d746

Commit cdb8d746 authored 10 years ago by David Baker

Downloads
- Plain Diff

Merge with Matthew's killing of ng-animate

Conflicts:
	syweb/webclient/app-controller.js
	syweb/webclient/index.html

parents f842bca4 cadcc6ca

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

syweb/webclient/app-controller.js 0 additions, 6 deletions

syweb/webclient/app-controller.js
syweb/webclient/app.js 1 addition, 0 deletions

syweb/webclient/app.js
syweb/webclient/components/matrix/commands-service.js 164 additions, 0 deletions

syweb/webclient/components/matrix/commands-service.js
syweb/webclient/home/home-controller.js 4 additions, 2 deletions

syweb/webclient/home/home-controller.js
syweb/webclient/index.html 1 addition, 0 deletions

syweb/webclient/index.html
syweb/webclient/room/room-controller.js 16 additions, 166 deletions

syweb/webclient/room/room-controller.js
syweb/webclient/test/unit/commands-service.spec.js 143 additions, 0 deletions

syweb/webclient/test/unit/commands-service.spec.js

with 329 additions and 174 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