OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,281 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

3281 Commits (b561b711df08b58dec89b02a1b8aacdec10c89c4)

Author SHA1 Message Date
Luke Barnard 7c66d1c867 Sync typing indication with avatar typing indication 
Follow the same rules for displaying "is typing" as with the typing avatars.
 2017-01-24 16:01:39 +00:00
Kegan Dougal 5991172182 Review comments 2017-01-24 15:51:53 +00:00
Kegan Dougal 3b9a112136 Add bug report UI 2017-01-24 14:47:11 +00:00
David Baker 91a052f817 Merge pull request #641 from matrix-org/luke/fix-statusbar-hidden 
Expand timeline in situations when _getIndicator not null
 2017-01-24 14:43:46 +00:00
Luke Barnard ce7434984b Expand timeline in situations when _getIndicator not null 
The status bar will now be expanded when:
 - props.numUnreadMessages
 - !props.atEndOfLiveTimeline
 - props.hasActiveCall
 2017-01-24 14:32:52 +00:00
Luke Barnard bd106968ce Merge branch 'develop' into luke/fix-join-part-collapsing-causality 
Conflicts:
	src/components/structures/MessagePanel.js
 2017-01-24 14:22:18 +00:00
Luke Barnard d690677bde Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality 
Conflicts:
	src/components/views/elements/MemberEventListSummary.js
 2017-01-24 14:17:11 +00:00
David Baker 5091bab657 Fix failed merge #2 2017-01-24 13:59:02 +00:00
David Baker 5f24fc3e5d Fix merge fail 2017-01-24 13:56:22 +00:00
Richard van der Hoff c0de0870ed Some sarcastic comments 2017-01-24 13:32:17 +00:00
Richard van der Hoff e18a6151e4 Merge pull request #640 from matrix-org/dbkr/eslint_find_extend_module 
Correctly get the path of the js-sdk .eslintrc.js
 2017-01-24 11:34:28 +00:00
David Baker f1f6fc809c Merge remote-tracking branch 'origin/develop' into dbkr/user_search_feedback 2017-01-24 11:26:09 +00:00
David Baker c47d3e04a5 Merge pull request #621 from matrix-org/dbkr/add_searching_known_users 
Add 'searching known users' to the user picker
 2017-01-24 10:51:23 +00:00
David Baker 905508f1ce Correctly get the path of the js-sdk .eslintrc.js 
So we work correctly when we're included in another module
 2017-01-23 17:33:09 +00:00
