David Baker
|
b6c002b587
|
Fix merge
|
2018-01-08 14:35:39 +00:00 |
|
David Baker
|
9c3e4a1202
|
Merge branch 'develop' into patch-1
|
2018-01-08 14:31:21 +00:00 |
|
Matthew Hodgson
|
bfb60265cb
|
Merge pull request #5610 from vector-im/t3chguy/devtools-1
add dark theme styling to devtools input box
|
2017-12-18 21:44:43 +00:00 |
|
Luke Barnard
|
cb235a29fa
|
Merge pull request #5613 from pafcu/simplify-translation
Refactor translations
|
2017-11-16 11:54:52 +00:00 |
|
Michael Telatynski
|
b00cf8c939
|
add dark theme styling to devtools input box
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-11-15 17:13:39 +00:00 |
|
Travis Ralston
|
a583c2b658
|
Merge branch 'develop' into travis/granular
|
2017-11-14 19:16:35 -07:00 |
|
Matthew Hodgson
|
3e72d8d969
|
Merge pull request #5286 from turt2live/travis/presence
CSS/components for custom presence controls
|
2017-11-14 23:53:26 +00:00 |
|
Stefan Parviainen
|
ca4b71b6e2
|
Update to use newer _t()
|
2017-11-14 21:54:00 +01:00 |
|
Travis Ralston
|
977599a660
|
Use the SettingsStore to get the theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-13 13:14:29 -07:00 |
|
Travis Ralston
|
7570ce580f
|
Merge branch 'develop' into travis/granular
|
2017-11-13 12:25:56 -07:00 |
|
Matthew Hodgson
|
5abee4fddc
|
replace some of the status.im theme with general config options
|
2017-11-11 23:47:03 +00:00 |
|
Matthew Hodgson
|
d4128af224
|
Merge remote-tracking branch 'origin/develop' into matthew/status
|
2017-11-08 04:29:44 -08:00 |
|
Luke Barnard
|
e1d16acddb
|
Implement general-purpose tooltip "(?)"-style
|
2017-11-07 14:09:04 +00:00 |
|
Travis Ralston
|
63607f29e7
|
Use SettingsStore for notification settings
Signed-off-by: Travis Ralstron <travpc@gmail.com>
|
2017-11-04 22:27:34 -07:00 |
|
Matthew Hodgson
|
816042d3a8
|
Merge branch 'develop' into matthew/status
|
2017-11-04 23:51:20 +00:00 |
|
Matthew Hodgson
|
adedf23cfb
|
remove unnamespaced CSS fail
|
2017-11-04 22:19:06 +00:00 |
|
Travis Ralston
|
69939e2fe3
|
Merge branch 'develop' into travis/granular
|
2017-11-03 21:56:46 -06:00 |
|
Matthew Hodgson
|
c0b343c89f
|
Merge pull request #5471 from vector-im/t3chguy/devtools-1
T3chguy/devtools 1
|
2017-11-03 23:10:00 +00:00 |
|
Matthew Hodgson
|
923295973b
|
Merge branch 'develop' into matthew/status
|
2017-11-03 15:11:23 +00:00 |
|
Luke Barnard
|
c01ea56676
|
Add toggle to alter visibility of room-group association
|
2017-11-02 13:40:07 +00:00 |
|
Michael Telatynski
|
6da2f88dc5
|
Devtools styling tweaks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-10-30 13:32:31 +00:00 |
|
Michael Telatynski
|
ea9b630082
|
Refactor and add Account Data stuffs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-10-30 12:44:50 +00:00 |
|
Travis Ralston
|
f6177cd7b5
|
Use granular settings instead of synced settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-10-29 01:51:02 -06:00 |
|
David Baker
|
b9e2b59504
|
Merge remote-tracking branch 'origin/develop' into matthew/status
|
2017-10-27 19:01:34 +01:00 |
|
Matthew Hodgson
|
3df1808fd0
|
Merge pull request #5453 from VickyKoblinski/es6-notifications
Leverages ES6 in Notifications
|
2017-10-27 09:15:22 +01:00 |
|
Vicky Koblinski
|
d188fdb9fe
|
Changes requires to imports for consistancy, removes 'use strict'
|
2017-10-26 21:23:16 -04:00 |
|
Vicky Koblinski
|
7588814ec5
|
Leverages ES6 and fixes typo
|
2017-10-26 20:37:15 -04:00 |
|
Matthew Hodgson
|
225c7ee621
|
Merge branch 'develop' into matthew/status
|
2017-10-26 01:46:06 +01:00 |
|
Travis Ralston
|
45ca890f68
|
Merge remote-tracking branch 'vector-im/develop' into travis/presence
|
2017-10-25 11:27:22 -06:00 |
|
Michael Telatynski
|
b16d4280b7
|
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-10-23 11:42:06 +01:00 |
|
Michael Telatynski
|
eb45b00b32
|
fix bad tab completion
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-10-23 11:40:25 +01:00 |
|
Michael Telatynski
|
84d1f838f0
|
make filtering case-insensitive
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-10-23 11:39:21 +01:00 |
|
Matthew Hodgson
|
190811ac1c
|
WIP
|
2017-10-23 00:57:02 +01:00 |
|
David Baker
|
667556f3ce
|
Custom server text was i18ned by key
And therefore got replaced by the key by the i18n script
|
2017-10-20 13:48:00 +01:00 |
|
Travis Ralston
|
ef5fc7347a
|
Don't update presence status if the user is clicks twice
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-10-15 20:20:43 -06:00 |
|
Travis Ralston
|
deb50b2d43
|
Add presence context menu and styling
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-10-14 23:15:26 -06:00 |
|
Matthew Hodgson
|
f143315618
|
Merge pull request #5142 from turt2live/travis/pinned_messages
Message/event pinning
|
2017-10-15 01:02:49 +01:00 |
|
Travis Ralston
|
6926c96f36
|
Hide pinning messages behind a labs settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-10-14 16:41:44 -06:00 |
|
Matthew Hodgson
|
6f819606c1
|
Merge pull request #4054 from ollieh/issues/3771
Sorting of networks within a protocol based on name
|
2017-10-14 23:21:51 +01:00 |
|
Travis Ralston
|
3e066d3aef
|
Merge branch 'develop' into travis/pinned_messages
|
2017-10-14 16:11:17 -06:00 |
|
Matthew Hodgson
|
2667ed2561
|
Merge pull request #4988 from vector-im/t3chguy/hide_notification_body
allow hiding of notification body for privacy reasons
|
2017-10-14 23:07:31 +01:00 |
|
Travis Ralston
|
1adb63ac74
|
Don't use MXIDs on the lightbox if possible
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-10-13 20:18:55 -06:00 |
|
Michael Telatynski
|
6df69138a2
|
switch to new logos, and use import rather than VAR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-10-11 16:46:05 +01:00 |
|
Travis Ralston
|
2d153a72c1
|
Split up CSS; use .catch instead of .then
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-09-29 13:33:14 -06:00 |
|
Travis Ralston
|
078ee54edf
|
Move the PinnedEventsPanel to the react-sdk
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-09-29 13:15:21 -06:00 |
|
Travis Ralston
|
2d5acfc0bc
|
Filter pinned events before rendering
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-09-29 11:30:52 -06:00 |
|
Travis Ralston
|
b0190f6a65
|
i18n for remaining strings
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-09-29 11:22:06 -06:00 |
|
Travis Ralston
|
0a3bc1c667
|
Don't try to show redacted messages
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-09-29 11:21:44 -06:00 |
|
Travis Ralston
|
aff02885de
|
Don't fail if an event doesn't belong to a room.
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-09-29 11:21:21 -06:00 |
|
Travis Ralston
|
965a25ba84
|
Fix bug where rooms missing m.room.pinned_events could not pin messages
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-09-29 11:08:22 -06:00 |
|