OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,841 Commits
209 Branches
550 Tags
414 MiB
Commit Graph

7841 Commits (ee5d43385cdae68e611c4513dc1c77f43f2e446a)

Author SHA1 Message Date
Richard Lewis 24b9269ff5 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour 2017-11-15 15:08:28 +00:00
Weblate c5b5a78e86 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 14:47:28 +00:00
Matthew Hodgson f4ecc7fa5d speculatively fix @lampholder's NPE 2017-11-15 14:47:20 +00:00
Weblate e06ff8083d Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 14:30:40 +00:00
Matthew Hodgson ec33806379
Merge pull request #1610 from matrix-org/rxl881/lintingErrors 
Fix linting errors.
 2017-11-15 14:30:36 +00:00
Richard Lewis 7bab7813bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour 2017-11-15 13:26:29 +00:00
Richard Lewis 59d405d4fa Use TintableSvgButtons for widget menubar icons. 2017-11-15 13:24:38 +00:00
Richard Lewis 6c2e9096cd Tintable SVGs that behave like normal image buttons / links. 2017-11-15 13:08:24 +00:00
Weblate 072a3cd622 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 11:26:05 +00:00
Matthew Hodgson 96a3eff5d3 lint hell 2017-11-15 11:25:56 +00:00
Weblate 0847596083 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 11:15:57 +00:00
Matthew Hodgson 84591729a8 unbreak tests 2017-11-15 11:15:49 +00:00
Weblate 023549a528 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 11:02:12 +00:00
Luke Barnard a63c491220 Merge branch 'master' into develop 2017-11-15 11:02:02 +00:00
Luke Barnard 6fd09bc09a v0.11.0 2017-11-15 11:01:29 +00:00
Luke Barnard bb2bc6ac08 Prepare changelog for v0.11.0 2017-11-15 11:01:29 +00:00
Luke Barnard 9df169b500 Bump js-sdk to release 0.9.0 2017-11-15 10:59:06 +00:00
Weblate 6e74657d41 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 10:56:01 +00:00
Matthew Hodgson 060a890275
Merge pull request #1516 from turt2live/travis/granular-settings 
Granular settings
 2017-11-15 10:55:55 +00:00
Richard Lewis 56a70f5530 Add tinting for lowlights. 2017-11-15 10:40:07 +00:00
Richard Lewis 06b319937f Fix linting errors. 2017-11-15 10:14:16 +00:00
Weblate 7367a27df1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 09:56:52 +00:00
Matthew Hodgson e91e94fd42 fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601 2017-11-15 09:56:44 +00:00
Szimszon a226a4997b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (934 of 934 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-11-15 05:51:26 +00:00
Travis Ralston f58e8826c0 Use the correct settings store for presence 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-14 19:18:04 -07:00
Travis Ralston 443bff5832 Presence feature 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-14 19:14:56 -07:00
Travis Ralston bd4102eb3d Merge branch 'develop' into travis/granular-settings 2017-11-14 19:12:48 -07:00
Weblate cb32bac7fa Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 01:46:01 +00:00
Matthew Hodgson 546b062d82 automatically and correctly retint when changing theme 2017-11-15 01:45:51 +00:00
Weblate 06e38c2e48 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 01:01:24 +00:00
Bamstam 955362ee2d Translated using Weblate (German) 
Currently translated at 99.4% (929 of 934 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-15 01:01:24 +00:00
Matthew Hodgson d6fc4ebe3c fix new tinter problems 
correctly handle skinned tertiaryColors (turns out they're used for the RoomSublist divider bars)
handle the fact that some room accountData apparently has ended up with rgb() colors in it...
 2017-11-15 01:01:17 +00:00
Weblate 247df92f17 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 23:53:21 +00:00
Matthew Hodgson f05958e334
Merge pull request #1482 from turt2live/travis/presence 
Implement user-controlled presence
 2017-11-14 23:53:16 +00:00
Stefan Parviainen ae252f7e59 Log if no match is found 2017-11-14 21:34:20 +01:00
Szimszon 3a6e89584c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (933 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-11-14 20:33:16 +00:00
Weblate 26e5271d81 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 20:20:37 +00:00
Richard Lewis bd8caebe41
Merge pull request #1609 from matrix-org/rxl881/editIcon 
Edit widget icon styling
 2017-11-14 20:20:32 +00:00
Richard Lewis 58966c5c3d Make edit icon green by default 2017-11-14 19:53:59 +00:00
Richard Lewis e87940f63c Make app tile title stronger 2017-11-14 19:53:32 +00:00
Stefan Parviainen f8660de52d Add note about alternative to opacity 2017-11-14 20:13:00 +01:00
Stefan Parviainen df6d5cc2b4 Pass plain components, rather than functions returning them 2017-11-14 20:09:52 +01:00
Stefan Parviainen 788be67c75 Clarifications 2017-11-14 20:08:27 +01:00
Stefan Parviainen cdd03dd1c5 Use toEqual instead of toBe 2017-11-14 19:34:47 +01:00
Stefan Parviainen 772550a24a Dont't add empty nodes 2017-11-14 19:33:12 +01:00
Weblate 4c4220e9dd Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 16:07:56 +00:00
Matthew Hodgson 7c98558b6a fix neglible race when loading CSS 2017-11-14 16:07:48 +00:00
Weblate 869a2d158f Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 16:04:19 +00:00
Matthew Hodgson 1fd7ac30e4 turns out i made up the .complete property on link elements 2017-11-14 16:04:11 +00:00
Weblate 299a32fa98 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 15:37:12 +00:00