1c812b340d
Initial pass at handling room tags that don't have an order element, but need one manual ordering
wmwragg
2016-08-09 19:20:27 +01:00
dbbea63227
Various fixes and improvements to emojification.
Aviral Dasgupta
2016-08-09 21:40:05 +05:30
bd9f5d3e06
Various fixes and improvements to emojification.
Aviral Dasgupta
2016-08-09 21:44:09 +05:30
cf8164bcc3
New icons
wmwragg
2016-08-08 18:11:18 +01:00
33612b7076
New dekete icon and ignoring olm.js
wmwragg
2016-08-08 17:11:08 +01:00
75e1277961
Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now
wmwragg
2016-08-08 16:55:27 +01:00
5a97786cc6
Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now
wmwragg
2016-08-08 16:55:02 +01:00
ee2329d236
make scrollbars bigger on hoverover
Matthew Hodgson
2016-08-07 21:35:41 +01:00
66f80b2239
let MemberInfo scroll if you have loads of E2E devices
Matthew Hodgson
2016-08-07 20:50:56 +01:00
62ebeb9fd8
Merge pull request #1930 from vector-im/dbkr/enable_labs
David Baker
2016-08-05 17:25:29 +01:00
4b8ad3c102
Merge pull request #393 from matrix-org/dbkr/enable_labs
David Baker
2016-08-05 17:25:25 +01:00
5e358b8cf6
Add comment
David Baker
2016-08-05 17:18:45 +01:00
f8d02c1551
pr feedback
David Baker
2016-08-05 16:36:35 +01:00
72ba708bfe
Menu separator styling
wmwragg
2016-08-05 16:35:59 +01:00
d0d7f2d2d2
Add 'enable labs' setting to sample config
David Baker
2016-08-05 16:14:03 +01:00
e8ee5c2f96
Add config to hide the labs section
David Baker
2016-08-05 16:13:06 +01:00
b3459be707
Initial RoomTagContextMenu wired in
wmwragg
2016-08-05 15:49:03 +01:00
5b812fead9
Initial RoomTagContextMenu wired in
wmwragg
2016-08-05 15:48:28 +01:00
d1e22d50f0
Merge pull request #1928 from vector-im/matthew/scalar
David Baker
2016-08-05 15:44:03 +01:00
98e89d4293
Merge pull request #392 from matrix-org/dbkr/scalar
David Baker
2016-08-05 15:43:57 +01:00
bf46c3cfab
Merge remote-tracking branch 'origin/develop' into matthew/scalar
David Baker
2016-08-05 15:37:38 +01:00
80e4a99477
Merge branch 'develop' into wmwragg/room-tag-menu
wmwragg
2016-08-05 15:27:14 +01:00
7880734d77
Merge branch 'develop' into wmwragg/room-tag-menu
wmwragg
2016-08-05 15:26:42 +01:00
4a46aba0c2
Added new onClick function for the avatar, but not wired in yet, waitin go pull up from develop once previous commits have been merged
wmwragg
2016-08-05 15:24:53 +01:00
5ce1aba493
Created initial RoomTagContextMenu component
wmwragg
2016-08-05 15:23:07 +01:00
c929076a83
Merge pull request #1929 from vector-im/dbkr/fix_unit_tests_replaceUsingCreds
Richard van der Hoff
2016-08-05 15:20:50 +01:00
99625067fe
Merge pull request #1926 from vector-im/wmwragg/mute-mention-state-fix
Matthew Hodgson
2016-08-05 14:44:48 +01:00
10aa201d33
Merge pull request #390 from matrix-org/wmwragg/mute-mention-state-fix
Matthew Hodgson
2016-08-05 14:44:27 +01:00
c9ab977d73
Fix unit tests
David Baker
2016-08-05 14:38:10 +01:00
ff02c21252
Merge pull request #391 from matrix-org/dbkr/fix_historical_freeze
Richard van der Hoff
2016-08-05 12:47:01 +01:00
e8dbf978c3
Merge pull request #388 from matrix-org/dbkr/refactor_field_errors
Richard van der Hoff
2016-08-05 12:34:56 +01:00
d0158f5812
fix merge conflict
Matthew Hodgson
2016-08-04 23:45:28 +01:00
e1fea24fd6
Merge pull request #389 from matrix-org/dbkr/room_published_check_controlled
Richard van der Hoff
2016-08-04 10:42:34 +01:00
a190862ed3
Merge pull request #1919 from vector-im/dbkr/deactivate_account
Richard van der Hoff
2016-08-04 10:32:41 +01:00
34a31a71fd
increase weight of unread rooms as it's the only way to tell if you have unread messages, and the weight difference is currently too subtle
Matthew Hodgson
2016-08-03 22:54:01 +01:00
24cc4f52bf
Downgrade emojione to 2.2.3
Richard van der Hoff
2016-08-03 21:36:52 +01:00
f4e40696bc
Bump emojione to 2.2.3
Richard van der Hoff
2016-08-03 21:17:54 +01:00
6632322029
spell out that conference calling is hit and miss
Matthew Hodgson
2016-08-03 19:56:04 +01:00
2d936a2850
Don't leave isRoomPublished as undefined
David Baker
2016-08-03 18:23:38 +01:00
afa46a855b
Merge remote-tracking branch 'origin/develop' into dbkr/deactivate_account
David Baker
2016-08-03 17:52:35 +01:00
498ad7fa4c
Merge branch 'develop' into dbkr/deactivate_account
David Baker
2016-08-03 17:52:18 +01:00
cbfb0ad998
Merge pull request #377 from matrix-org/dbkr/use_logout_api
David Baker
2016-08-03 17:51:42 +01:00
bb3a7725db
Shift loginIncorrect into state
David Baker
2016-08-03 17:49:29 +01:00
476f69cbec
Unused ref
David Baker
2016-08-03 17:38:13 +01:00
b32a19a0f1
Comments
David Baker
2016-08-03 17:23:09 +01:00