OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,470 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

3470 Commits (9eef3c53a340c9af3a1582283a4f35daeb8a3034)

Author SHA1 Message Date
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 7bc3fc8696 make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020 2017-01-22 01:28:43 +01:00
Matthew Hodgson d9c0513ee2 make it work 2017-01-21 22:49:29 +01:00
Matthew Hodgson 39c122fe4f fix local storage idiocy 2017-01-21 22:27:55 +01:00
Matthew Hodgson 532f4e59c9 literally blindly add verification buttons 2017-01-21 19:06:15 +01:00
Matthew Hodgson 071e364be2 improve the verify warning if blacklisting is unabled 2017-01-21 17:56:48 +00:00
Matthew Hodgson c618880af9 oops 2017-01-21 17:43:46 +00:00
Matthew Hodgson 3071fc0ddc UI for blacklisting unverified devices per-room & globally 
(written blind; untested as yet)
 2017-01-21 17:39:39 +00:00
Matthew Hodgson 2e15e8f9b4 very barebones support for warning users when rooms contain unknown devices 2017-01-21 05:13:36 +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
David Baker 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
Johannes Löthberg 9c1c657a1e Markdown: delete remaining pre-split relics 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-01-19 11:55:36 +01:00
David Baker b58a67f6b1 Add more punctuation. Also s/let/const/ 2017-01-19 10:51:43 +00:00
Richard van der Hoff fdc213cbb8 Megolm export: fix test 2017-01-19 10:44:01 +00:00
Richard van der Hoff 8b60cb9df0 Megolm export: Clear bit 63 of the salt 2017-01-19 10:43:41 +00:00
David Baker 242f5e0301 PR feedback 
* Doc & properly indent escapeRegExp
 * Add close bracket to the list of punctuation chars we search after
 2017-01-19 10:24:21 +00:00
lukebarnard e9eb38fd74 Update propTypes and do null checks 2017-01-19 11:05:08 +01:00
lukebarnard e06dd6e34a Implement auto-join rooms on registration 
Also: This fixes registration with a team: only the email localpart was being used to register.

When a registration is successful, the user will be joined to rooms specified in the config.json teamsConfig:

"teamsConfig" : {
  "supportEmail": "support@riot.im",
  "teams": [
    {
      "name" : "matrix",
      "emailSuffix" : "matrix.org",
      "rooms" : [
        {
          "id" : "#irc_matrix:matrix.org",
          "autoJoin" : true
        }
      ]
    }
  ]
}

autoJoin can of course be set to false if the room should only be displayed on the (forthcoming) welcome page for each team, and not auto-joined.
 2017-01-19 10:56:04 +01:00
Matthew Hodgson 128db1a679 Merge pull request #627 from matrix-org/matthew/fix-theme-npe 
Matthew/fix theme npe
 2017-01-18 22:11:07 +00:00
Matthew Hodgson 4e5689082d correctly load synced themes without NPE 2017-01-18 20:06:54 +00:00
Matthew Hodgson 4df968ecdf fix css snafu 2017-01-18 20:06:44 +00:00
Johannes Löthberg 14ead373e2 Add markdown test-cases 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-01-18 20:54:34 +01:00
David Baker 7b7728c93a Make behaviour of ChatInviteDialog more consistent 
* Pressing enter now always adds whatever was in the input box
   to the invite list, if it's a valid address (previously it
   added it to the list of it was a search result but submitted
   the form straight away if there were no results).
 * Remove isValidAddress as it was only used in the context of
   testing whether its return value was true or null (where null
   meant "unsure") so just use getAddressType instead.
 2017-01-18 18:32:38 +00:00
Johannes Löthberg 30bd01cdf2 Markdown: Split up render function into toHTML/toPlaintext 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-01-18 19:29:11 +01:00