David Baker
|
6ff91789b2
|
Rename 'config' option to 'symlink'
because that's really all it's doing and we can use it for other
things
|
2017-09-20 17:04:31 +01:00 |
|
David Baker
|
be938ac0f4
|
Accept globs for the config location
and make the default config*.sjon so we'll automatically symlink
any config files in the current dir.
|
2017-09-20 14:38:41 +01:00 |
|
David Baker
|
e4082d4f45
|
Support multiple configs on the command line
|
2017-09-20 14:25:33 +01:00 |
|
Matthew Hodgson
|
fbe1c82dfa
|
Merge pull request #5074 from vector-im/t3chguy/devtools-1
T3chguy/devtools 1
|
2017-09-19 22:14:52 +01:00 |
|
David Baker
|
8fc69198b1
|
Merge pull request #5085 from vector-im/luke/fix-separate-sender-profile
Alter opacity for flair
|
2017-09-19 17:21:57 +01:00 |
|
David Baker
|
283829cb0c
|
Merge pull request #5082 from vector-im/luke/fix-ugly-integ-button
Fix ugly integ button
|
2017-09-19 17:21:47 +01:00 |
|
Luke Barnard
|
0d6b09a5f6
|
Merge branch 'develop' into luke/fix-ugly-integ-button
|
2017-09-19 17:03:06 +01:00 |
|
Luke Barnard
|
7469ab5ed9
|
Alter opacity for flair
Apply 0.7 opacity to flair, but keep name and aux at 0.5
|
2017-09-19 16:56:46 +01:00 |
|
Luke Barnard
|
fbcccd8be0
|
Merge pull request #4830 from vector-im/dbkr/group_userlist
Group Membership UI
|
2017-09-19 13:26:02 +01:00 |
|
Luke Barnard
|
d25c3be627
|
CSS to fix ugly integrations button
See matrix-org/matrix-react-sdk#1399
|
2017-09-19 11:59:51 +01:00 |
|
Luke Barnard
|
38c0d62478
|
Fix typo for integs error button error
|
2017-09-19 10:46:00 +01:00 |
|
David Baker
|
ff8bc1ca68
|
Merge pull request #5053 from vector-im/dbkr/3pid_invite_update_when_joined
Fix test for new behaviour of 'joining' flag
|
2017-09-19 10:34:31 +01:00 |
|
David Baker
|
c32e736754
|
Comment why we don't expect joining flag to reset
|
2017-09-19 10:23:12 +01:00 |
|
Matthew Hodgson
|
26c8d23c21
|
Merge pull request #5080 from vector-im/t3chguy/fix-powersave-typo
fix really dumb blunder/typo preventing system from going to sleep.
|
2017-09-19 08:13:26 +01:00 |
|
Michael Telatynski
|
d97224e69e
|
fix really dumb blunder/typo preventing system from going to sleep.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-09-19 00:53:44 +01:00 |
|
Michael Telatynski
|
00976d9338
|
i18n new DevTools strings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-09-18 12:04:11 +01:00 |
|
Michael Telatynski
|
dccee6d419
|
add ability to filter room state types/results
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-09-18 12:03:11 +01:00 |
|
Michael Telatynski
|
af450df513
|
add ability to jump from RSE to Send Custom State Event prefilled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-09-18 11:27:31 +01:00 |
|
Michael Telatynski
|
821ab6c13e
|
switch to controlled inputs and require eventType !== ''
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-09-18 11:06:46 +01:00 |
|
Matthew Hodgson
|
828e9d5eb4
|
Merge pull request #4735 from vector-im/t3chguy/devtools
T3chguy/devtools
|
2017-09-17 23:15:28 +01:00 |
|
Matthew Hodgson
|
662431043e
|
Merge pull request #5042 from turt2live/travis/ignored_users
CSS for unignore button in UserSettings
|
2017-09-17 22:38:31 +01:00 |
|
Matthew Hodgson
|
7f746ce2c6
|
Merge pull request #5044 from turt2live/travis/home_page_identity_room
Fix alias on home page for identity room
|
2017-09-15 16:37:38 +01:00 |
|
David Baker
|
30efd02d22
|
Fix test for new behaviour of 'joining' flag
It's no longer reset when the join request completes, so don't
assert it. (The important test is later, asserting that the room
object is non-null).
|
2017-09-15 15:57:37 +01:00 |
|
turt2live
|
a4e33bf46a
|
Fix alias on home page for identity room
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-09-14 21:09:57 -06:00 |
|
Travis Ralston
|
ac0f593c7c
|
CSS for unignore button in UserSettings
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-09-14 15:34:45 -06:00 |
|
David Baker
|
06fe240be2
|
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
|
2017-09-13 16:35:37 +01:00 |
|
David Baker
|
f148844573
|
Merge pull request #4989 from vector-im/t3chguy/on_copy_tooltip
generic contextual menu for tooltip/responses
|
2017-09-13 14:27:28 +01:00 |
|
Michael Telatynski
|
2316f4230e
|
install and use prop-types over React.PropTypes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-09-13 14:23:35 +01:00 |
|
David Baker
|
c140088f82
|
Merge pull request #5018 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-09-12 12:57:36 +01:00 |
|
Michael Telatynski
|
9691173032
|
Translated using Weblate (Tamil)
Currently translated at 69.8% (146 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
|
2017-09-12 10:56:54 +00:00 |
|
Michael Telatynski
|
8513ea2a31
|
Translated using Weblate (Malayalam)
Currently translated at 98.5% (206 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
|
2017-09-12 10:56:54 +00:00 |
|
Michael Telatynski
|
a5a1b5fcd8
|
Translated using Weblate (Italian)
Currently translated at 99.5% (208 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2017-09-12 10:56:53 +00:00 |
|
Michael Telatynski
|
30f81e2143
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (209 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
|
2017-09-12 10:56:53 +00:00 |
|
Michael Telatynski
|
f48cfdcfe0
|
Translated using Weblate (Catalan)
Currently translated at 54.5% (114 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2017-09-12 10:56:53 +00:00 |
|
Michael Telatynski
|
728ffd37b8
|
Translated using Weblate (Arabic)
Currently translated at 14.8% (31 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/
|
2017-09-12 10:56:53 +00:00 |
|
Weblate
|
2357e7fe41
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-11 17:52:19 +00:00 |
|
David Baker
|
f18f13643f
|
Merge pull request #5015 from vector-im/dbkr/active_room_observer
Avoid re-rendering RoomList on room switch
|
2017-09-11 18:52:15 +01:00 |
|
David Baker
|
3ac154b7da
|
Add comment to update shouldComponentUpdate
if adding new props
|
2017-09-11 18:30:43 +01:00 |
|
David Baker
|
47ddc6dedf
|
Comment typo
|
2017-09-11 18:29:20 +01:00 |
|
David Baker
|
82f2e47667
|
Avoid re-rendering RoomList on room switch
See https://github.com/matrix-org/matrix-react-sdk/pull/1375
|
2017-09-11 17:06:40 +01:00 |
|
Weblate
|
55c656ead9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-11 16:04:59 +00:00 |
|
Balaji Ravichandran
|
dc6a7e7425
|
Translated using Weblate (Tamil)
Currently translated at 69.8% (146 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
|
2017-09-11 16:04:59 +00:00 |
|
Akcja Demokracja Open-Source
|
3a77d8aa21
|
Translated using Weblate (Polish)
Currently translated at 100.0% (209 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
|
2017-09-11 16:04:59 +00:00 |
|
av3n
|
b7f31d0a64
|
Translated using Weblate (Italian)
Currently translated at 99.5% (208 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
|
2017-09-11 16:04:59 +00:00 |
|
Jan Kudrik
|
95af34ca99
|
Translated using Weblate (Czech)
Currently translated at 100.0% (209 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
|
2017-09-11 16:04:58 +00:00 |
|
David Baker
|
079f39efed
|
Add New Vector windows build signing cert
As the signing process needs it.
|
2017-09-11 17:04:10 +01:00 |
|
Weblate
|
83acdee013
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-07 15:01:08 +00:00 |
|
David Baker
|
941f92530d
|
Merge pull request #4623 from MurzNN/patch-1
Fix menu on change keyboard language issue #4345
|
2017-09-07 16:01:04 +01:00 |
|
Weblate
|
942021e4bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-07 13:35:39 +00:00 |
|
Ramon Vilar
|
7a62b058c9
|
Translated using Weblate (Catalan)
Currently translated at 54.5% (114 of 209 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2017-09-07 13:35:38 +00:00 |
|