OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,155 Commits
211 Branches
549 Tags
666 MiB
Commit Graph

5155 Commits (26cb1404c22445ad73f3e258d916980997df5eaf)

Author SHA1 Message Date
Luke Barnard ce0977373e Merge pull request #1058 from matrix-org/luke/fix-event-id-state 
Control currently viewed event via RoomViewStore
 2017-06-08 18:10:29 +01:00
Luke Barnard 5588e115eb Clarify doc for highlighted 2017-06-08 17:57:37 +01:00
Luke Barnard 9892566007 Highlighted means highlighted 2017-06-08 17:54:41 +01:00
Luke Barnard 3218cae6e3 Expect to join by alias if given to RVS 2017-06-08 17:47:48 +01:00
Luke Barnard cd6786114b When joining, use a roomAlias if we have it 
And default to the current roomId otherwise
 2017-06-08 17:40:53 +01:00
Luke Barnard c72edab726 Update doc for getInitialEventId 2017-06-08 17:28:56 +01:00
Luke Barnard cd8093d953 Explicit undefined initialEventPixelOffset 2017-06-08 17:28:21 +01:00
Luke Barnard 8cfdb4ce09 Clarify initial event 2017-06-08 17:27:04 +01:00
Matthew Hodgson df625b0d31 hit MemberInfo with Gemini to fix vector-im/riot-web#4223 2017-06-08 17:26:40 +01:00
Luke Barnard c02dbd1cdc Rename initial state variables 2017-06-08 17:26:08 +01:00
David Baker 3d59fe58dc Merge pull request #1060 from matrix-org/dbkr/fix_login_error_message 
Better error messages for login
 2017-06-08 16:57:40 +01:00
Richard van der Hoff 175599beda Improve error logging/reporting in megolm import/export 
I saw a rageshake where somebody had apparently failed to import a key file.
I have no idea why it happened.

Also try to make the errors the users see useful.
 2017-06-08 16:55:50 +01:00
David Baker 5e55b6a643 PR feedback 2017-06-08 16:23:43 +01:00
David Baker 9def0bb5c2 Oops, fix email check 2017-06-08 16:08:19 +01:00
David Baker 8dc20606c8 Use comma for list of three things 2017-06-08 16:07:29 +01:00
Luke Barnard 1ff2be1896 Update docs for RVS 2017-06-08 16:00:12 +01:00
Luke Barnard 36f72cccb5 Don't alter members of payload (when defaulting an event to scroll to), alter a copy 2017-06-08 15:55:47 +01:00
Luke Barnard 000a045e35 Rename RVS state (event -> initialEvent) and redocument 2017-06-08 15:52:21 +01:00
David Baker d691c891e7 Move all login error string generation into view 
This makes all the various hits done by login report the same
useful error messages and gets rid of the broken ones like printing
the http status code even if it was undefined. Also add text for
the case of overzealous browser extensions because lots of people
get bitten by it.
 2017-06-08 15:49:48 +01:00
Luke Barnard 1792fa45f4 Null-guard roomId before sending a dispatch to update scroll state 
Otherwise we pointlessly assign the null key to something
 2017-06-08 15:45:50 +01:00
Luke Barnard 59e649f326 Add comment about roomId potentially not being resolved following an update from RoomViewStore 2017-06-08 15:43:45 +01:00
Luke Barnard e58e4db628 Explain why search results are cleared when eventId changes 2017-06-08 15:38:58 +01:00
Luke Barnard dca2be6325 Add RoomView initial state and docs 2017-06-08 15:37:30 +01:00
Luke Barnard 2e82bf40fb Explain setting of highlighted in room/$eventId showScreen handling. 2017-06-08 15:34:20 +01:00
Luke Barnard 8ddc38c9b1 Doc _viewRoom highlighted 2017-06-08 15:32:31 +01:00
Luke Barnard aa20ad706e Remove redundant `currentRoomAlias` 2017-06-08 15:30:43 +01:00
Matthew Hodgson 74e4260556 fix fullstops 2017-06-08 15:14:46 +01:00
Matthew Hodgson 614006a256 remove duplicate keys from en_EN 2017-06-08 15:09:23 +01:00
Matthew Hodgson f26aeef2bf Merge pull request #1056 from matrix-org/kegan/translation-tamarin 
Add remaining translations
 2017-06-08 15:06:26 +01:00
Kegan Dougal 9baaf5499f Linting 2017-06-08 14:58:54 +01:00
David Baker 71eb405859 Add comments & remove redundant check 2017-06-08 14:53:21 +01:00
Kegan Dougal f2efdf8a4f Review comments 2017-06-08 14:45:59 +01:00
David Baker b40636a425 Merge pull request #1040 from ollieh/issues/1974 
Added button that copies code to clipboard
 2017-06-08 14:45:58 +01:00
Richard van der Hoff b16e652acc rewrite MegolmExportEncryption using async/await 
... to make it easier to add exception handling
 2017-06-08 14:45:01 +01:00
David Baker 34e4d8088b Merge pull request #1059 from matrix-org/rav/delint_megolm_export 
de-lint MegolmExportEncryption + test
 2017-06-08 14:43:35 +01:00
Matthew Hodgson c173861b27 Merge pull request #1021 from Bitim/feature/rtl-languages-support 
Better RTL support
 2017-06-08 14:43:18 +01:00
Luke Barnard 78e8f2a34a Merge pull request #1057 from matrix-org/matthew/emoji-mels 
make mels emoji capable
 2017-06-08 14:36:58 +01:00
Kegan Dougal e3ac78bd28 Self-review 2017-06-08 14:36:20 +01:00
Luke Barnard ea97d16aa2 Merge branch 'develop' into luke/fix-event-id-state 
Conflicts:
	src/components/structures/MatrixChat.js
 2017-06-08 14:33:58 +01:00
dtygel f6051f663d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
 2017-06-08 13:33:01 +00:00
Luke Barnard f320f7d475 Remove redundant action id 2017-06-08 14:30:45 +01:00
Richard van der Hoff d9bc8ebc53 de-lint MegolmExportEncryption + test 2017-06-08 14:29:53 +01:00
Richard van der Hoff 409d2d5d28 Merge pull request #1055 from matrix-org/rav/enforce_linting_of_clean_files 
Make travis check for lint on files which are clean to start with
 2017-06-08 14:24:19 +01:00
Matthew Hodgson 29e792b642 make mels emoji capable 2017-06-08 14:21:14 +01:00
Kegan Dougal c57823a31d Merge branch 'develop' into kegan/translation-tamarin 2017-06-08 14:19:56 +01:00
Luke Barnard d3cf78ff5a Control currently viewied event via RoomViewStore 
Fix for https://github.com/vector-im/riot-web/issues/4224

Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously).

This required a few changes:
 - The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`.
 - The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.
 2017-06-08 14:17:49 +01:00
David Baker 6d1fa775a0 Formatting 2017-06-08 14:14:45 +01:00
Richard van der Hoff 8479a8f5ff Update .eslintignore.errorfiles 2017-06-08 14:11:34 +01:00
Kegan Dougal 00df956ca2 Add remaining translations! 
Every file has now been manually vetted by me. Due to the extent of
the changes, I've been unable to test all scenarios to make sure this
all works. :(
 2017-06-08 14:08:51 +01:00
Richard van der Hoff 9bda212cb1 Make travis/jenkins check for lint on files which are clean to start with 2017-06-08 14:03:30 +01:00