gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,463 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

6463 Commits

Author SHA1 Message Date
wmwragg 2c8e7782c5 Initial reposition of the timestamp 2016-08-16 10:26:14 +01:00
Matthew Hodgson d3eccc1d6f add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/ 2016-08-15 21:38:21 +01:00
David Baker 40aee5b03d Merge pull request #1966 from vector-im/rav/use_cpx_to_copy_olm 
Use cpx to copy olm.js, and add watcher
 2016-08-15 13:10:27 +01:00
Richard van der Hoff 4c9ade5ecb Use cpx to copy olm.js, and add watcher 
We are now using `cpx` to copy the emojione files, so we might as well use it
for olm.js, rather than rolling our own - particularly since that makes it easy
to add a watcher for `npm start`.

We have to add a `-L` to the `cpx` invocation, otherwise, if olm is a
symlink (as is useful for development), cpx ends up watching the symlink, which
obviously never changes.
 2016-08-15 12:16:08 +01:00
Richard van der Hoff 1d435890af Unpin react-sdk and js-sdk 2016-08-15 12:15:24 +01:00
Richard van der Hoff 8a2b2daad7 Revert "Unpin react-sdk and js-sdk" 
I messed this up and removed staticfiles.js by accident

This reverts commit 21334cab28.
 2016-08-15 12:13:58 +01:00
Richard van der Hoff 21334cab28 Unpin react-sdk and js-sdk 2016-08-15 12:11:35 +01:00
David Baker a17df609f3 Read all 4 different notif states 
Can't yet set loud / mute
 2016-08-12 15:19:34 +01:00
David Baker 0afdf5d8e4 Merge pull request #1959 from vector-im/rav/device_display_name 
Make up a device display name
 2016-08-12 11:48:12 +01:00
Richard van der Hoff 17733a66f9 rename MatrixChat defaultDeviceDisplayName prop 2016-08-12 11:40:25 +01:00
Richard van der Hoff 3a819a29b7 Make up a device display name 
Pass a default device name into react-sdk
 2016-08-12 11:01:39 +01:00
David Baker 9d77fab18f 0.7.4-r1 2016-08-12 10:11:40 +01:00
David Baker 3650c3f08b Prepare changelog for v0.7.4-r1 2016-08-12 10:11:39 +01:00
David Baker 5512fd4220 Bump to matrix-react-sdk 0.6.4-r1 2016-08-12 10:09:53 +01:00
David Baker 678393e2bd Add note about file table overflows 2016-08-12 09:59:56 +01:00
David Baker 25d8a7999f 0.7.4 2016-08-11 17:47:17 +01:00
David Baker 014f7ade86 Prepare changelog for v0.7.4 2016-08-11 17:47:16 +01:00
David Baker 2b671fcafc js-sdk & react sdk released 2016-08-11 17:45:10 +01:00
David Baker df5b243e75 Merge pull request #1954 from vector-im/dbkr/fix_messagecomposer_style 
Don't show border on composer when not in RTE mode
 2016-08-11 16:47:00 +01:00
David Baker 5e43f2752a Don't show border on composer when not in RTE mode 
This breaks the opacity animation (so remove the transition) but the extra border was making the border on the composer too thick.
 2016-08-11 16:30:53 +01:00
David Baker 0cb14ba5ec Don't force scrollbar on multi-invite 2016-08-11 15:11:31 +01:00
Matthew Hodgson d65477891e Merge pull request #1941 from vector-im/wmwragg/room-tag-menu 
Wmwragg/room tag menu
 2016-08-11 09:00:48 -05:00
Richard van der Hoff bb1854814c Merge pull request #1951 from vector-im/dbkr/dont_redirect_email_verify 
Don't redirect to mobile app if verifying 3pid
 2016-08-11 12:50:06 +01:00
Richard van der Hoff 9e15bda803 comment typo 2016-08-11 12:49:57 +01:00
David Baker e7ac66ad04 Don't redirect to mobile app if verifying 3pid 
Fixes https://github.com/vector-im/vector-web/issues/1933
 2016-08-11 12:44:49 +01:00
David Baker 4a0a911f3b Merge pull request #1950 from vector-im/rav/clear_test_localstorage 
Make sure that we clear localstorage before *all* tests
 2016-08-11 12:34:37 +01:00
David Baker 7286aeb013 Merge pull request #1942 from vector-im/dbkr/multi_invite 
Basic CSS for multi-invite dialog
 2016-08-11 12:34:13 +01:00
