Commit Graph

1467 Commits

Author SHA1 Message Date
Mark Haines dca3ba2f77 Determine webclient path by the python module it is contained in 2014-11-04 16:19:16 +00:00
Kegan Dougal 4e52f9699b Update .gitignore to ignore config.js files in syweb/webclient. 2014-11-04 16:15:13 +00:00
Mark Haines 89ba802b23 Move webclient to a python module so that it can be installed 2014-11-04 15:57:23 +00:00
Kegsay 020fc15d98 Merge pull request #11 from matrix-org/webclient-room-data-restructure
Webclient room data restructure
2014-11-04 15:44:58 +00:00
Kegan Dougal 1273023ac3 Don't need this; should be on -g path. 2014-11-04 15:35:34 +00:00
Mark Haines 4a73c366fa exclude tests 2014-11-04 15:18:43 +00:00
Mark Haines 402d080990 Fix installation instructions in README 2014-11-04 15:08:13 +00:00
Kegan Dougal ae48e75ad7 Use phantomjs as the default browser and not chrome. 2014-11-04 14:38:45 +00:00
Kegan Dougal 29b54d6638 Update karma.conf.js to A: actually run the tests, and B: generate JUnit XML. 2014-11-04 14:01:25 +00:00
Kegan Dougal f7cf978f68 SYWEB-136: Send m.images according to the spec. 2014-11-04 11:26:03 +00:00
Kegan Dougal 1ac1cd6c14 SYWEB-133: JSON dialog now appears on dblclick to allow users to highlight text. 2014-11-04 11:06:31 +00:00
Kegan Dougal 5949571fe7 SYWEB-116: Implement historical display name support.
This works for both live and paginated events. Each 'message' event has
an associated '__room_member' key which points to the state of the sender
at that point in time. Invites have an additional key '__target_room_member'
which point to the state of the invitee at that point in time. This obviates
the need for mapping user_ids to *current* displaynames in the message list,
though this is still required for the user/presence list.
2014-11-04 10:30:34 +00:00
Kegan Dougal 1c86ec5b8d Rejig display names when paginating to lie less. 2014-11-04 10:18:46 +00:00
Kegan Dougal 43e7ad1b1c Rejig order of checks/state updates/message insertions for m.room.member. Mark known issue. 2014-11-03 17:58:11 +00:00
Kegan Dougal 2438b8b66b Fix off-by-one bug when displaying display names / avatar urls when paginating. 2014-11-03 17:52:41 +00:00
Kegan Dougal efb0f6e23b Backwards compat for old-style avatar_urls 2014-11-03 17:49:09 +00:00
Kegan Dougal 4b3f743885 Reference the room_member key on messages which adjusts for current vs old_room_state. This displays names for historical users correctly, but is off by one (referencing content not prev_content). 2014-11-03 17:44:14 +00:00
Kegan Dougal f3dbcdc7b3 Variable renaming, general cleanup. Don't feed state events from /initialSync twice. 2014-11-03 15:17:32 +00:00
Kegan Dougal 1071d063ab Fix broken redact enable logic. 2014-11-03 15:05:35 +00:00
Kegan Dougal 7614d8f87a Fix hidden event keys being incorrectly shown in the even info dialog. 2014-11-03 15:02:16 +00:00
Kegan Dougal f4e50079de Fix bug which prevented pagination from bumping the list down, causing infini-pagination. 2014-11-03 14:22:09 +00:00
Kegan Dougal 92e2ff4985 Fix bug which prevented room name invites appearing correctly. 2014-11-03 13:48:08 +00:00
Kegan Dougal 9b1ca64a75 Fix bug which prevented the number of users being visible on the recents view. 2014-11-03 13:26:50 +00:00
Kegan Dougal fd535183ee Remove events.rooms[room_id] entirely from event-handler-service.
Everything now uses modelService, but there are still one or two
minor teething problems to fix.
2014-11-03 12:18:22 +00:00
Kegan Dougal 6bc1dc4020 Make recents[controller/filter/html] use modelService.
This breaks functionality whilst both events.rooms and modelService
are in use.
2014-11-03 11:44:39 +00:00
Kegan Dougal 53da1099d1 Make call stuff use modelService. 2014-11-03 10:33:38 +00:00
Kegan Dougal 395bb64b26 Keep matrixService stateless and make matrixFilter use modelService. 2014-11-03 10:23:14 +00:00
Erik Johnston 1c6825cc7a Use python logger, not the twisted logger 2014-11-03 10:16:28 +00:00
Kegan Dougal 5ab9929cbb Prevent EventStreamService from knowing too much about the EventHandlerService by changing the contract to just be a single initialSync response callback. Leave it up the handler to deal with splitting out information from /initialSync. 2014-11-03 09:44:20 +00:00
Erik Johnston 36d730229a Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse into develop 2014-10-31 17:50:06 +00:00
Erik Johnston 13fad06239 Bump version numbers and change log 2014-10-31 17:23:01 +00:00
Kegan Dougal f21960ec9d Replace lots of .events.rooms[room_id] with .room 2014-10-31 17:13:27 +00:00
Kegan Dougal b0f0b7b75e room.html now displays messages from model-service. Add debugging fields. Hook up the room member *at the time* to the message so it can display the right historical member info. 2014-10-31 16:22:15 +00:00
Kegan Dougal ea80b9208d Hook into more of event-handler-service and mimic its functions for now. 2014-10-31 15:16:43 +00:00
Kegan Dougal 394f77c3ff Parse /initialSync data and populate the new data structures. 2014-10-31 14:50:31 +00:00
Kegan Dougal 2aa79f4fbe Added model-service.js to store model data. 2014-10-31 14:26:51 +00:00
Kegan Dougal 71ef8f0636 SYWEB-102: Fix desktop notification msg when a user with no display name joins a room. 2014-10-31 11:56:36 +00:00
Kegan Dougal 20cf0b7aeb Factor out notification logic. 2014-10-31 11:54:04 +00:00
Kegan Dougal ac2a177070 Add notification-service.js to handle binging/notifications. Shift logic to this service. 2014-10-31 11:20:07 +00:00
Kegan Dougal 188de756be SYWEB-45: Display the user_id of a user when hovering over their avatar next to their messages. 2014-10-31 10:06:28 +00:00
Kegan Dougal baf472f83f SYWEB-63: Fix desktop notification message when notifying for an image. 2014-10-31 10:02:56 +00:00
Kegan Dougal 86d3180666 SYWEB-12: You'll be needing this. 2014-10-30 17:33:14 +00:00
Kegan Dougal 864de6a7a4 SYWEB-12: Minor layout tweaks. 2014-10-30 17:23:11 +00:00
Kegan Dougal ea6bec96d3 SYWEB-12: UX tweaks. 2014-10-30 17:16:16 +00:00
Kegan Dougal f618f99ece SYWEB-12: Add ability to add new state events. 2014-10-30 17:01:17 +00:00
Kegan Dougal 0985bfb775 SYWEB-12: Allow edited state events to be submitted. 2014-10-30 16:31:47 +00:00
Kegan Dougal 9de9661baa SYWEB-12: More formatting and tweaking of state event JSON.
Use a proper elastic directive to make the <textarea> resize dynamically.
Use an 'asjson' directive to turn an ngModel of a JSON object into a
formatted JSON string so it can be displayed on the textarea. Also, deep
copy the state events being displayed, else it actually alters the underlying
data structures when playing around with the JSON in the textarea!
2014-10-30 16:21:27 +00:00
Kegan Dougal 6f3f631fd1 SYWEB-12: More formatting. 2014-10-30 13:24:40 +00:00
Kegan Dougal 40342af459 SYWEB-12: Format room info dialog better. 2014-10-30 11:53:28 +00:00
Kegan Dougal 8e8bbb00f5 SYWEB-12: Store unknown state events so they are displayed in the Room Info dialog. 2014-10-30 11:22:47 +00:00