Commit Graph

  • e96f96d1f2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-16 13:13:13 +00:00
  • 30b8d0e807 Merge pull request #1613 from turt2live/travis/granular_bugs Matthew Hodgson 2017-11-16 13:13:09 +00:00
  • 52e2c987e8 Merge branch 'develop' into travis/granular_bugs Matthew Hodgson 2017-11-16 13:13:00 +00:00
  • f62b04c3be Merge branch 'develop' into travis/granular_bugs Matthew Hodgson 2017-11-16 13:12:03 +00:00
  • 3e13a919ed remove rogue debug Matthew Hodgson 2017-11-16 13:09:53 +00:00
  • 07cc5dc6c9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-16 13:08:53 +00:00
  • 58f2e51af5 Merge pull request #5615 from turt2live/travis/granular_bugs Matthew Hodgson 2017-11-16 13:08:48 +00:00
  • e0e21efcf4 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-16 13:06:41 +00:00
  • f4b7741449 Translated using Weblate (Slovak) Peter Vágner 2017-11-16 12:54:02 +00:00
  • 02ffa919c4 Translated using Weblate (Russian) Walter 2017-11-16 12:48:03 +00:00
  • 44e8a2cd54 Translated using Weblate (German) Bamstam 2017-11-16 12:45:37 +00:00
  • f99755378a Merge pull request #1612 from matrix-org/t3chguy/state_events Luke Barnard 2017-11-16 13:06:36 +00:00
  • 1e5fabed97 Translated using Weblate (Slovak) Peter Vágner 2017-11-16 12:58:52 +00:00
  • 63c4a14dc2 Translated using Weblate (German) Bamstam 2017-11-16 12:37:32 +00:00
  • 3c9210e376 Translated using Weblate (Russian) Andrey 2017-11-16 12:09:10 +00:00
  • 1e7007423b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-16 11:54:57 +00:00
  • 4657f89b3e Translated using Weblate (Serbian) Марко М. Костић 2017-11-15 23:06:32 +00:00
  • cb235a29fa Merge pull request #5613 from pafcu/simplify-translation Luke Barnard 2017-11-16 11:54:52 +00:00
  • 68cb84700e Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-16 11:45:50 +00:00
  • a80935e181 JSX does not do comments in a way one might expect Luke Barnard 2017-11-16 11:45:40 +00:00
  • 1e2e4397f7 Fix typo pafcu 2017-11-16 12:41:26 +01:00
  • ba387f6287 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-16 11:29:08 +00:00
  • 843bdd6e13 Translated using Weblate (German) Bamstam 2017-11-16 00:25:51 +00:00
  • 29e6627a75 Merge pull request #1608 from pafcu/simplify-translation Luke Barnard 2017-11-16 11:29:03 +00:00
  • 342378f48a Add space after if pafcu 2017-11-16 12:19:56 +01:00
  • af8ff1b888 Don't blindly hangup on a call error. David Baker 2017-11-16 11:07:57 +00:00
  • d0a0a9ce7f Fix URL preview string not being translated Travis Ralston 2017-11-15 22:31:16 -07:00
  • fb1f20b7d4 Treat the master push rule as authoritative Travis Ralston 2017-11-15 22:09:40 -07:00
  • 5976fb2eed Treat null/undefined notification settings as "not set" Travis Ralston 2017-11-15 22:08:13 -07:00
  • 10a1d9cb29 Language is a local setting Travis Ralston 2017-11-15 21:16:12 -07:00
  • 84c5ce1b4e Translated using Weblate (Chinese (Simplified)) 忆年 2017-11-16 02:38:20 +00:00
  • f141ee1944 Use the correct level order when getting arbitrary settings Travis Ralston 2017-11-15 19:24:32 -07:00
  • cf8ff6aed3 Validate that URL previews are explicitly enabled/disabled Travis Ralston 2017-11-15 19:22:30 -07:00
  • 42e601005f Use SettingsStore to get the default theme Travis Ralston 2017-11-15 19:09:03 -07:00
  • 022e40a127 Use SettingsStore for default theme Travis Ralston 2017-11-15 19:04:49 -07:00
  • 311bdf71fb Added translation using Weblate (Serbian) Марко М. Костић 2017-11-15 22:56:22 +00:00
  • 4949f2f763 Fix typo and update strings Stefan Parviainen 2017-11-15 20:43:45 +01:00
  • 2c1618bc10 Fix conflict and update strings Stefan Parviainen 2017-11-15 20:40:51 +01:00
  • 0596925a86 Translated using Weblate (Hungarian) Szimszon 2017-11-15 19:05:05 +00:00
  • ae6c985d39 Add missing backtick Stefan Parviainen 2017-11-15 19:58:29 +01:00
  • 509c833896 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 18:35:14 +00:00
  • 53a793b8fd Merge pull request #5605 from vector-im/rxl881/invertOutlineColour Richard Lewis 2017-11-15 18:35:09 +00:00
  • 80b1a685a6 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 18:34:56 +00:00
  • 45a90ef038 Translated using Weblate (Russian) Andrey 2017-11-15 16:40:07 +00:00
  • 1f1ca15219 Translated using Weblate (German) Bamstam 2017-11-15 18:24:20 +00:00
  • 5104ebfd29 Merge pull request #1611 from matrix-org/rxl881/invertOutlineColour Richard Lewis 2017-11-15 18:34:51 +00:00
  • b0027525f3 Wire up Unknown Devices popup for outbound calls David Baker 2017-11-15 17:21:04 +00:00
  • b00cf8c939 add dark theme styling to devtools input box Michael Telatynski 2017-11-15 17:13:39 +00:00
  • 45ed5b13ca Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 16:33:06 +00:00
  • 6f15c67d0b Merge branch 'master' into develop Luke Barnard 2017-11-15 16:32:52 +00:00
  • 0a55c87dd3 Translated using Weblate (French) Kévin C 2017-11-15 16:30:41 +00:00
  • 648be26fb7 Translated using Weblate (French) Kévin C 2017-11-15 16:27:03 +00:00
  • ed3a6d29ac Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/invertOutlineColour Richard Lewis 2017-11-15 16:25:14 +00:00
  • c0002e7778 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events Michael Telatynski 2017-11-15 16:03:07 +00:00
  • 5563b71c47 differentiate between state events and message events so that people can't fake state event types and have them rendered. Michael Telatynski 2017-11-15 15:56:54 +00:00
  • 2893cee685 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 15:55:45 +00:00
  • bbcf74f774 fix @lampholder's NPE for real Matthew Hodgson 2017-11-15 15:55:33 +00:00
  • aeca83ff2e Unused import David Baker 2017-11-15 15:20:45 +00:00
  • 750e64deee Pass required props to TintableSvg. Richard Lewis 2017-11-15 15:17:21 +00:00
  • 93800be742 Factor out showing UnknownDeviceDialog David Baker 2017-11-15 15:14:42 +00:00
  • bfb4ae3083 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/invertOutlineColour Richard Lewis 2017-11-15 15:09:38 +00:00
  • 24b9269ff5 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour Richard Lewis 2017-11-15 15:08:28 +00:00
  • c5b5a78e86 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 14:47:28 +00:00
  • f4ecc7fa5d speculatively fix @lampholder's NPE Matthew Hodgson 2017-11-15 14:47:20 +00:00
  • e06ff8083d Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 14:30:40 +00:00
  • ec33806379 Merge pull request #1610 from matrix-org/rxl881/lintingErrors Matthew Hodgson 2017-11-15 14:30:36 +00:00
  • 26231e458e Add green cancel icon. Richard Lewis 2017-11-15 13:42:36 +00:00
  • 7bab7813bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour Richard Lewis 2017-11-15 13:26:29 +00:00
  • 59d405d4fa Use TintableSvgButtons for widget menubar icons. Richard Lewis 2017-11-15 13:24:38 +00:00
  • 6c2e9096cd Tintable SVGs that behave like normal image buttons / links. Richard Lewis 2017-11-15 13:08:24 +00:00
  • 10b17b7fd0 TintableSvgButton styling. Richard Lewis 2017-11-15 13:04:58 +00:00
  • 5e7faf3083 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 12:14:39 +00:00
  • 9664b4d176 Add Slovak to included languages Luke Barnard 2017-11-15 12:14:30 +00:00
  • f8fc6dc83e Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show David Baker 2017-11-15 12:11:33 +00:00
  • 072a3cd622 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 11:26:05 +00:00
  • 96a3eff5d3 lint hell Matthew Hodgson 2017-11-15 11:25:56 +00:00
  • 0847596083 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 11:15:57 +00:00
  • 84591729a8 unbreak tests Matthew Hodgson 2017-11-15 11:15:49 +00:00
  • 629a18ebef v0.13.0 v0.13.0 Luke Barnard 2017-11-15 11:09:31 +00:00
  • 7e5f80c9f7 Prepare changelog for v0.13.0 Luke Barnard 2017-11-15 11:09:30 +00:00
  • 898bb6f9d8 v0.13.0 Luke Barnard 2017-11-15 11:08:37 +00:00
  • 02c2e1a14c Bump js/react SDKs to releases 0.9.0 & 0.11.0 Luke Barnard 2017-11-15 11:03:20 +00:00
  • 023549a528 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 11:02:12 +00:00
  • a63c491220 Merge branch 'master' into develop Luke Barnard 2017-11-15 11:02:02 +00:00
  • 6fd09bc09a v0.11.0 Luke Barnard 2017-11-15 11:01:29 +00:00
  • bb2bc6ac08 Prepare changelog for v0.11.0 Luke Barnard 2017-11-15 11:01:29 +00:00
  • 9df169b500 Bump js-sdk to release 0.9.0 Luke Barnard 2017-11-15 10:59:06 +00:00
  • 7ab693d776 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 10:56:13 +00:00
  • ffada4f6fe Merge pull request #5468 from turt2live/travis/granular Matthew Hodgson 2017-11-15 10:56:08 +00:00
  • 6e74657d41 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 10:56:01 +00:00
  • 060a890275 Merge pull request #1516 from turt2live/travis/granular-settings Matthew Hodgson 2017-11-15 10:55:55 +00:00
  • 63919befd0 Catch call failures due to unknown devices David Baker 2017-11-15 10:49:29 +00:00
  • 56a70f5530 Add tinting for lowlights. Richard Lewis 2017-11-15 10:40:07 +00:00
  • 1fc44a32c0 Fix SVG colours. Add rounded, lowlight outline for clarity. Richard Lewis 2017-11-15 10:39:12 +00:00
  • 06b319937f Fix linting errors. Richard Lewis 2017-11-15 10:14:16 +00:00
  • 7367a27df1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-15 09:56:52 +00:00
  • e91e94fd42 fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601 Matthew Hodgson 2017-11-15 09:56:44 +00:00
  • 3a2c778e1c Translated using Weblate (Hungarian) Szimszon 2017-11-15 05:52:04 +00:00
  • a226a4997b Translated using Weblate (Hungarian) Szimszon 2017-11-14 20:33:16 +00:00
  • a9cd62633e Translated using Weblate (Russian) Andrey 2017-11-15 04:44:06 +00:00