Richard van der Hoff 244265d52b Make sure that we clear localstorage before *all* tests 
This was causing flaky tests, as sometimes the joining test would inherit an
"mx_is_guest" setting from a previous test run.
 2016-08-11 11:42:29 +01:00
David Baker ab93e96a1f Merge pull request #1947 from vector-im/rav/token_login_tests 
More tests for the loading process:
 2016-08-11 11:16:27 +01:00
David Baker 5a17d8b450 Merge pull request #1946 from vector-im/rav/rav/refactor_token_login 
Support for refactored login token handling
 2016-08-11 10:52:32 +01:00
David Baker 43e3662e60 Merge pull request #1935 from aviraldg/fix-emoji 
Various fixes and improvements to emojification.
 2016-08-11 10:22:46 +01:00
Aviral Dasgupta 19d5063814 Merge branch 'develop' into fix-emoji 2016-08-11 14:51:17 +05:30
Richard van der Hoff da7a556629 More tests for the loading process: 
1. Check that localstorage is correctly updated on successful login (test for
   https://github.com/matrix-org/matrix-react-sdk/pull/404)

2. Check that the saved HS isused for guest registration (test for
   https://github.com/matrix-org/matrix-react-sdk/pull/405)

3. Test loginToken handling (test for
   https://github.com/matrix-org/matrix-react-sdk/pull/406 /
   https://github.com/vector-im/vector-web/pull/1946)
 2016-08-11 02:00:27 +01:00
Richard van der Hoff c2cb4dff4c Support for refactored login token handling 
loginToken handling is now done by the session loader, so we need to pass in
the queryparams to MatrixChat.

Also, MatrixChat no longer automatically reloads the page to drop the
querystring, so we have to do that ourselves (doing it in index.js allows
tokenlogin to be tested).
 2016-08-11 01:55:51 +01:00
Richard van der Hoff dd6868c255 Fix joining test 
This had been broken by
https://github.com/matrix-org/matrix-react-sdk/pull/399. Change the way we
populate the matrixclient used for the joining tests.
 2016-08-10 22:39:53 +01:00
David Baker b411a2e489 Merge remote-tracking branch 'origin/develop' into dbkr/multi_invite 2016-08-10 18:35:36 +01:00
wmwragg 28343aaa33 Aignment tweak for the room tag menu so the icons better align 2016-08-10 17:44:49 +01:00
David Baker 3f615c6664 Basic CSS for multi-invite dialog 2016-08-10 17:12:20 +01:00
wmwragg 804b17fbf1 Teaks to the CSS for the new ellipsis icon, and resizing the avatar back to 24px from 25px, as needs to be even number for the Text letter to align vertically 2016-08-10 17:00:06 +01:00
wmwragg 9798e14733 Menu colour now changeable, and leave room item hooked up. Some additional CSS tweaks to fit current design changes 2016-08-10 16:35:22 +01:00
Richard van der Hoff b742342062 Merge pull request #1938 from vector-im/rav/more_loading_tests 
More app-loading tests
 2016-08-10 16:02:01 +01:00
wmwragg f8fa19ed47 Room tag menu dohickey on the avatar on hover 2016-08-10 15:04:02 +01:00
Richard van der Hoff fe4bb3e413 More app-loading tests 
1. fix the 'Clean load' tests which had been broken by
https://github.com/matrix-org/matrix-react-sdk/pull/399: make sure we clear
localStorage between tests.

2. Test the session rehydration properly by setting the localStorage rather
than setting up the MatrixClientPeg before loading the app.

3. Add some tests for the auto-guest-registration flows.
 2016-08-10 14:37:30 +01:00
wmwragg ff13782ab5 Added set icons 2016-08-10 12:06:03 +01:00
wmwragg b1dd7efed8 Fixed weird lightening of fonts on a refresh of page on safari 2016-08-10 11:51:23 +01:00
wmwragg 699a58e0b3 Fix for historic and new undefined order issues 2016-08-10 11:39:10 +01:00
David Baker 6a19655886 Merge pull request #1936 from vector-im/rav/loading_tests 
Some tests of the application load process
 2016-08-10 10:53:23 +01:00
Richard van der Hoff afc889ff4d Some tests of the application load process 2016-08-10 00:15:04 +01:00
Richard van der Hoff b06c9f037e gitignore copied olm.js 2016-08-10 00:09:26 +01:00
wmwragg 1c812b340d Initial pass at handling room tags that don't have an order element, but need one manual ordering 2016-08-09 19:20:27 +01:00