d821755b49
Updated webclient to support the new registration logic.
2014-09-15 14:31:53 +01:00
76217890c0
BF: inviter field has moved to the room root object
2014-09-15 11:14:10 +02:00
a9da2ec895
BF: presence and eventMap were not reset at logout.
2014-09-15 10:39:30 +02:00
f3d3441d02
Use "white-space: pre-wrap" for "Text will wrap when necessary, and on line breaks"
2014-09-15 10:22:57 +02:00
3292f70071
Merge remote-tracking branch 'origin/master' into develop
2014-09-15 10:08:47 +02:00
49b5dd56b5
unbreak wordwrapping by breaking multiline paste for now
2014-09-13 11:38:45 +01:00
32acb7e903
always scroll to bottom when entering a room
2014-09-13 11:35:36 +01:00
c7bcd87f37
Merge branch 'master' of github.com:matrix-org/synapse into develop
2014-09-12 18:27:44 +01:00
e3aec9bc81
Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse
...
Conflicts:
webclient/room/room-controller.js
2014-09-12 18:19:32 +01:00
842898df15
Send multiple candidates at once instead of all individually. Changes spec to include multiple candidates in a candidate(s) message.
2014-09-12 18:19:19 +01:00
3ed39ad20e
Clean data when user logs out
2014-09-12 17:43:35 +02:00
cc2cee4af6
Retry sending events that fail to send.
2014-09-12 16:32:22 +01:00
6c81752e46
Fixed displayname resolution of emote sender
2014-09-12 17:01:49 +02:00
a2cd942a95
Fixed public room name and users count alignement
...
Put data into a table to ease layout and manage long strings
2014-09-12 16:46:20 +02:00
8b28f7d14e
Always pick the incoming call if we've not yet sent out our invite, otherwise the remorte party will see their call get rejected and our call won't come in until our user clicks allow.
2014-09-12 14:06:35 +01:00
a81ec21762
Remove the local AV stream from ourselves when handing it off to a new call or we'll close it when we hang up.
2014-09-12 11:51:57 +01:00
9819b3619e
CSS m.room.topic and m.room.name events in the history
2014-09-12 11:56:08 +02:00
311dc61803
Handle NAME_EVENT to get room name update event
...
(TODO: recents needs to be directly plugged to $rootScope.events.rooms)
2014-09-12 10:51:05 +02:00
d934328904
Added edition of room name
2014-09-12 10:48:06 +02:00
6ea20f3503
Show room name updates in room history and recents.
...
Update it with the latest value
2014-09-12 10:12:56 +02:00
8b3ce85183
BF: temp workaround while /initialSync on a particular room is not available
...
initRoom on a new room is not called. Call it for any received events
2014-09-12 08:54:18 +02:00
a059ca6915
few fixes for errors in glare conditions. still seem to end up with no audio if both calls are placed at the same time.
2014-09-11 19:16:57 +01:00
1e05e30472
Put back the line that adds the stream to the invite, otherwise caller->callee audio won't work...
2014-09-11 18:59:22 +01:00
81d061e74e
Fix bug where web client wold break trying to add the earliest token without having initialised the room if your first page of history contained only events which didn't call initRoom. Just call initRoom in handleMessages since we use it there rather than leaving it to the individual event handling methods.
2014-09-11 17:40:38 +01:00
ceec607e7f
Clearly show when an user cannot join a room.
...
In realtime show who kicked or banned him.
2014-09-11 16:54:57 +02:00
fb082cf50f
start towards glare support (currently not much better but no worse than before) including fixing a lot of self/var self/this fails that caused chaos when we started to have more than one call in play.
2014-09-11 15:24:18 +01:00
806c49a690
Added support of copy/paste of multi lines content
2014-09-11 15:46:24 +02:00
aa347b52ba
Use autofill-event.js to workaround browsers issue: Form model doesn't update on autocomplete
...
https://github.com/angular/angular.js/issues/1460
2014-09-11 15:07:44 +02:00
6b20fef52a
Invite: reset the input when the invitation has been done
2014-09-11 13:52:07 +02:00
c92740e8a9
Enable enter key in the invite input
2014-09-11 13:43:55 +02:00
cc049851d0
On member avatar mouseover, show user_id and power level
2014-09-11 12:01:44 +02:00
14a9652324
Room topic: if the request fails, show the error in the feedback
2014-09-11 11:53:37 +02:00
af44e9556d
BF: made input autofocus work when opening the room topic input
2014-09-11 11:49:59 +02:00
7e7eb0efc1
Show room topic change in the chat history and in the recents
2014-09-11 11:31:24 +02:00
8dcb6f24b5
getRoomEventIndex: improved speed for what it is used
2014-09-11 09:11:24 +02:00
44998ca450
Merge remote-tracking branch 'origin/develop' into webclient_initialSync
2014-09-10 18:35:05 +02:00
7a153b5c94
Show echoed emote with transparency
2014-09-10 18:29:52 +02:00
5a06f5c5fc
Reenabled transparent echo message. It turns to opaque without flickering now.
2014-09-10 18:24:03 +02:00
6d18b52931
Clean previous request feedback when doing a new request
2014-09-10 17:40:34 +02:00
81ecaf945d
BF: Made /op work when providing no power value. 50 is used as default in this case
2014-09-10 17:37:51 +02:00
811716592c
Made users count auto updating. Do show it if the info is not available (ex:user has not joined the room yet)
2014-09-10 16:46:06 +02:00
e2d2d63bcd
Animation on call end icon.
2014-09-10 15:45:09 +01:00
dde7ec8e64
Upgrade angularjs to 1.3.0-rc1 since this is new development
2014-09-10 15:43:27 +01:00
30bfa911fc
Member event: store use the the latest one
2014-09-10 16:26:11 +02:00
da3f842b8c
Removed wrong comments about recents-controller.js: it uses $rootScope.rooms not $rootScope.events.rooms managed by event-handler-service.js and used by other controllers
2014-09-10 14:53:03 +02:00
130cbdd7af
dedup events: state events conflict with messages events. Do not consider them in deduplication
2014-09-10 14:45:32 +02:00
b099634ba1
Reenabled handle of room states events in initialSync but do not add them to the displayed messages in the room page.
...
Show the m.room.member events only when they come from room.messages (from initialSync of pagination) not from room.state.
2014-09-10 14:36:30 +02:00
c2afc6cd0a
Presence events do not have event id. Do not discard them
2014-09-10 13:48:33 +02:00
80b5470663
Add text for incoming calls
2014-09-10 11:35:14 +01:00
7411794fa1
Show mxid in call bar for users with no displayname
2014-09-10 11:21:20 +01:00
55fe0d8adc
Less buggy rejection of calls when busy
2014-09-10 11:12:02 +01:00
b63dd9506e
Improved requests: pagination is done from the data received in initialSync
2014-09-10 12:01:00 +02:00
6f256e6380
reject calls if there's already a call in progress
2014-09-10 10:32:05 +01:00
f90ce04a83
Hangup call if user denies media access.
2014-09-09 18:21:03 +01:00
ccfb42e4ff
Don't try setting up the call if the user has canceled it before allowing permission.
2014-09-09 17:58:26 +01:00
25e96f82db
Don't break if you press the hangup button before allowing media permission.
2014-09-09 17:52:01 +01:00
253c327252
Don't play an engaged tone if we hang up locally.
2014-09-09 17:38:40 +01:00
1ef51e7939
Improved room page loading flow: do pagination only when the members list is available.
...
Killed an unexpected pagination trigger when the page load: paginateMore
2014-09-09 16:46:30 +02:00
746ed57c0e
When the user has been kicked or banned from a room, remove the room from his recents list
2014-09-09 16:31:50 +02:00
5132fcdb8b
Made recents list display something when joining a room which we do not have state data yet
2014-09-09 16:10:20 +02:00
332986ba43
BF: prevent joined messages to be displayed twice when joining a room.
...
Do this by synchronizing the m.room.member joined event from the events stream and the start of the pagination
2014-09-09 16:10:20 +02:00
472b4fe48c
make calls work in Firefox
2014-09-09 14:54:06 +01:00
fd2d3fcfd7
Removed historical code: recents does not need to manage presences. It is already done by initialSync in eventStreamService
2014-09-09 12:47:42 +02:00
967ac65586
BF: Made the grey background of the current room cover all the cell width
2014-09-09 12:47:42 +02:00
16b40cbede
Show call invites in the message table
2014-09-09 11:45:36 +01:00
75890d7bdd
CSS tweakage
2014-09-08 19:02:23 -07:00
e8f19b4c0d
Display a 'Set Topic' button if there is no topic or it's a 0-len string.
2014-09-08 18:59:26 -07:00
6bdb23449a
Add ability to set topic by double-clicking on the topic text then hitting enter.
2014-09-08 18:40:34 -07:00
f64cc237fc
Fixed bug which displayed an older room topic because it was being returned from /initialSync messages key. Check the ts of the event before clobbering state.
2014-09-08 17:27:51 -07:00
ef2111099a
long topic is long. CSS support it
2014-09-08 17:19:04 -07:00
df50a6823f
Display public room topics if they exist on the public room list.
2014-09-08 17:14:58 -07:00
324020d5fe
Display the room topic in the room, underneath the name of the room.
2014-09-08 15:36:52 -07:00
a3590dfa26
Bodge to default to '1 users' when you create a room, which is better than blindly assuming a recents controller is writing to rootScope.rooms and setting numUsersInRoom there.
2014-09-08 14:01:34 -07:00
da9b7b0368
Added big massive TODOs on a huge design problem with initial sync
2014-09-08 13:54:09 -07:00
054fad5360
Float right the num users, apply room highlight to user count.
2014-09-08 13:28:55 -07:00
e0954f3b36
Better checks are better.
2014-09-08 12:15:29 -07:00
76fe7d4eba
Added num_joined_users key to /publicRooms for each room. Show this information in the webclient.
2014-09-08 12:15:29 -07:00
2eaa199e6a
Added number of users in recent rooms.
2014-09-08 11:55:29 -07:00
de727f854a
Make #matrix public rooms bold to make them stand out from the other public rooms. Ideally this would be metadata in /publicRooms to say something like 'featured channel', but for now, just make it a client side check.
2014-09-08 11:33:12 -07:00
0627366b2f
Sort the public room list by display name.
2014-09-08 11:17:44 -07:00
d81e7dc00e
Added /join description
2014-09-08 18:25:56 +02:00
9a5f224931
matrixService.rooms must be renamed matrixService.initialSync now
2014-09-08 18:21:41 +02:00
21d6ce2380
App startup improvements:
...
- do one and only one initialSync when the app starts. (recents-controller does not do its own anymore)
- initialSync: get only the last message per room instead of default number of messages (10)
Prevent recents-controller from loosing its data each time the page URL changes
2014-09-08 18:14:35 +02:00
972f664b6b
add sounds to the calling interface
2014-09-08 16:10:36 +01:00
a0a609e8af
fix embarassing bug where in-progress messages get vaped when the previous one gets delivered
2014-09-08 11:28:51 +02:00
dc1f202eca
fix desktop notifs, which were broken in eab463fd
2014-09-08 11:28:51 +02:00
ce5cd2202f
Center recaptcha dialog.
2014-09-08 11:28:51 +02:00
ef0304beff
disable broken event dup suppression, and fix echo for /me
2014-09-08 11:28:50 +02:00
dd2ae64120
Set the room_alias field when we encounter a new one, rather than only from local storage.
2014-09-08 11:28:50 +02:00
cde6bdfa77
Use the room_display_name when presenting on the home page, and not the room_alias which may not be set.
2014-09-08 11:28:50 +02:00
f397b2264c
https when loading recaptcha js
2014-09-08 11:28:50 +02:00
24f0bb4af5
Revert "BF: Made notification work again (forgot to renamed "offline" to "unavailable")"
...
This reverts commit c3f9d8e41b
2014-09-08 11:09:14 +02:00
c3f9d8e41b
BF: Made notification work again (forgot to renamed "offline" to "unavailable")
2014-09-08 10:28:07 +02:00
64b6f09b0d
fix embarassing bug where in-progress messages get vaped when the previous one gets delivered
2014-09-06 17:48:16 -07:00
41907209bb
fix desktop notifs, which were broken in eab463fd
2014-09-06 10:26:41 -07:00
9e0c3e7838
Center recaptcha dialog.
2014-09-06 10:15:05 -07:00
44bd5e04dd
disable broken event dup suppression, and fix echo for /me
2014-09-06 10:14:05 -07:00
9be1b2cb23
Set the room_alias field when we encounter a new one, rather than only from local storage.
2014-09-06 09:57:13 -07:00
92800afd95
Use the room_display_name when presenting on the home page, and not the room_alias which may not be set.
2014-09-06 09:53:39 -07:00
929cb12e7e
https when loading recaptcha js
2014-09-06 09:47:30 -07:00
6e341aebab
dedup all events
2014-09-06 00:36:55 -07:00
a1bf28b7f0
handle m.room.aliases for id<->alias mapping; remove local_storage map; stop local echo flickering by removing opacity transition for now; implement /join
2014-09-06 00:32:39 -07:00
1a298aad9c
Added captcha support on both the HS and web client.
...
Merge branch 'captcha' of github.com:matrix-org/synapse into develop
2014-09-05 23:32:51 -07:00
a342867d3f
Added instructions for setting up captcha in an obviously named file.
2014-09-05 23:32:07 -07:00
b5749c75d9
Reload captchas when they fail. Cleanup on success.
2014-09-05 23:08:39 -07:00
0b9e1e7b56
Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.
2014-09-05 17:58:06 -07:00
c80f739461
Added webclient config.js for storing recaptcha public key.
2014-09-05 17:36:09 -07:00
c03c255304
Better call bar (visually: still lacks ring[back] tones).
2014-09-06 00:14:02 +01:00
130458385e
Modified matrixService.register to specify if captcha results should be sent with the registration request. This is toggleable via useCaptcha in register-controller.
2014-09-05 13:56:36 -07:00
0280176ccd
Added basic captcha, not hooked up
2014-09-05 13:31:47 -07:00
b3be06667d
BF: tab completion did not work with commands. $scope.input contained only the typed chars not the result of the completion.
...
Needed to fire an event so that ng update the input model
2014-09-05 18:46:34 +02:00
8a7f7f5004
BF: Update the members list on banned & kicked "events"
2014-09-05 18:05:23 +02:00
12a23f01b4
autoscroll down(if the scroller was already at the bottom) when receiving member events
2014-09-05 17:52:11 +02:00
3a88808983
doc: kick can take a reason arg
2014-09-05 17:32:35 +02:00
3be6156774
Created kick & unban methods in matrixService. Made some factorisation.
2014-09-05 17:30:50 +02:00
cf4c17deaf
Added sanity checks in commands
2014-09-05 17:23:41 +02:00
3501478828
BF: Make /unban work again
2014-09-05 16:56:50 +02:00
dcf0a6fbfd
Display ban & kick reason
2014-09-05 16:45:59 +02:00
4b7a5b7bfa
Fixed empty display name (content.displayname in a room member can be null)
2014-09-05 15:54:34 +02:00
ec1cc29ecb
Revert "Fixed empty display name (content.displayname in a room member can be null)"
...
This reverts commit f286a4fcd4
2014-09-05 15:53:44 +02:00
f286a4fcd4
Fixed empty display name (content.displayname in a room member can be null)
2014-09-05 15:50:44 +02:00
585e98fe2b
BF: Fixed members list layout when the scrollbar appears
2014-09-05 15:37:51 +02:00
c407ed070c
BF: Show "Bob invited you" in recents when Bob invites the user
2014-09-05 14:55:17 +02:00
6baaa18224
hide the forgot password link until it works
2014-09-05 13:11:11 +01:00
584591c3e3
Fixed duplicated messages sending in slow network condition.
...
Show the message sending flow state in the messages list:
- While sending, the message appears semi transparent in the chat.
- If successfully sent, it appears as before, ie normal
- In case of failure, it appears in red with an Unsent text.
2014-09-05 14:09:14 +02:00
43369cbe06
Cleaned all sending references as it not used
2014-09-05 11:13:33 +02:00
3bfffab201
Do not systematically scroll to the bottom on new events in the room
2014-09-05 10:40:59 +02:00
3bc7bba262
switch IRC-style command parser to use regexps rather than split(" ") so that it doesn't choke on consecutive whitespaces
...
yield better errors for invalid commands
don't pass invalid commands through as messages
support kick reasons
2014-09-04 23:14:52 -07:00
1bf6c3faad
BF: presence PUT requests stopped to work with old "state" param yesterday evening :( - cda31fb755?diff=unified
2014-09-04 15:10:43 +02:00
3ab8cfbc14
Fixed registration flow when registering with matrixID & password and no email
2014-09-04 14:04:35 +02:00
3983bae160
Added mUserDisplayName, a filter to resolve a user display name from a user_id
2014-09-04 13:57:27 +02:00
7346ea85c0
Moved mRoomName filter into matrix-filter.js, a place for all generic filters using Matrix data.
2014-09-04 13:43:48 +02:00
eb7d7ce354
Re-apply fixes to the link-email screen to make it work again (in a somewhat temporary way until home servers sign associations). Unhide the linked emails box.
2014-09-04 11:38:26 +01:00
b1b57a3f28
BF: Do not filter incoming member events. Before, only invitations to the current user were showned in the recents.
2014-09-04 11:03:49 +02:00
82cf76a8f9
Report ban/unban messages to recents lists
2014-09-04 09:08:34 +02:00
284d6b279b
Hide email link UI from the settings because it doesn't work.
2014-09-03 19:00:56 +01:00
6322aa154b
Added more ng-if to make nice sentences like "Bob kicked Alice" or "Bob unbanned Alice"
2014-09-03 19:52:09 +02:00
7f01d1d8c8
better error msgs
2014-09-03 18:39:09 +01:00
069a9745b0
Ignore leave members in the list too
2014-09-03 19:37:54 +02:00
78087617d1
Fixed used of state_key instead of user_id in member events.
...
Needed to split into 2 conditional spans for grammar reason
2014-09-03 19:29:36 +02:00
d72ce4da64
Merge branch 'develop' of github.com:matrix-org/synapse into develop
...
Conflicts:
synapse/http/client.py
2014-09-03 18:25:17 +01:00
a25d1530ef
Make registering and logging in with a threepid work in the webclient.
2014-09-03 18:23:56 +01:00
66a5bc4fad
Fix ban path
2014-09-03 18:19:57 +01:00
0d75b9fa96
Fix a few cases where we used user_id instead of state_key
2014-09-03 18:03:10 +01:00
1a32b1f002
Normalise users power levels so that the user with the higher power level will have a bar covering 100% of the width of his avatar
2014-09-03 18:55:48 +02:00
5dd1a738f8
Use /rooms/$room_id/state/m.room.member/$user_id to change the membership of another user
2014-09-03 18:33:51 +02:00
8a7c1d6a00
fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
2014-09-03 17:31:57 +01:00
5f7cdbe0b8
List commands and their usage in the settings page
2014-09-03 17:02:02 +02:00
ede161d296
Added /kick $user_id
2014-09-03 17:02:02 +02:00
277fd2250a
Added /unban $user_id
2014-09-03 15:58:40 +02:00
Kegan Dougal