Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 17:14:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

Browse source
This commit is contained in:
Erik Johnston 2014-08-19 16:41:13 +01:00
commit e2b861cc67
7 changed files with 100 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webclient/components/matrix/matrix-service.js
View file

@ -68,9 +68,7 @@ angular.module('matrixService', [])
params: params,
data: data,
headers: headers
})
return deferred.promise;
});
};

2
webclient/room/room.html
View file

@ -76,7 +76,7 @@
<td>
</td>
<td>
<input id="mainInput" ng-model="imageURLToSend" ng-enter="sendImage()" placeholder="Image URL"/>
<input id="mainInput" ng-model="imageURLToSend" ng-enter="sendImage(imageURLToSend)" placeholder="Image URL"/>
</td>
<td width="100px">
<button ng-click="sendImage(imageURLToSend)">Send URL</button>