wmwragg
ef9d6d45b6
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-23 10:54:05 +01:00
wmwragg
a980864886
Initial sub list notifications count. Still needs propagation of muting/unmuting etc. events from room tile up to sub list
2016-08-23 10:47:17 +01:00
wmwragg
ca4d506391
Header wording for capped truncation count updated
2016-08-22 22:47:00 +01:00
wmwragg
4d5e3bc22b
Initial tag section header badge
2016-08-22 17:25:43 +01:00
wmwragg
ff55a951c9
Number of rooms added to header of sections
2016-08-22 17:02:52 +01:00
wmwragg
895172d498
Added catch to help get the Historical and any other weird sections into a sound state, so the states can then change correctly from then on
2016-08-22 16:42:08 +01:00
wmwragg
71f73d8df2
Collapsing and truncation initial state and onClick event logic
2016-08-22 15:50:36 +01:00
wmwragg
97daca4b31
Initial restyle of the sub lists and room lists
2016-08-22 14:10:06 +01:00
Matthew Hodgson
9b5e5c9acb
squidge video icon a bit
2016-08-18 16:48:28 +01:00
David Baker
fbbbd44dc3
Merge pull request #1982 from vector-im/dbkr/make_notif_silder_work
...
Make the notification slider work
2016-08-18 15:24:14 +01:00
David Baker
0bb3eaaf67
Use constants
2016-08-18 13:46:47 +01:00
David Baker
e48d68a449
PR feedback
2016-08-18 13:11:57 +01:00
David Baker
6b0aeefc66
RoomNotifs.js moved to react-sdk
...
Since it's now used in RoomTile. Remove the vector prefix since it's no longer really a 'vector' thing
2016-08-17 18:29:38 +01:00
David Baker
cd0ed879e3
Make the slider work
...
Still WIP though: need to make vector work with the 'contains display name' rule being an override
2016-08-16 15:54:28 +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
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
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
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
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
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
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
wmwragg
f8fa19ed47
Room tag menu dohickey on the avatar on hover
2016-08-10 15:04:02 +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
Richard van der Hoff
afc889ff4d
Some tests of the application load process
2016-08-10 00:15:04 +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
Aviral Dasgupta
bd9f5d3e06
Various fixes and improvements to emojification.
...
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
2016-08-09 21:44:09 +05:30
wmwragg
cf8164bcc3
New icons
2016-08-08 18:11:18 +01:00
wmwragg
33612b7076
New dekete icon and ignoring olm.js
2016-08-08 17:11:08 +01:00
wmwragg
5a97786cc6
Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now
2016-08-08 16:55:02 +01:00
Matthew Hodgson
ee2329d236
make scrollbars bigger on hoverover
2016-08-07 21:35:41 +01:00
Matthew Hodgson
66f80b2239
let MemberInfo scroll if you have loads of E2E devices
2016-08-07 20:50:56 +01:00
wmwragg
72ba708bfe
Menu separator styling
2016-08-05 16:35:59 +01:00
wmwragg
b3459be707
Initial RoomTagContextMenu wired in
2016-08-05 15:49:03 +01:00
David Baker
bf46c3cfab
Merge remote-tracking branch 'origin/develop' into matthew/scalar
2016-08-05 15:37:38 +01:00
wmwragg
7880734d77
Merge branch 'develop' into wmwragg/room-tag-menu
2016-08-05 15:26:42 +01:00