David Baker 1e77b2eba3 Bundle eslint config 2017-01-23 16:19:29 +00:00
David Baker 94fdd2bcd2 lint all 2017-01-23 15:41:33 +00:00
Luke Barnard a06ecb87bc Hide RoomStatusBar when it displays nothing (#615) 
Use CSS class `mx_RoomView_statusArea_expanded` to indicate an expanded status bar. Without this, the status bar may be hidden from view. A 10s debounce will prevent it from bouncing frequently.
 2017-01-23 16:01:39 +01:00
Richard van der Hoff 7a445e05f8 Merge pull request #639 from matrix-org/dbkr/lint_config_mocha 
Add mocha env for tests in eslint config
 2017-01-23 14:51:41 +00:00
David Baker 4d12a65529 Add mocha env for tests in eslint config 2017-01-23 14:16:25 +00:00
David Baker 3cfa539230 Merge pull request #637 from matrix-org/luke/fix-typing-avatars-displays-me 
Fix typing avatars displaying "me"
 2017-01-23 12:43:34 +00:00
David Baker 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
Richard van der Hoff dc08d9dfdf Fix device verification from e2e info 
Don't attempt to reuse the same AsyncWrapper for different dialogs - which ends
up pushing the props for the new dialog into the old dialog.

Fixes https://github.com/vector-im/riot-web/issues/3020
 2017-01-23 12:18:41 +00:00
David Baker 506d37bbad Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users 2017-01-23 11:34:44 +00:00
David Baker 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
Luke Barnard d97fc0a99a Fix typing avatars displaying "me" 2017-01-23 10:25:33 +00:00
Matthew Hodgson 937f13d578 fix a bunch of dark-theme buttons 2017-01-20 21:00:22 +00:00
Luke Barnard 0c5762b91d Implement "someone is typing" avatars (#631) 
When users are typing, their avatars can be seen instead of "..." in the RoomView StatusBar
 2017-01-20 17:51:35 +01:00
Richard van der Hoff f1bb07729f Merge pull request #634 from matrix-org/dbkr/use_js_sdk_eslint 
Use an eslint config based on the js-sdk
 2017-01-20 15:18:58 +00:00
David Baker 18d4d3392a Fix a bunch of linting errors 
eslint --fix and a few manual ones
 2017-01-20 14:22:27 +00:00
David Baker 4ba224aac3 Use eslint config from the js sdk 
Extend the js sdk's eslint config to give as consistent a code
style as possible. Add react/jsx/flow stuff that we use here.
 2017-01-20 14:08:14 +00:00
Richard van der Hoff a16aeeef2a Temporarily add more logging, to try to catch failures on travis 2017-01-20 13:06:06 +00:00
David Baker 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
Richard van der Hoff 2d060c8d2e Fix error display in account deactivate dialog 2017-01-20 11:04:47 +00:00
Matthew Hodgson b76b0f755d fix context menu bg 2017-01-20 02:47:47 +00:00
Richard van der Hoff 16d8e8e681 Merge pull request #629 from matrix-org/rav/test_riot_after_build 
Configure travis to test riot-web after building
 2017-01-19 18:40:13 +00:00
Richard van der Hoff 33d741e83d Do riot-web setup in a different order 
... in an effort to stop npm cocking it up.
 2017-01-19 18:24:28 +00:00
David Baker bd0706f103 Merge pull request #626 from matrix-org/dbkr/sanitize_chatinvitedialog 
Sanitize ChatInviteDialog
 2017-01-19 18:23:36 +00:00
David Baker afa384c4f3 Use null instead of false 2017-01-19 18:13:27 +00:00
Richard van der Hoff af4ef1da8b Install source-map-loader before building riot-web 2017-01-19 17:41:58 +00:00
Richard van der Hoff 2637ae3af3 Merge pull request #630 from matrix-org/rav/fix_themes 
(hopefully) fix theming on Chrome
 2017-01-19 17:34:36 +00:00
Richard van der Hoff dee3495d51 Run riot-web develop, not master 2017-01-19 17:21:03 +00:00
David Baker a2ff1cd8e6 Factor out adding the input field to the list 2017-01-19 17:03:16 +00:00
David Baker ee1f6c772e Remove duplicate case handled above 
And fix typo where it was handled
 2017-01-19 16:50:09 +00:00
David Baker 2a08abaa95 Keep old behaviour of submitting on enter 
if input is empty
 2017-01-19 16:35:40 +00:00
David Baker d8bcc1f067 Merge remote-tracking branch 'origin/develop' into dbkr/sanitize_chatinvitedialog 2017-01-19 16:26:59 +00:00
Richard van der Hoff bb7d589287 Merge pull request #617 from matrix-org/rav/megolm_backup 
Megolm session import and export
 2017-01-19 16:14:18 +00:00
Richard van der Hoff ba2460aef4 Merge pull request #618 from matrix-org/rav/async_dialog 
Allow Modal to be used with async-loaded components
 2017-01-19 16:08:30 +00:00
Richard van der Hoff a88f9fdd73 (hopefully) fix theming on Chrome 
Jump through some hoops to make Chrome behave sensibly on non-default themes.
 2017-01-19 15:36:57 +00:00
Kegsay 89fa47dc26 Merge pull request #622 from kyrias/commonmark-fix-escaping 
Fix escaping markdown by rendering plaintext
 2017-01-19 13:39:07 +00:00
Richard van der Hoff 1b6735d729 Configure travis to test riot-web after building 2017-01-19 13:30:22 +00:00