David Baker
|
6910b83c20
|
Merge pull request #5334 from vector-im/dbkr/use_t_normally
Use _t as _t
|
2017-10-19 10:08:51 +01:00 |
|
David Baker
|
42ddafcfd4
|
comment
|
2017-10-19 10:03:47 +01:00 |
|
Luke Barnard
|
4711356c3f
|
Merge pull request #5330 from vector-im/matthew/cosmetics
fix groupview header editing visuals (pt 1)
|
2017-10-19 09:20:46 +01:00 |
|
David Baker
|
137cf32d3b
|
Use _t as _t
Rather than through a languageHandler object. This way our
translation script knows about it.
|
2017-10-18 19:39:51 +01:00 |
|
Matthew Hodgson
|
7bb0ed4a66
|
fix room add icon
|
2017-10-18 19:56:39 +02:00 |
|
Matthew Hodgson
|
6b589c4945
|
fix room icon up
|
2017-10-18 19:40:31 +02:00 |
|
Matthew Hodgson
|
fe490341d0
|
replace placeholder groups icon with a themable one
|
2017-10-18 19:28:19 +02:00 |
|
Matthew Hodgson
|
6e24f4ba09
|
fix editing visuals
|
2017-10-18 17:31:46 +01:00 |
|
Luke Barnard
|
e5c128fcb8
|
Move group ui buttons to group settings
|
2017-10-18 13:47:59 +01:00 |
|
Luke Barnard
|
7c399974ce
|
Merge pull request #5316 from vector-im/t3chguy/bump_eslint_plugin
bump version to prevent eslint errors
|
2017-10-17 17:16:54 +02:00 |
|
Michael Telatynski
|
6ccacfee46
|
bump version to prevent eslint errors
got bumped in react-sdk, missed here
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-10-17 14:44:41 +01:00 |
|
Luke Barnard
|
2effdfb840
|
CSS: GroupView headershould be at least 70px in height
|
2017-10-17 11:56:51 +01:00 |
|
Luke Barnard
|
f24fd61ae0
|
Merge pull request #5303 from vector-im/luke/groups-invited-users
CSS for invited group members section
|
2017-10-16 18:32:56 +02:00 |
|
Luke Barnard
|
85307ffd23
|
CSS for invited group members section
|
2017-10-16 17:21:40 +01:00 |
|
David Baker
|
e85f205e8f
|
Merge pull request #5302 from vector-im/luke/fix-overflow-entity-tile
Handle long names in EntityTiles by overflowing correctly
|
2017-10-16 16:42:44 +01:00 |
|
Luke Barnard
|
fdf07f6d89
|
Handle long names in EntityTiles by overflowing correctly
|
2017-10-16 16:32:09 +01:00 |
|
Luke Barnard
|
027b751bbc
|
Merge pull request #5296 from vector-im/dbkr/electron_disable_labs
Disable labs in electron
|
2017-10-16 16:36:06 +02:00 |
|
David Baker
|
8716f93a6d
|
Disable labs in electron
as we now disable labs in release Riot
|
2017-10-16 15:22:17 +01:00 |
|
David Baker
|
2401f21336
|
Merge branch 'master' into develop
|
2017-10-16 15:00:55 +01:00 |
|
David Baker
|
bf56a00d60
|
v0.12.7
|
2017-10-16 14:56:52 +01:00 |
|
David Baker
|
66de8756b7
|
Prepare changelog for v0.12.7
|
2017-10-16 14:56:52 +01:00 |
|
David Baker
|
2ca0d6621c
|
v0.12.7
|
2017-10-16 14:55:33 +01:00 |
|
David Baker
|
bfae8e98a1
|
Released js-sdk & react-sdk
|
2017-10-16 14:52:00 +01:00 |
|
Luke Barnard
|
102651332a
|
Merge pull request #5295 from vector-im/luke/groups-room-directory-esque
CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475
|
2017-10-16 13:52:38 +02:00 |
|
Luke Barnard
|
12ebe91f83
|
"Add room..." -> "Add rooms..."
|
2017-10-16 11:53:35 +01:00 |
|
Luke Barnard
|
0807a2a26d
|
rethemendex.sh
|
2017-10-16 11:47:34 +01:00 |
|
Luke Barnard
|
2cefa58d5d
|
CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475
|
2017-10-16 11:44:38 +01: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 |
|
Matthew Hodgson
|
5bb2992f93
|
Merge pull request #5281 from turt2live/travis/display-name-lightbox
Don't use MXIDs on the lightbox if possible
|
2017-10-14 22:46:13 +01:00 |
|
Matthew Hodgson
|
b70bd1987a
|
Merge pull request #5267 from turt2live/travis/alone_warning_css
CSS for lonely room message
|
2017-10-14 22:44:58 +01:00 |
|
Matthew Hodgson
|
5c1e2a8a82
|
Merge pull request #5037 from turt2live/travis/code_block_border
Bring back dark theme code block border
|
2017-10-14 22:32:45 +01:00 |
|
Matthew Hodgson
|
6f81142bde
|
Merge pull request #5282 from turt2live/travis/unset_avatar
CSS for remove avatar buttons
|
2017-10-14 22:11:02 +01:00 |
|
Travis Ralston
|
56e775c56a
|
Remove user avatar button CSS
|
2017-10-13 21:14:08 -06:00 |
|
Travis Ralston
|
c7723ba0b0
|
Remove room avatar button CSS
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-10-13 20:56:39 -06: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 |
|
David Baker
|
f5397acfa1
|
v0.12.7-rc.3
|
2017-10-13 16:36:57 +01:00 |
|
David Baker
|
bdd96c6a9a
|
Prepare changelog for v0.12.7-rc.3
|
2017-10-13 16:36:56 +01:00 |
|
David Baker
|
e0de9cbdfe
|
v0.12.7-rc.3
|
2017-10-13 16:36:07 +01:00 |
|
David Baker
|
f555f2036e
|
react-sdk rc.3
|
2017-10-13 16:35:41 +01:00 |
|
David Baker
|
3b2650e5ea
|
Merge remote-tracking branch 'origin/develop' into release-v0.12.7
|
2017-10-13 16:33:55 +01:00 |
|
David Baker
|
d1476e0cc7
|
Merge pull request #5275 from vector-im/dbkr/hide_join_group
Hide the join group button
|
2017-10-13 16:27:50 +01:00 |
|
David Baker
|
b727944b11
|
Bump electron version
|
2017-10-13 16:27:01 +01:00 |
|
David Baker
|
398e0839f1
|
Hide the join group button
Until it actually does something
|
2017-10-13 16:15:17 +01:00 |
|
David Baker
|
adceda7588
|
v0.12.7-rc.2
|
2017-10-13 15:06:18 +01:00 |
|
David Baker
|
577db02140
|
Prepare changelog for v0.12.7-rc.2
|
2017-10-13 15:06:18 +01:00 |
|
David Baker
|
4bd53eb821
|
v0.12.7-rc.2
|
2017-10-13 15:05:34 +01:00 |
|