  David BakerandGitHub
|
3df686c272
|
Merge pull request #638 from matrix-org/rav/unbreak_verification
Fix device verification from e2e info
|
2017-01-23 12:33:25 +00:00 |
|
|
David BakerandGitHub
|
f64a4e0ecb
|
Merge pull request #623 from matrix-org/dbkr/user_search_word_boundary
Make user search do a bit better on word boundary
|
2017-01-23 11:31:26 +00:00 |
|
|
David BakerandGitHub
|
7351223fd4
|
Merge pull request #633 from matrix-org/rav/fix_deactivate_error
Fix error display in account deactivate dialog
|
2017-01-20 11:29:56 +00:00 |
|
|
David BakerandGitHub
|
bd0706f103
|
Merge pull request #626 from matrix-org/dbkr/sanitize_chatinvitedialog
Sanitize ChatInviteDialog
|
2017-01-19 18:23:36 +00:00 |
|
|
David BakerandGitHub
|
9e0c7a11d0
|
Merge pull request #628 from matrix-org/luke/feature-team-reg-auto-join-rooms
Implement auto-join rooms on registration
|
2017-01-19 11:44:37 +00:00 |
|
|
David BakerandGitHub
|
cf8af5f49e
|
Merge pull request #619 from matrix-org/kegan/better-reg-err-msgs
Fix vector-im/riot-web#2833 : Fail nicely when people try to register numeric user IDs
|
2017-01-17 11:54:05 +00:00 |
|
|
David BakerandGitHub
|
6d07a1b7e3
|
Merge pull request #612 from matrix-org/dbkr/ci_build_js_sdk
Build the js-sdk in the CI script
|
2017-01-12 17:37:09 +00:00 |
|
|
David BakerandGitHub
|
1f96467145
|
Merge pull request #609 from matrix-org/luke/fix-join-part-collapsing-redacted-joins
Fix redacted member events being visible
|
2017-01-11 17:10:35 +00:00 |
|
|
David BakerandGitHub
|
4e1af30186
|
Merge pull request #611 from matrix-org/luke/fix-join-part-collapsing-use-state-key
Use `getStateKey` instead of `getSender`
|
2017-01-11 17:09:14 +00:00 |
|
|
David BakerandGitHub
|
e95f5b959f
|
Merge pull request #608 from matrix-org/dbkr/move_screen_sharing_error
Move screen sharing error check into platform
|
2017-01-11 10:12:51 +00:00 |
|
|
David BakerandGitHub
|
085f134e84
|
Merge pull request #606 from matrix-org/dbkr/fix_forgot_password_create_account
Fix 'create account' link in 'forgot password'
|
2017-01-10 15:27:51 +00:00 |
|
|
David BakerandGitHub
|
fd44d9f4d6
|
Merge pull request #597 from matrix-org/dbkr/delete_threepid
Add support for deleting threepids
|
2016-12-22 15:31:34 +00:00 |
|
|
David BakerandGitHub
|
8a3f2d9e91
|
Merge pull request #598 from matrix-org/dbkr/display_msisdn_threepid
Display msisdn threepids as 'Phone'
|
2016-12-22 15:28:09 +00:00 |
|
|
David BakerandGitHub
|
aed5a95c8f
|
Merge pull request #589 from matrix-org/dbkr/dont_crash_if_no_dmroommap
Don't throw exception on stop if no DMRoomMap
|
2016-12-09 11:04:33 +00:00 |
|
|
David BakerandGitHub
|
6a017ba763
|
Merge pull request #587 from matrix-org/dbkr/fix_test_fail
Fix failing test
|
2016-12-09 11:04:23 +00:00 |
|
|
David BakerandGitHub
|
fe0dc85d66
|
Merge pull request #583 from matrix-org/luke/fix-post-message-api-origin-check
Allow integration UI URLs with paths
|
2016-12-06 15:00:26 +00:00 |
|
|
David BakerandGitHub
|
868e16c366
|
Merge pull request #576 from matrix-org/kegan/cutting-doesnt-clear-tab-complete
Make cut operations update the tab complete list
|
2016-11-30 11:08:18 +00:00 |
|
|
David BakerandGitHub
|
03bd4b1457
|
Merge pull request #574 from matrix-org/rav/s_block_blacklist
s/block/blacklist for e2e
|
2016-11-29 19:09:18 +00:00 |
|
|
David BakerandGitHub
|
56f224e513
|
Merge pull request #571 from matrix-org/dbkr/fix_login_crash
Fix crash on logging in
|
2016-11-24 15:10:40 +00:00 |
|
|
David BakerandGitHub
|
815f676cbe
|
Merge pull request #568 from matrix-org/markjh/bump
Bump browser-encrypt-attachment to v0.2.0
|
2016-11-22 19:20:02 +00:00 |
|
|
David BakerandGitHub
|
9c0ee84fb8
|
Merge pull request #565 from matrix-org/rav/fix_quote_e2e
Fix 'Quote' for e2e messages
|
2016-11-21 10:06:37 +00:00 |
|
|
David BakerandGitHub
|
218ced0276
|
Merge pull request #557 from matrix-org/rav/show_padlock_on_unencrypted_room
Show an open padlock for unencrypted rooms
|
2016-11-16 13:03:52 +00:00 |
|
|
David BakerandGitHub
|
32a5d31f01
|
Merge pull request #558 from matrix-org/markjh/presentable
Clean up MFileBody.presentableTextForFile
|
2016-11-15 16:12:52 +00:00 |
|
|
David BakerandGitHub
|
bb776c217d
|
Merge pull request #556 from matrix-org/rav/decrypt_after_keys_arrive
Update eventtiles when the events are decrypted
|
2016-11-15 14:56:21 +00:00 |
|
|
David BakerandGitHub
|
ec999f6fa1
|
Merge pull request #552 from matrix-org/rav/event_tile_withmatrixclient
Update EventTile to use WithMatrixClient instead of MatrixClientPeg
|
2016-11-15 11:25:48 +00:00 |
|
|
David BakerandGitHub
|
45bd234c38
|
Merge pull request #549 from matrix-org/markjh/disable_conferencing_for_e2e
Disable conference calling for encrypted rooms
|
2016-11-11 16:01:47 +00:00 |
|
|
David BakerandGitHub
|
1ff3a86457
|
Merge pull request #548 from matrix-org/markjh/encrypted-attachments
Encrypt attachments in encrypted rooms
|
2016-11-11 14:49:52 +00:00 |
|
|
David BakerandGitHub
|
1e163eabf0
|
Revert "Encrypt attachments in encrypted rooms,"
|
2016-11-11 11:59:08 +00:00 |
|
|
David BakerandGitHub
|
3e9414b21e
|
Merge pull request #533 from matrix-org/markjh/encrypted-attachments
Encrypt attachments in encrypted rooms,
|
2016-11-09 09:45:01 +00:00 |
|
|
David BakerandGitHub
|
884ae0e218
|
Merge pull request #541 from matrix-org/dbkr/dont_preview_matrix_to
Don't do URL previews for matrix.to
|
2016-11-07 12:32:33 +00:00 |
|
|
David BakerandGitHub
|
b86f9f362a
|
Merge pull request #540 from matrix-org/rav/fix_npe
Fix NPE in LoggedInView
|
2016-11-07 09:57:46 +00:00 |
|
|
David BakerandGitHub
|
3a0b63dbda
|
Merge pull request #537 from matrix-org/rav/memberinfo_use_client_from_context
Make MemberInfo use the matrixclient from the context
|
2016-11-04 10:59:11 +00:00 |
|
|
David BakerandGitHub
|
0ab46df94a
|
Merge pull request #536 from matrix-org/rav/add_client_to_context
Add the MatrixClient to the react context
|
2016-11-04 10:54:11 +00:00 |
|
|
David BakerandGitHub
|
bd36792303
|
Merge pull request #535 from matrix-org/rav/factor_out_loggedinpanel
Factor out LoggedInView from MatrixChat
|
2016-11-04 10:34:52 +00:00 |
|
|
David BakerandGitHub
|
31a47a9efd
|
Merge pull request #532 from matrix-org/dbkr/platform_version
Move 'new version' support into Platform
|
2016-11-03 13:30:30 +00:00 |
|
|
David BakerandGitHub
|
0944408946
|
Merge pull request #534 from matrix-org/dbkr/platform_notification
Move Notifications into Platform
|
2016-11-02 19:44:12 +00:00 |
|
|
David BakerandGitHub
|
58c0e0e056
|
Merge pull request #531 from matrix-org/dbkr/platform
Move platform-specific functionality into Platform
|
2016-11-02 16:20:20 +00:00 |
|
|
David BakerandGitHub
|
9e69b48762
|
Merge pull request #529 from matrix-org/rav/fix_codestyle_quoting
Fix some markdown in the code style doc
|
2016-11-01 13:13:22 +00:00 |
|
|
David BakerandGitHub
|
a53c1958eb
|
Merge pull request #527 from matrix-org/dbkr/highlight_async
Run highlight.js asynchronously
|
2016-10-27 09:57:23 +01:00 |
|
|
David BakerandGitHub
|
974e4c05c8
|
Merge pull request #528 from matrix-org/rav/fix_tinting
Fix room tinting
|
2016-10-27 09:57:00 +01:00 |
|
|
David BakerandGitHub
|
8395717f9b
|
Merge pull request #525 from matrix-org/dbkr/fix_spin_on_join
Fix CPU spin on joining rooms
|
2016-10-26 15:46:42 +01:00 |
|
|
David BakerandGitHub
|
32ebd8083b
|
Stray comma
|
2016-10-26 15:32:09 +01:00 |
|
|
David BakerandGitHub
|
f56aff7cb9
|
Merge pull request #523 from matrix-org/dbkr/babelrc2
Switch to babel 6, again
|
2016-10-17 17:02:23 +01:00 |
|
|
David BakerandGitHub
|
f722456980
|
Merge pull request #522 from matrix-org/rav/mute_shortcut
Keyboard shortcuts to mute microphone/camera
|
2016-10-17 14:24:15 +01:00 |
|
|
David BakerandGitHub
|
e38b1304fe
|
Merge pull request #521 from matrix-org/revert-519-aviraldg-babelrc
Revert "Switch to babel 6"
|
2016-10-14 18:50:59 +01:00 |
|
|
David BakerandGitHub
|
5b4b81f7dc
|
Revert "Switch to babel 6"
|
2016-10-14 18:49:52 +01:00 |
|
|
David BakerandGitHub
|
5a9148f1cd
|
Merge pull request #519 from matrix-org/aviraldg-babelrc
Switch to babel 6
|
2016-10-14 18:10:46 +01:00 |
|
|
David BakerandGitHub
|
920f498925
|
Merge pull request #517 from matrix-org/rav/interactive_auth_on_device_delete
Interactive auth for device delete
|
2016-10-12 18:31:38 +01:00 |
|
|
David BakerandGitHub
|
ef22ba1f39
|
Merge pull request #516 from matrix-org/rav/interactive_auth_dialog
InteractiveAuthDialog
|
2016-10-12 18:27:23 +01:00 |
|
|
David BakerandGitHub
|
213e3dab35
|
Merge pull request #515 from matrix-org/rav/refactor_captcha_form
Refactor CaptchaForm to put less logic in signupstages
|
2016-10-12 14:00:50 +01:00 |
|
|
David BakerandGitHub
|
6ffddabaaa
|
Merge pull request #513 from matrix-org/rav/test_fixes
A bundle of fixes to the react tests
|
2016-10-11 15:06:37 +01:00 |
|
|
David BakerandGitHub
|
3756add402
|
Merge pull request #502 from matrix-org/dbkr/join_3p_location
Move 'show join button' functionality out
|
2016-10-05 14:00:14 +01:00 |
|
|
David BakerandGitHub
|
6abf6c9ec0
|
Merge pull request #505 from matrix-org/dbkr/dont_replacestate
Fix version going blank after logging in
|
2016-09-30 14:32:01 +01:00 |
|
|
David BakerandGitHub
|
60ce49910a
|
Merge pull request #497 from matrix-org/dbkr/richtext_use_markdown_wrapper
Make RTE mode use the new Markdown wrapper class
|
2016-09-29 15:33:18 +01:00 |
|
|
David BakerandGitHub
|
66ef1e8156
|
Merge pull request #501 from matrix-org/dbkr/get_hs_name
Add 'getHomeServerName' util to client peg
|
2016-09-28 10:22:11 +01:00 |
|
|
David BakerandGitHub
|
2e1644877d
|
Merge pull request #496 from matrix-org/dbkr/directory_search_box
Directory search join button
|
2016-09-26 15:38:45 +01:00 |
|
|
David BakerandGitHub
|
d0a15975c8
|
Merge pull request #492 from matrix-org/dbkr/make_markdown_less_aggressive
Make markdown less aggressive
|
2016-09-23 14:31:20 +01:00 |
|
|
David BakerandGitHub
|
c8f6902da8
|
Merge pull request #494 from matrix-org/rav/reinstate_device_id
Add the deviceId back to memberdeviceinfo
|
2016-09-23 09:40:06 +01:00 |
|
|
David BakerandGitHub
|
898fbcee30
|
Merge pull request #489 from aviraldg/fix-2128
Force-hide autocomplete after sending message.
|
2016-09-22 10:49:23 +01:00 |
|
|
David BakerandGitHub
|
c228fac6d9
|
Merge pull request #488 from aviraldg/fix-2180
force old selection state after creating entities
|
2016-09-22 10:49:10 +01:00 |
|
|
David BakerandGitHub
|
5fa67d9617
|
Merge pull request #490 from matrix-org/rav/encrypted_event_dialog
EncryptedEventDialog updates
|
2016-09-21 10:52:22 +01:00 |
|
|
David BakerandGitHub
|
2fd3c7c5ac
|
Merge pull request #487 from matrix-org/dbkr/incoming_dm_heuristic
Apply heuristic on incoming DMs
|
2016-09-21 10:29:30 +01:00 |
|
|
David BakerandGitHub
|
c40a7a696e
|
Merge pull request #485 from matrix-org/dbkr/riot
Rebrand
|
2016-09-19 13:36:55 +01:00 |
|
|
David BakerandGitHub
|
1341ffca59
|
Merge pull request #479 from matrix-org/dbkr/directory_network_selector
Pass through config for Room Directory
|
2016-09-16 17:08:44 +01:00 |
|
|
David BakerandGitHub
|
283e1ccf4c
|
Merge pull request #468 from matrix-org/dbkr/create_room_modal
Add modal dialog on new room button
|
2016-09-13 17:05:24 +01:00 |
|
|
David BakerandGitHub
|
f82629aed0
|
Merge pull request #463 from matrix-org/dbkr/flag_incoming_dms
Flag incoming DMs as such
|
2016-09-13 16:42:24 +01:00 |
|
|
David BakerandGitHub
|
e49547eb3e
|
Merge pull request #461 from matrix-org/dbkr/dont_reuse_parted_rooms
Don't re-use parted rooms for DMs
|
2016-09-12 18:30:55 +01:00 |
|
|
David BakerandGitHub
|
f6478f111a
|
Merge pull request #458 from matrix-org/dbkr/createdoom_dm
Update createRoom to support creating DM rooms
|
2016-09-12 18:29:43 +01:00 |
|
|
David BakerandGitHub
|
9cff4d59ca
|
Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section
Don't always show DM rooms in Direct Messages
|
2016-09-09 17:35:02 +01:00 |
|
|
David BakerandGitHub
|
78f53bd403
|
Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms
Add DM rooms with that person to the MemberInfo panel
|
2016-09-09 17:30:32 +01:00 |
|
|
David BakerandGitHub
|
c9475e2ae5
|
Merge pull request #449 from matrix-org/dbkr/toggle_dm_room
API for (un)marking rooms as DM rooms
|
2016-09-08 14:11:22 +01:00 |
|
|
David BakerandGitHub
|
bed5aa8c83
|
Merge pull request #446 from matrix-org/dbkr/m_direct_dm_rooms
Track DM rooms in account data
|
2016-09-07 11:28:35 +01:00 |
|
|
David BakerandGitHub
|
80dd927275
|
Merge pull request #445 from matrix-org/dbkr/fix_hide_conference_rooms
Fix: conference rooms were no longer hidden
|
2016-09-05 18:39:15 +01:00 |
|
|
David BakerandGitHub
|
d23ed642a0
|
Merge pull request #421 from matrix-org/dbkr/fix_mute_to_all_messages
Only try to delete room rule if it exists
|
2016-08-18 17:11:57 +01:00 |
|
|
David BakerandGitHub
|
a94d415106
|
Merge pull request #415 from matrix-org/matthew/ignore-local-busy
ignore local busy
|
2016-08-15 17:13:58 +01:00 |
|
|
David BakerandGitHub
|
5a83adc2b6
|
Merge pull request #414 from matrix-org/rav/fix_device_display_name
defaultDeviceDisplayName should be a prop
|
2016-08-12 11:44:57 +01:00 |
|
|
David BakerandGitHub
|
33e9abe421
|
Merge pull request #410 from matrix-org/rav/use_server_device_id
Use server-generated deviceId
|
2016-08-12 11:40:55 +01:00 |
|
|
David BakerandGitHub
|
7992042526
|
Merge pull request #413 from matrix-org/rav/device_display_name
Set initial_device_display_name on login and register
|
2016-08-12 11:28:18 +01:00 |
|
|
David BakerandGitHub
|
cb905dbaef
|
Merge pull request #409 from matrix-org/rav/device_panel_stuff
Add device_id to devices display
|
2016-08-12 10:43:44 +01:00 |
|
|
David BakerandGitHub
|
5f61464195
|
Merge pull request #408 from matrix-org/rav/refactor_matrix_client
Don't use MatrixClientPeg for temporary clients
|
2016-08-12 10:42:58 +01:00 |
|
|
David BakerandGitHub
|
109184aab7
|
Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style
Only show Autocomplete if autocomplete is enabled
|
2016-08-11 16:47:07 +01:00 |
|
|
David BakerandGitHub
|
4f76398b29
|
Merge pull request #407 from matrix-org/rav/refactor_guest_registration
Move guest registration into the login logic
|
2016-08-11 13:13:51 +01:00 |
|
|
David BakerandGitHub
|
4780f9000d
|
Merge pull request #403 from matrix-org/dbkr/multi_invite
Better support for inviting multiple people
|
2016-08-11 12:34:16 +01:00 |
|
|
David BakerandGitHub
|
3b317eb15d
|
Merge pull request #406 from matrix-org/rav/refactor_token_login
Refactor login token
|
2016-08-11 11:09:05 +01:00 |
|
|
David BakerandGitHub
|
6802db05bd
|
Merge pull request #405 from matrix-org/rav/use_right_hs_for_guest_login
Use the current HS for guest login
|
2016-08-11 10:32:37 +01:00 |
|
|
David BakerandGitHub
|
46899a0086
|
Merge pull request #395 from aviraldg/fix-emoji
Various fixes and improvements to emojification.
|
2016-08-11 10:23:00 +01:00 |
|
|
David BakerandGitHub
|
f08519a496
|
Merge pull request #401 from matrix-org/rav/avoid_login_for_guest
Avoid flashing up login screen during guest registration
|
2016-08-10 15:38:34 +01:00 |
|
|
David BakerandGitHub
|
839b985289
|
Merge pull request #400 from matrix-org/rav/cancel_rate_limited_funcs
Cancel calls to rate-limited funcs on unmount
|
2016-08-10 15:37:02 +01:00 |
|
|
David BakerandGitHub
|
6aa5e5a493
|
Merge pull request #399 from matrix-org/rav/refactor_session_rehydration
Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader
|
2016-08-10 12:56:01 +01:00 |
|
|
David BakerandGitHub
|
e0f71977b4
|
Merge pull request #397 from matrix-org/rav/factor_out_sessionloader
Start to factor out session-loading magic
|
2016-08-10 11:40:58 +01:00 |
|
|
David BakerandGitHub
|
13a4bfa8fe
|
Merge pull request #396 from matrix-org/rav/fix_react_warning
Hack around a react warning
|
2016-08-10 10:09:18 +01:00 |
|
|
David BakerandGitHub
|
4b8ad3c102
|
Merge pull request #393 from matrix-org/dbkr/enable_labs
Add config to hide the labs section
|
2016-08-05 17:25:25 +01:00 |
|
|
David BakerandGitHub
|
98e89d4293
|
Merge pull request #392 from matrix-org/dbkr/scalar
Dbkr/scalar
|
2016-08-05 15:43:57 +01:00 |
|
|
David BakerandGitHub
|
cbfb0ad998
|
Merge pull request #377 from matrix-org/dbkr/use_logout_api
Call the logout API when we log out
|
2016-08-03 17:51:42 +01:00 |
|
|
David BakerandGitHub
|
1b39f02141
|
Merge pull request #335 from aviraldg/feature-composer-emoji
feat: code cleanup & emoji replacement in composer
|
2016-08-03 16:18:56 +01:00 |
|
|
David BakerandGitHub
|
03dbdd8c59
|
Merge pull request #387 from matrix-org/rav/react_test_debug
Add more logging to TimelinePanel-test
|
2016-08-03 16:13:23 +01:00 |
|
|
David BakerandGitHub
|
3780d82f6f
|
Merge pull request #386 from matrix-org/rav/default_to_device_id
DevicesPanel: use device_id as a placeholder
|
2016-08-03 16:12:46 +01:00 |
|
|
David BakerandGitHub
|
ff2dd74429
|
Merge pull request #383 from matrix-org/matthew/fix-video-upload
fix upload for video or image files where sniffing fails
|
2016-08-03 15:04:53 +01:00 |
|
|
David BakerandGitHub
|
efdcc6da98
|
Merge pull request #384 from aviraldg/fix-composer-up-down
fix: allow up/down normally for no completions
|
2016-08-03 13:55:13 +01:00 |
|
|
David BakerandGitHub
|
1ff2ce60ff
|
Merge pull request #382 from aviraldg/fix-autocomplete-confirm
fix: autocomplete to use tab instead of return
|
2016-08-03 13:28:11 +01:00 |
|