Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 96567dad0d Fix NPE when we don't know the sender of an event Richard van der Hoff 2016-08-25 16:55:09 +01:00
  • 36d8fa9786 fix avatar clicking in memberinfo Matthew Hodgson 2016-08-25 16:20:31 +01:00
  • c1db6fb42d Merge pull request #429 from matrix-org/rav/timelinepanel_test Richard van der Hoff 2016-08-25 15:40:03 +01:00
  • dd77cd74d1 Add text prefix to test event content Richard van der Hoff 2016-08-25 15:13:28 +01:00
  • 64bbebb135 Merge pull request #2007 from vector-im/rav/travis Richard van der Hoff 2016-08-25 14:33:32 +01:00
  • ebad3da6dd Use node v6 for travis Richard van der Hoff 2016-08-25 14:26:56 +01:00
  • 4633d16a6b Merge branch 'develop' into rav/travis Richard van der Hoff 2016-08-25 14:26:20 +01:00
  • df026aede2 Switch to node 6 Richard van der Hoff 2016-08-25 14:25:05 +01:00
  • d495a5b747 Merge branch 'rav/fix_build' into develop Richard van der Hoff 2016-08-25 12:23:48 +01:00
  • 042a6b58c4 Remove redundant whatwg import Richard van der Hoff 2016-08-25 12:14:49 +01:00
  • d87cf6c02b Transpile the react-sdk before running travis tests Richard van der Hoff 2016-08-25 12:12:20 +01:00
  • 0c99c5563f Add .travis.yml Richard van der Hoff 2016-08-25 11:56:49 +01:00
  • 3934e37f77 Merge pull request #1972 from aviraldg/feature-changelog Matthew Hodgson 2016-08-24 18:02:00 +01:00
  • ae910d82a8 Merge pull request #416 from aviraldg/feature-changelog Matthew Hodgson 2016-08-24 18:01:39 +01:00
  • 6bcf9cc9db TimelinePanel-test: Hackery to make it pass Richard van der Hoff 2016-08-24 17:30:53 +01:00
  • cdd2902b01 Update annoying TimelinePanel test Richard van der Hoff 2016-08-24 15:48:19 +01:00
  • 97fc4249d4 Merge pull request #428 from matrix-org/kegan/state-key-with-underscores Kegsay 2016-08-24 15:09:44 +01:00
  • c292312115 Send bot options with leading underscore on the state key Kegan Dougal 2016-08-24 14:54:44 +01:00
  • 2ee4fa484e Merge pull request #1978 from aviraldg/feature-autocomplete-improvements Matthew Hodgson 2016-08-24 14:48:06 +01:00
  • 2f0599aae1 Merge pull request #419 from aviraldg/feature-autocomplete-improvements Matthew Hodgson 2016-08-24 14:47:22 +01:00
  • 6235d88b55 Missing return Kegan Dougal 2016-08-24 14:10:21 +01:00
  • 82a822820f Merge pull request #427 from matrix-org/kegan/postmessage-bot-options Kegsay 2016-08-24 13:51:31 +01:00
  • 73ba55abad s/then/done/ to throw uncaught exceptions if the error function throws Kegan Dougal 2016-08-24 13:47:35 +01:00
  • dbff5f671e Add ability to query and set bot options Kegan Dougal 2016-08-24 13:23:06 +01:00
  • bc7948d75f Merge remote-tracking branch 'origin/master' into develop Richard van der Hoff 2016-08-24 10:24:35 +01:00
  • 5348b8a980 Merge pull request #2001 from vector-im/rav/fix_readme_lies Richard van der Hoff 2016-08-24 10:22:38 +01:00
  • f2936dc15c Update encryption info in README Richard van der Hoff 2016-08-23 18:07:07 +01:00
  • fb4d3a9729 Merge pull request #425 from matrix-org/markjh/travis Mark Haines 2016-08-23 17:20:30 +01:00
  • 864f9747f0 Merge pull request #2000 from vector-im/wmwragg/chat-message-presentation Matthew Hodgson 2016-08-23 17:14:21 +01:00
  • 08c0d7e298 Merge pull request #426 from matrix-org/wmwragg/chat-message-presentation Matthew Hodgson 2016-08-23 17:14:11 +01:00
  • ae8234ffe3 Added event/info message avatars back in wmwragg 2016-08-23 15:58:27 +01:00
  • 3ea62eb73a Added event/info message avatars back in wmwragg 2016-08-23 15:57:53 +01:00
  • 763d3bf9e7 Add .travis.yml Mark Haines 2016-08-23 15:05:50 +01:00
  • c10208a203 Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api Kegsay 2016-08-23 15:00:44 +01:00
  • 0dbc3ce344 Merge pull request #424 from matrix-org/rav/fix_react_test Richard van der Hoff 2016-08-23 14:56:21 +01:00
  • ecc7850e13 Trailing ) Kegan Dougal 2016-08-23 14:50:52 +01:00
  • 1c649303e3 Consistency with sendResponse Kegan Dougal 2016-08-23 14:50:29 +01:00
  • e96a40004b Review comments Kegan Dougal 2016-08-23 14:41:47 +01:00
  • 70c0290aec Fix TimelinePanel test Richard van der Hoff 2016-08-23 14:39:44 +01:00
  • 2fae966884 notification panel WIP Matthew Hodgson 2016-08-23 14:28:10 +01:00
  • f888ec6e81 notification panel WIP Matthew Hodgson 2016-08-23 14:27:58 +01:00
  • f6b008350d Spaces not tabs Kegan Dougal 2016-08-23 13:31:55 +01:00
  • d2e8201d79 Making sure that the sub list count always stays up to date, including when people read the outstanding notifications wmwragg 2016-08-23 13:24:02 +01:00
  • 65d7d01dfa Merge branch 'develop' into wmwragg/direct-chat-sublist wmwragg 2016-08-23 12:49:43 +01:00
  • 6a4d02ffc5 Merge branch 'develop' into wmwragg/direct-chat-sublist wmwragg 2016-08-23 12:49:21 +01:00
  • c362d4ff01 Added updating of count when room tile notification state changed wmwragg 2016-08-23 12:40:28 +01:00
  • 2cf2df20f6 Added updating of count when room tile notification state changed wmwragg 2016-08-23 12:40:15 +01:00
  • 1a2475ebba Merge pull request #422 from matrix-org/wmwragg/chat-message-presentation Matthew Hodgson 2016-08-23 12:20:03 +01:00
  • 1d1f89e0de Merge pull request #1987 from vector-im/wmwragg/chat-message-presentation Matthew Hodgson 2016-08-23 12:19:58 +01:00
  • 9162a0ff01 Add postMessage API required for integration provisioning Kegan Dougal 2016-08-23 12:00:11 +01:00
  • ee73bc3aa4 Refactor of the badge logic, and also added no badges when zero notifications wmwragg 2016-08-23 11:35:03 +01:00
  • d3fa680373 Added all the notification states to the sub list count logic wmwragg 2016-08-23 11:14:45 +01:00
  • ef9d6d45b6 Merge branch 'develop' into wmwragg/direct-chat-sublist wmwragg 2016-08-23 10:54:05 +01:00
  • 6d1f9003e2 Merge branch 'develop' into wmwragg/direct-chat-sublist wmwragg 2016-08-23 10:52:50 +01:00
  • a980864886 Initial sub list notifications count. Still needs propagation of muting/unmuting etc. events from room tile up to sub list wmwragg 2016-08-23 10:47:17 +01:00
  • ca4d506391 Header wording for capped truncation count updated wmwragg 2016-08-22 22:47:00 +01:00
  • 884abbd7e9 Cleanup autocomplete Aviral Dasgupta 2016-08-23 00:36:31 +05:30
  • 554c33a883 Extract autocomplete styling to CSS Aviral Dasgupta 2016-08-23 00:36:01 +05:30
  • 56813eb11e remove whatwg-fetch and use browser-request Aviral Dasgupta 2016-08-19 00:24:00 +05:30
  • 4d5e3bc22b Initial tag section header badge wmwragg 2016-08-22 17:25:43 +01:00
  • ff55a951c9 Number of rooms added to header of sections wmwragg 2016-08-22 17:02:52 +01:00
  • 895172d498 Added catch to help get the Historical and any other weird sections into a sound state, so the states can then change correctly from then on wmwragg 2016-08-22 16:42:08 +01:00
  • 71f73d8df2 Collapsing and truncation initial state and onClick event logic wmwragg 2016-08-22 15:50:36 +01:00
  • edb7301b37 Moving the drirect messages above rooms wmwragg 2016-08-22 14:10:51 +01:00
  • 97daca4b31 Initial restyle of the sub lists and room lists wmwragg 2016-08-22 14:10:06 +01:00
  • e9eafc3380 Further tweak wmwragg 2016-08-22 11:15:49 +01:00
  • 600a1cae79 Read avatars position tweaked, now that the spacing has changed wmwragg 2016-08-22 11:13:42 +01:00
  • 0b1fc1b925 Avatar and Sender Profile alignment, along with reducing the distance between initial messages and the previous one wmwragg 2016-08-22 10:45:00 +01:00
  • bdaa9faea0 Added the font-size back in, as the textarea gets overidden otherwise wmwragg 2016-08-19 18:03:12 +01:00
  • dbadb07adf Moved the font-size into the .mx_MessageComposer_input so that it sets the size for RTE as well as normal composer wmwragg 2016-08-19 17:57:24 +01:00
  • 4a2c899d05 Merge branch 'develop' into wmwragg/chat-message-presentation wmwragg 2016-08-19 17:22:26 +01:00
  • 48a2567b82 Merge branch 'develop' into wmwragg/chat-message-presentation wmwragg 2016-08-19 17:19:30 +01:00
  • 85084f5fd7 Fixed spacing on multiline messages wmwragg 2016-08-19 16:46:15 +01:00
  • 993333490d Removal of the mini avatars for action (info) messages wmwragg 2016-08-19 16:38:05 +01:00
  • 78692c83a6 Removal of the mini avatars for action (info) messages wmwragg 2016-08-19 16:37:45 +01:00
  • 173e6011e8 Alignment tweak to the readAvatars wmwragg 2016-08-19 11:12:06 +01:00
  • 9e542ba232 Alignment adjustment so that the readAvatars sit in the center of the top line in a new message wmwragg 2016-08-19 10:58:51 +01:00
  • 5005675561 Some CSS tidy-up, and fix for readAvatars when the message is not classed as a continuation, but is an info message wmwragg 2016-08-18 22:50:40 +01:00
  • afd1ab1582 Comment to describe what info messages are wmwragg 2016-08-18 22:19:23 +01:00
  • ddda435e9e Updated the MessagePanel to now take account of /me messages when working out if an event is a continuation message or not wmwragg 2016-08-18 22:15:53 +01:00
  • 29759ca71e Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message wmwragg 2016-08-18 21:54:07 +01:00
  • a55c4a2a52 Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message wmwragg 2016-08-18 21:53:37 +01:00
  • be28a96d8d add fancy changelog dialog Aviral Dasgupta 2016-08-16 03:30:26 +05:30
  • d23ed642a0 Merge pull request #421 from matrix-org/dbkr/fix_mute_to_all_messages David Baker 2016-08-18 17:11:57 +01:00
  • 5495cfaca9 Only try to delete room rule if it exists David Baker 2016-08-18 16:59:25 +01:00
  • 9b5e5c9acb squidge video icon a bit Matthew Hodgson 2016-08-18 16:47:52 +01:00
  • fbbbd44dc3 Merge pull request #1982 from vector-im/dbkr/make_notif_silder_work David Baker 2016-08-18 15:24:14 +01:00
  • e29be619c9 Merge pull request #420 from matrix-org/dbkr/make_notif_silder_work Richard van der Hoff 2016-08-18 15:23:45 +01:00
  • d08f716681 Comment override rule stuff David Baker 2016-08-18 15:21:46 +01:00
  • fc2c62e896 We can use the new consts here David Baker 2016-08-18 15:19:24 +01:00
  • bab2f23db3 Oops, missed a constant David Baker 2016-08-18 15:18:02 +01:00
  • af48b8920e Various PR feedback David Baker 2016-08-18 14:00:14 +01:00
  • 0bb3eaaf67 Use constants David Baker 2016-08-18 13:46:47 +01:00
  • 9e45279894 Use enumalike thing David Baker 2016-08-18 13:44:58 +01:00
  • e48d68a449 PR feedback David Baker 2016-08-18 13:11:57 +01:00
  • 73e486cc58 Hide red highlight badge in mute mode David Baker 2016-08-18 11:58:27 +01:00
  • 67175c5a72 Positional tweaks, and font standardisation, so all browser now use ttf, so sizing is the same across all browsers wmwragg 2016-08-18 11:15:42 +01:00
  • dd088794c2 Remove the mute toggle from room settings David Baker 2016-08-17 18:50:34 +01:00
  • 6b0aeefc66 RoomNotifs.js moved to react-sdk David Baker 2016-08-17 18:29:38 +01:00
  • 87f94bde62 Fix up notification setting listener in roomtile David Baker 2016-08-17 18:26:37 +01:00