Aviral Dasgupta
19d5063814
Merge branch 'develop' into fix-emoji
2016-08-11 14:51:17 +05:30
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
David Baker
bf46c3cfab
Merge remote-tracking branch 'origin/develop' into matthew/scalar
2016-08-05 15:37:38 +01:00
wmwragg
b9e06bcf66
Moved mute state to mentions only
2016-08-04 16:17:47 +01:00
Matthew Hodgson
eb108c7866
Merge branch 'develop' into matthew/scalar
2016-08-04 13:41:04 +01:00
Matthew Hodgson
ee9f78d156
slightly better volume labels
2016-08-03 15:49:32 +01:00
Matthew Hodgson
70754db27a
Merge pull request #1900 from vector-im/wmwragg/mention-state-menu
...
Wmwragg/mention state menu
2016-08-03 15:22:49 +01:00
Matthew Hodgson
51e8c28ab6
Merge pull request #1828 from vector-im/wmwragg/button-updates
...
Wmwragg/button updates
2016-08-01 15:42:33 +01:00
Richard van der Hoff
0d4f35bed1
Fix a warning from RoomSubList
...
`selectedRoom` is *not* required, and we often don't have one, so get warnings.
2016-08-01 13:44:04 +01:00
Richard van der Hoff
3860488bb5
Fix notifications warning layout
...
For some reason, Chrome doesn't seem to make the central div in the
notifications warning wide enough, so it ends up wrapping. Fix this by making
the central div expand across the available space, instead of letting the
container for the close button do it.
Fixes https://github.com/vector-im/vector-web/issues/1687
2016-08-01 10:31:58 +01:00
wmwragg
f382946138
Merge up from develop
2016-07-30 12:07:34 +01:00
wmwragg
55a10ee275
Mute state handled corrcectly
2016-07-28 17:25:28 +01:00
wmwragg
49545ce0c2
Leaving the fail promise section blank as a todo, with explanitary comment
2016-07-28 15:29:57 +01:00
wmwragg
b87058508e
When a use clicks the state they want, after the change has been made it pasues breifly before closing, so that the user can see their state change has taken place.
2016-07-28 15:28:05 +01:00
wmwragg
6329e274ab
Extra polish to get styling looking like the design
2016-07-28 14:20:24 +01:00
wmwragg
b5fdaac947
Final spacing tweaks to get it aligned with the design
2016-07-27 18:06:47 +01:00
wmwragg
d376df478a
Initial context menu with all it's elements
2016-07-27 17:43:35 +01:00
wmwragg
074bbc7149
Added the two additiona states that don't yet exist on the backend, as faded and disabled options
2016-07-27 12:25:44 +01:00
Richard van der Hoff
4b33164ab6
Remove relayoutOnUpdate prop on gemini-scrollbar
...
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:41:27 +01:00
wmwragg
dab707a893
Additional refactor to further modularise the context menus
2016-07-27 11:26:36 +01:00
wmwragg
5cf164fcc1
Re-modularised the context menus
2016-07-27 10:40:57 +01:00
wmwragg
15f9f5dbe8
Doing the state change via onClick events rather than radio buttons, as they were causeing untraceable react errros for some reason
2016-07-26 17:24:45 +01:00
wmwragg
187818aaa0
Radio buttons now added, and only none guests can modify notfication state
2016-07-26 10:34:03 +01:00
wmwragg
2768cd2010
Initial unstyled mentions state notifier context menu
2016-07-22 17:30:09 +01:00
wmwragg
204e42494a
The default props doesn't seem to be working, hardcoded 'LABEL' for now. OnClick closes menu
2016-07-22 16:11:42 +01:00
wmwragg
633a3f4867
New component for testing
2016-07-21 17:44:05 +01:00
Matthew Hodgson
25eb2e2daf
Merge pull request #1822 from vector-im/wmwragg/spinner-fix
...
Wmwragg/spinner fix
2016-07-19 12:54:15 +01:00
Matthew Hodgson
6ae0dda9d3
give FF higher billing
2016-07-18 18:26:03 +01:00
wmwragg
28108476bd
Added an overide for the view source so that it behaves correctly with the new Modal. Also tweaked the spinner overide
2016-07-18 10:31:17 +01:00
Matthew Hodgson
f182e32e3d
typo
2016-07-18 01:33:36 +01:00
wmwragg
1fbc249de5
Updated Filter room icon
2016-07-13 14:23:46 +01:00
wmwragg
959dcd0c49
Updated BottomLeftMenu buttons to the new ones
2016-07-13 14:10:44 +01:00
wmwragg
ef4f2f10d9
Updated that RightPanel members icon, highlight and numbers
2016-07-13 13:56:59 +01:00
David Baker
4bc4292ceb
Rooms may not have aliases
2016-06-23 11:12:25 +01:00
David Baker
5f477b313b
Unused variable
2016-06-23 10:20:11 +01:00
David Baker
d45e44d01c
Fix joining rooms by typing the alias
...
Fixes regression introduced by https://github.com/vector-im/vector-web/pull/1680
2016-06-23 10:11:46 +01:00
David Baker
c35c9f7c3a
PR feedback
2016-06-22 16:20:06 +01:00
David Baker
ff5c7072d7
Mark the room as private (unlisted) too
...
Also clean up RoomDirectory a bit and just pass the room object around rather than the name / alias, so now we don't have to look up the room by ID again.
2016-06-22 14:52:55 +01:00
David Baker
ad2541299f
Add ability to delete an alias from room directory
...
Hidden behind shift-click for now, but we're going to need to do this a lot to moderate the public room list.
2016-06-21 16:47:40 +01:00
Matthew Hodgson
4dfb0e9a90
Merge branch 'develop' into matthew/scalar
2016-06-19 22:40:58 +01:00
Matthew Hodgson
654429dbdb
improve wording on 'search room names'
2016-06-18 21:12:32 +01:00
David Baker
3547bd8d00
Update for react-sdk dbkr/fix_peeking branch
...
With the react-sdk update, this does nothing functionally since the room ID would just
have been ignored, but update this to correctly supply only one of ID/alias.
2016-06-14 13:02:34 +01:00
David Baker
d7504aeda5
Switch to new view_room
2016-06-10 15:13:41 +01:00
David Baker
a030e46c69
Use join_room_by_alias in RoomDirectory
...
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
2016-06-09 17:13:02 +01:00
David Baker
f61cfbc542
Fix RoomDirectory to join by alias whenever possible.
2016-06-09 16:41:01 +01:00
David Baker
f595f6f141
This check shouldn't be here with the ||
2016-06-09 10:25:49 +01:00
David Baker
4fc311da90
Style fix
2016-06-09 09:56:11 +01:00
David Baker
f6aa9a7ea4
Make the config optional
...
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
2016-06-08 18:46:21 +01:00
David Baker
1e40fd750f
Don't use SdkConfig
...
instead take brand from a prop
2016-06-08 14:55:47 +01:00
David Baker
f9aaf7d903
Use the SdkConfig interface
...
rather than pulling in config.json directly.
json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
2016-06-06 19:13:30 +01:00
