enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Commit Graph

  • f66dd69710 oops, revert - do this on the right branch... Matthew Hodgson 2016-03-15 18:40:03 +00:00
  • 31915db6f6 Remove trailing whitespace Mark Haines 2016-03-15 18:38:24 +00:00
  • b23cad5613 let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161 Matthew Hodgson 2016-03-15 18:35:09 +00:00
  • f70eec62d1 let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161 Matthew Hodgson 2016-03-15 18:35:09 +00:00
  • eb01cb9cba Merge pull request #1037 from vector-im/markjh/change_push_actions Mark Haines 2016-03-15 18:10:04 +00:00
  • 2a8afd49fb mx_Login_fieldLabel CSS Matthew Hodgson 2016-03-15 18:09:54 +00:00
  • 9b85d88036 s/somme/some/ Mark Haines 2016-03-15 15:23:18 +00:00
  • 672a5cb89c Merge pull request #200 from matrix-org/matthew/loginfixes Matthew Hodgson 2016-03-15 15:21:32 +00:00
  • 59866a2006 final PR feedback Matthew Hodgson 2016-03-15 15:20:51 +00:00
  • 836f7ca80d Merge pull request #218 from matrix-org/session_logged_out David Baker 2016-03-15 14:51:50 +00:00
  • 438558da55 PR feedback Matthew Hodgson 2016-03-15 13:48:46 +00:00
  • c2049e991b padding for radio buttons on login pages Matthew Hodgson 2016-03-15 13:37:07 +00:00
  • 1a74b0c487 Merge pull request #216 from matrix-org/matthew/fix-join-by-room-alias Matthew Hodgson 2016-03-15 13:16:51 +00:00
  • 3224a4e49e Add helper functions for decoding and encoding lists of push actions Mark Haines 2016-03-15 11:26:32 +00:00
  • cfc4b89225 fix https://github.com/vector-im/vector-web/issues/1154 Matthew Hodgson 2016-03-15 10:56:54 +00:00
  • 8b1444c954 Port the legacy im.vector rules to the new format on startup Mark Haines 2016-03-15 10:48:47 +00:00
  • a1b875bb25 Handle the new Session.logged_out event. Log the user out and display a message telling them they've been logged out. David Baker 2016-03-15 10:48:16 +00:00
  • 8ea75277e1 Merge pull request #215 from matrix-org/rav/fix_scroll_on_resize Richard van der Hoff 2016-03-15 09:59:44 +00:00
  • 8a905dec58 grey out roomsettings that you can't edit Matthew Hodgson 2016-03-15 02:46:17 +00:00
  • 7c598d90b1 give proper error message on failing to start chat Matthew Hodgson 2016-03-15 02:19:27 +00:00
  • 1abd7f45ce fix setting custom power levels Matthew Hodgson 2016-03-15 01:34:49 +00:00
  • 5e050c6276 hopefully fix https://github.com/vector-im/vector-web/issues/819 Matthew Hodgson 2016-03-15 00:49:44 +00:00
  • 79eb54058f oops, backout WIP Matthew Hodgson 2016-03-15 00:48:19 +00:00
  • 005ebbd037 stop avatar mxids being copy-pastable (unless they contain an initial). should significantly improve https://github.com/vector-im/vector-web/issues/893 Matthew Hodgson 2016-03-15 00:20:56 +00:00
  • ce150646e6 Merge branch 'develop' into rav/fix_scroll_on_resize Richard van der Hoff 2016-03-14 22:32:54 +00:00
  • 0598092f9d Bump to latest react-gemini-scrollbar Richard van der Hoff 2016-03-14 19:02:22 +00:00
  • d4d2ef326e Bump to dev branch of js-sdk Richard van der Hoff 2016-03-14 15:54:56 +00:00
  • 6a0cd9e047 Bump to dev branch of js-sdk Richard van der Hoff 2016-03-14 15:54:33 +00:00
  • 3173898bc1 Bump the timeline limit to 500 Richard van der Hoff 2016-03-14 15:47:09 +00:00
  • 61cd66304e Adjust the scroll position when the gemini panel is resized Richard van der Hoff 2016-03-14 15:29:29 +00:00
  • 2a62fdb652 Switch back to dev version of react-sdk Richard van der Hoff 2016-03-14 14:08:47 +00:00
  • 8a4a810d1f Merge pull request #214 from matrix-org/rav/gemini-resize Richard van der Hoff 2016-03-14 13:59:11 +00:00
  • 74bbb81532 Merge pull request #212 from matrix-org/rav/fix_search_position Richard van der Hoff 2016-03-14 12:49:21 +00:00
  • 6215326f8e Merge pull request #1137 from vector-im/rav/update_README Richard van der Hoff 2016-03-14 12:48:58 +00:00
  • 88b3f2ed8c Use our fork of react-gemini-scrollbar to fix resize issues Richard van der Hoff 2016-03-14 12:46:13 +00:00
  • 22bd0f9aa0 Merge pull request #198 from matrix-org/matthew/confjoinparts Matthew Hodgson 2016-03-13 23:30:31 +00:00
  • 893e338917 incorporate keganfeedback Matthew Hodgson 2016-03-12 19:49:54 +00:00
  • da7e9840f3 reinstate npm 3 warning Richard van der Hoff 2016-03-11 15:12:28 +00:00
  • cc18458bec Update README to include npm install in react-sdk Richard van der Hoff 2016-03-11 15:09:29 +00:00
  • e0c416ee01 Merge pull request #213 from matrix-org/dbkr/redacted_3pid_invite_crash David Baker 2016-03-11 14:39:43 +00:00
  • 928915873b Use npm to fetch react-sdk and js-sdk Richard van der Hoff 2016-03-11 14:30:53 +00:00
  • 1131b82414 Don't crash on redacted (or otherwise invalid) 3pid invites David Baker 2016-03-11 14:18:30 +00:00
  • 8fa059fc4b Prep 0.3.0 Richard van der Hoff 2016-03-11 13:00:31 +00:00
  • fc062072b0 Bump to 0.2.0 Richard van der Hoff 2016-03-11 12:52:21 +00:00
  • eeab97114f Prepare v0.2.0 Richard van der Hoff 2016-03-11 12:48:26 +00:00
  • 02510003dd prep v0.1.1 Richard van der Hoff 2016-03-11 12:24:44 +00:00
  • 1516f17af4 Merge pull request #210 from matrix-org/dbkr/invite_display_when_peekable David Baker 2016-03-11 10:21:04 +00:00
  • 15170f8718 Comment how we're not rejecting 3pid invites David Baker 2016-03-11 10:20:52 +00:00
  • 73781f5619 doc inviterName David Baker 2016-03-10 17:43:20 +00:00
  • 5e7eb3ee92 Stop video tags autoplaying. Richard van der Hoff 2016-03-10 17:38:14 +00:00
  • 3fd066c2d4 Put direct-linked events and search clickthroughs in the middle Richard van der Hoff 2016-03-10 16:44:50 +00:00
  • f985232d29 Merge pull request #211 from matrix-org/rav/update_scrollpanel_on_topbar Richard van der Hoff 2016-03-10 16:56:31 +00:00
  • 2875fa3eb1 Show the invite preview bar when we have a 3pid invite, and make the reject button work. David Baker 2016-03-10 15:56:58 +00:00
  • f9e753f57a Update the gemini panel when we show/hide the TopUnreadMessagesBar Richard van der Hoff 2016-03-10 15:55:03 +00:00
  • 7660276b54 Merge pull request #209 from matrix-org/rav/local_echoes_are_today Richard van der Hoff 2016-03-10 14:34:18 +00:00
  • a841991952 Merge pull request #208 from matrix-org/rav/missing_date_separator Richard van der Hoff 2016-03-10 14:19:52 +00:00
  • 33b7e2046d Merge pull request #1123 from vector-im/rav/mute_desktop_notifs Richard van der Hoff 2016-03-10 14:19:05 +00:00
  • bb4fdfe8ea Merge pull request #207 from matrix-org/rav/mute_desktop_notifs Richard van der Hoff 2016-03-10 14:18:54 +00:00
  • 928b2bb9a7 Use 'today' for the date separator for unsent messages Richard van der Hoff 2016-03-10 14:16:31 +00:00
  • 3bd33d0985 Fix the missing date separator at the start of rooms Richard van der Hoff 2016-03-10 13:39:19 +00:00
  • e777db3fc4 Add setting for audio notifications Richard van der Hoff 2016-03-10 11:01:29 +00:00
  • c5e03913d9 Factor out audio bings to a separate setting Richard van der Hoff 2016-03-10 10:59:40 +00:00
  • f997a6fff2 Merge pull request #206 from matrix-org/dbkr/invites_silently_fail David Baker 2016-03-10 10:07:47 +00:00
  • a74e7b45d0 Return the promise so the failure actually propagates through the promise chain. Makes the invite error handling code work. David Baker 2016-03-09 18:48:38 +00:00
  • ec2e27a754 Merge pull request #205 from matrix-org/rav/shouldComponentUpdates_2 Richard van der Hoff 2016-03-09 17:25:11 +00:00
  • aabdaa737e Merge pull request #204 from matrix-org/rav/jump_to_read_marker_fix Richard van der Hoff 2016-03-09 16:12:16 +00:00
  • 4b333d2363 Update the timeline when a local echo arrives Richard van der Hoff 2016-03-09 15:45:56 +00:00
  • 6c928f12b2 ForceUpdate the scrollpanel when the aux panel changes size Richard van der Hoff 2016-03-08 12:16:34 +00:00
  • 393e8ff612 Revert "Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates"" Richard van der Hoff 2016-03-07 22:27:35 +00:00
  • a9da0a014e Merge pull request #203 from matrix-org/rav/optimize_resize Richard van der Hoff 2016-03-09 15:55:33 +00:00
  • 1a371b346e remove spurious debug Richard van der Hoff 2016-03-09 15:29:12 +00:00
  • d54ee4f247 Merge pull request #201 from matrix-org/dbkr/reuse_guest_account David Baker 2016-03-09 15:49:30 +00:00
  • b45c256427 Don't forceUpdate the message panel on resize Richard van der Hoff 2016-03-08 12:15:02 +00:00
  • f60ac2aa5f Make jump-to-read-marker work when the RM event isn't loaded. Richard van der Hoff 2016-03-09 07:52:45 +00:00
  • f41c0d9bbf Merge pull request #202 from matrix-org/rav/fix_image_load_again Richard van der Hoff 2016-03-08 15:38:27 +00:00
  • 6e23623c28 Fix checkScroll after image load Richard van der Hoff 2016-03-07 22:23:14 +00:00
  • 606fdcb8df Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates" Richard van der Hoff 2016-03-07 17:28:50 +00:00
  • 42a90f49c2 Use the guest access tokens sent in 3pid invite emails. David Baker 2016-03-07 17:11:01 +00:00
  • a2c6bd0e6c Merge pull request #199 from mebjas/develop David Baker 2016-03-07 16:15:45 +00:00
  • 7e7493b336 removed typeof and todo Minhaz A V 2016-03-07 21:16:35 +05:30
  • a7c75b1315 Merge pull request #193 from matrix-org/rav/shouldComponentUpdates Richard van der Hoff 2016-03-07 11:50:38 +00:00
  • a82d3710d1 provide sensibile defaults for PasswordLogin Matthew Hodgson 2016-03-06 18:42:09 -05:00
  • a4d22ffe8c improve IS warning Matthew Hodgson 2016-03-06 17:11:08 -05:00
  • 0bb58dd60c brings back the functionality in login/register/screens that got lost in @kegsay's refactor. specifically: 1) custom HS/IS urls are now persisted in HTML5 local storage. As a result, all the login components now distinguish between default HS/IS URLs and custom specified ones again. ( 2) custom HS/IS urls are synchronised between the instances of ServerConfig found in the Login, Registration and Forgot Password screens. 3) username are persisted over changing homeserver (but not password, to stop accidentally leaking passwords to the wrong server) 4) correctly interpret a blank URL field as meaning the placeholder text 5) when toggling custom URLs on and off, remember what the custom values were, and use the default URLs if custom mode is not engaged Matthew Hodgson 2016-03-06 14:33:36 -05:00
  • 622a4b0e4c improve cosmetics of login prompts slightly Matthew Hodgson 2016-03-06 13:46:27 -05:00
  • 3c1312a9e6 fixed issue vector-im/vector-web 1079 Minhaz A V 2016-03-05 23:36:24 +05:30
  • b66ca74ede fix comments Matthew Hodgson 2016-03-05 02:05:29 +00:00
  • 0d841551a0 prettyprint conference joins and parts properly Matthew Hodgson 2016-03-05 02:30:18 +00:00
  • 7433f50c8c make settings button always visible Matthew Hodgson 2016-03-04 23:16:27 +00:00
  • 052925d95b Merge pull request #194 from matrix-org/audio_notifications David Baker 2016-03-04 18:24:01 +00:00
  • 69a8d65407 Don't pause the audio when we hide the notif: shouldn't be necessary and could cause sound to stop mid-way if a prior notif times out while the sound from a later one is playing. David Baker 2016-03-04 18:16:02 +00:00
  • 7820a5d900 Merge pull request #189 from matrix-org/rav/fix_timeline_react_keys Richard van der Hoff 2016-03-04 17:56:18 +00:00
  • 318bcb1284 Merge pull request #192 from matrix-org/rav/fix_read_receipts Richard van der Hoff 2016-03-04 17:55:29 +00:00
  • 1738fab2ee Merge pull request #190 from matrix-org/rav/reduce_timeline_limit Richard van der Hoff 2016-03-04 17:54:59 +00:00
  • 9c82938b35 Merge pull request #1100 from vector-im/audio_notifications David Baker 2016-03-04 17:54:57 +00:00
  • 66bed45e67 Merge pull request #195 from matrix-org/dbkr/reenable_upgrade_registration David Baker 2016-03-04 17:54:50 +00:00
  • 4e3985d446 Merge pull request #1102 from vector-im/dbkr/reenable_upgrade_registration David Baker 2016-03-04 17:54:47 +00:00
  • b9f508a61e Merge pull request #197 from matrix-org/dbkr/starting_room_alias_tidy David Baker 2016-03-04 17:54:37 +00:00
  • 068429f3e3 Tidy up starting from a room alias when not logged in. David Baker 2016-03-04 17:37:06 +00:00
  • ed4774efdb Merge pull request #196 from matrix-org/matthew/bug186 David Baker 2016-03-04 16:58:56 +00:00