Luke Barnard
3dc45886f7
Merge the two RoomTile context menus into one
2017-03-09 17:05:51 +00:00
Luke Barnard
1f3ab4425a
Merge branch 'develop' into matthew/homepages
...
Conflicts:
src/component-index.js
src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
2017-02-01 11:34:24 +00:00
Kegan Dougal
0a9f02abcc
Glue the dialog to rageshake: honour sendLogs flag.
2017-01-25 16:51:26 +00:00
Matthew Hodgson
3f640139d2
quick and dirty support for custom welcome pages, with an example for geektime techfest
2016-11-13 14:10:33 +00:00
Aviral Dasgupta
d6f27add66
Upgrade to babel6 and enable some presets.
2016-10-17 16:28:13 +01:00
David Baker
ea09a25563
Revert "Switch to babel 6"
2016-10-14 18:50:22 +01:00
Aviral Dasgupta
9174b32ef1
Upgrade to babel6 and enable some presets.
2016-10-02 17:28:24 +05:30
David Baker
43b87e1f82
Add network selector that doesn't do anything yet
2016-09-15 11:29:27 +01:00
David Baker
57804f4e02
Support for common rooms in MemberInfo
...
Renames RoomDNDView to DNDRoomTile which now provides a separate DNDRoomTile component rather than
clobberring RoomTile, so we can use a draggable one where we want a draggable one and a non-draggable
one where we don't want it to be draggable. RoomTile main is still polluted with DND stuff, but is
now optional.
Remove BottomLeftMenuTile because it was no longer used in the bottom left menu. Just include
the equivalent markup directly in the one place we now use it (in MemberTile in react-sdk).
2016-09-09 16:15:45 +01:00
Aviral Dasgupta
be28a96d8d
add fancy changelog dialog
2016-08-18 22:53:47 +05:30
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
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
wmwragg
5ce1aba493
Created initial RoomTagContextMenu component
2016-08-05 15:23:07 +01:00
Matthew Hodgson
eb108c7866
Merge branch 'develop' into matthew/scalar
2016-08-04 13:41:04 +01:00
wmwragg
5cf164fcc1
Re-modularised the context menus
2016-07-27 10:40:57 +01:00
wmwragg
2768cd2010
Initial unstyled mentions state notifier context menu
2016-07-22 17:30:09 +01:00
wmwragg
633a3f4867
New component for testing
2016-07-21 17:44:05 +01:00
Matthew Hodgson
ac24d6707f
Add integs mgt
2016-05-18 15:02:03 +01:00
Matthew Hodgson
f8d5101dbc
add lost SVGs and implement SearchBox skeleton
2016-04-15 02:23:12 +01:00
Kegan Dougal
5eed734325
Add a version update checker and NewVersionBar to show on the UI.
2016-02-03 16:16:14 +00:00
David Baker
6a36b022e4
New style guest warning bar
2016-01-28 13:00:44 +00:00
manuroe
ee13dd7b6c
PushRules settings: Added a dedicated component to display them
2016-01-11 17:24:04 +01:00
Matthew Hodgson
df111223fc
copyrights for 2016
2016-01-07 04:17:56 +00:00
Kegan Dougal
0210670e91
Merge branch 'develop' into kegan/vector-references
...
Conflicts:
src/component-index.js
2015-12-02 09:37:28 +00:00
Matthew Hodgson
cba27a7488
erm, surely we need to actually run reskindex after all that?
2015-12-02 01:37:26 +00:00
David Baker
95e71a531e
Merge branch 'develop' into kegan/vector-references
...
Update having merged skindexing PR
2015-12-01 18:31:13 +00:00
David Baker
c281fe785a
Merge branch 'develop' into skindex-nextgen
2015-12-01 15:53:11 +00:00
David Baker
6f646260aa
WIP of component indexing update
2015-11-30 17:31:32 +00:00
