Commit Graph

  • 46f5c0d205 finish merging vector-im/riot-web#5881 into matrix-react-sdk Matthew Hodgson 2018-04-16 01:13:03 +01:00
  • f1f7673037 ignore lint errors in stuff moved over from vector-web for now Matthew Hodgson 2018-04-16 01:12:41 +01:00
  • c8b26a1002 fix tests Matthew Hodgson 2018-04-16 00:23:34 +01:00
  • 5c341154b7 fix theming during tests correctly Matthew Hodgson 2018-04-16 00:19:08 +01:00
  • 8684fae473 kill theming 404s when UTing Matthew Hodgson 2018-04-16 00:14:05 +01:00
  • 32dd7f976f merge vector-im/riot-web#5881 into matrix-react-sdk Matthew Hodgson 2018-04-16 00:04:04 +01:00
  • 4da804fd64 Merge branch 'develop' into matthew/fix_layering Matthew Hodgson 2018-04-15 23:59:09 +01:00
  • 7c1eafd050 merge develop Matthew Hodgson 2018-04-15 23:55:09 +01:00
  • 0243ec0096 switch karma image loc Matthew Hodgson 2018-04-15 23:52:52 +01:00
  • fe5e68de29 fix tests Matthew Hodgson 2018-04-15 23:48:52 +01:00
  • ce36dec767 run prune-i18n to bring translations inline now most are moved to react-sdk Matthew Hodgson 2018-04-15 23:22:26 +01:00
  • b8d4866824 run gen-i18n to refresh translations now most are moved to react-sdk Matthew Hodgson 2018-04-15 23:22:06 +01:00
  • df564af8bd run prune-i18n to bring the translations back in line with normalised en_EN Matthew Hodgson 2018-04-15 23:18:47 +01:00
  • faa1924902 run gen-i18n to normalise en_EN and remove stuff still in vector-web Matthew Hodgson 2018-04-15 23:18:18 +01:00
  • cb5ff404e1 fix missing i18n Matthew Hodgson 2018-04-15 23:16:31 +01:00
  • a30fdaf293 copy all the i18n over from vector-web via copy-i18n.py Matthew Hodgson 2018-04-15 23:00:38 +01:00
  • 33632aaae6 Translated using Weblate (Galician) Xose M 2018-04-15 19:13:06 +00:00
  • 69bb020e5c Add instructions for changing translated strings Aidan Gauland 2018-04-15 22:42:58 +12:00
  • c988f4d093 Translated using Weblate (Icelandic) Sveinn í Felli 2018-04-15 09:50:31 +00:00
  • 62d48014c9 Added translation using Weblate (Icelandic) Sveinn í Felli 2018-04-15 08:49:11 +00:00
  • d3cc6f594b Translated using Weblate (Japanese) lighthawk 2018-04-15 05:34:57 +00:00
  • 32dab7a1ba Translated using Weblate (Japanese) toriko 2018-04-15 05:34:34 +00:00
  • 610747e76a fix paths and updateCheckStatusEnum Matthew Hodgson 2018-04-13 16:49:59 +01:00
  • a90bd6cd4f Allow collapsing ReplyThread from MessageContextMenu Michael Telatynski 2018-04-13 12:28:58 +01:00
  • 841bf4f894 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-13 09:58:49 +00:00
  • acf8ea1a65 Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-13 08:28:54 +00:00
  • 19d3913e06 Merge pull request #1838 from matrix-org/dbkr/fix_velocity_exception Luke Barnard 2018-04-13 10:58:43 +01:00
  • 8b1e411d6b Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to Michael Telatynski 2018-04-13 10:54:09 +01:00
  • ce74099698 Null check node before we pass it to velocity David Baker 2018-04-13 10:44:37 +01:00
  • a46b718b4a copy resources from their new locations Matthew Hodgson 2018-04-13 01:49:52 +01:00
  • 13765632e9 use new rageshake location Matthew Hodgson 2018-04-13 01:36:41 +01:00
  • d6931252c1 move rageshake to sdk Matthew Hodgson 2018-04-13 01:35:55 +01:00
  • efe466ef75 move rageshake to sdk Matthew Hodgson 2018-04-13 01:34:16 +01:00
  • 0336d99b9e move VectorConferenceHandler over and use getUpdateCheckStatusEnum via field rather than export Matthew Hodgson 2018-04-13 01:29:24 +01:00
  • 5f3e4444d0 fix theme paths Matthew Hodgson 2018-04-13 01:25:34 +01:00
  • aefb782892 move conference handler to matrix-react-sdk Matthew Hodgson 2018-04-13 01:25:08 +01:00
  • 3d20a64502 export enum via method for convenience from matrix-react-sdk Matthew Hodgson 2018-04-13 01:25:00 +01:00
  • be34c84704 fix theme paths Matthew Hodgson 2018-04-13 00:57:48 +01:00
  • 5d03eabb15 rethemedex Matthew Hodgson 2018-04-13 00:54:41 +01:00
  • 40a67ca8fe point imports at the new locations Matthew Hodgson 2018-04-13 00:43:44 +01:00
  • 534155fcd5 point to new CSS locations Matthew Hodgson 2018-04-13 00:43:15 +01:00
  • f569fddf15 make VectorHomePage override HomePage Matthew Hodgson 2018-04-13 00:42:58 +01:00
  • 41d6995da4 fix braindead typo Matthew Hodgson 2018-04-12 21:59:55 +01:00
  • cc904be379 add NVL Matthew Hodgson 2018-04-12 20:27:16 +01:00
  • 7ae1b37b56 add notif UTs Matthew Hodgson 2018-04-12 20:25:08 +01:00
  • 8757c8cae0 move notif UTs to sdk Matthew Hodgson 2018-04-12 20:24:44 +01:00
  • e899fece3c move themes to res to match sdk Matthew Hodgson 2018-04-12 20:21:26 +01:00
  • 659e71e150 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-12 12:08:16 +00:00
  • a70f3fe622 Translated using Weblate (Hungarian) Gergely Bakos 2018-04-12 11:46:00 +00:00
  • c8a3471135 Merge branch 'master' into develop David Baker 2018-04-12 13:07:09 +01:00
  • 740b221769 v0.14.1 v0.14.1 David Baker 2018-04-12 13:02:27 +01:00
  • e455453bcd Prepare changelog for v0.14.1 David Baker 2018-04-12 13:02:26 +01:00
  • 7a2866feb9 v0.14.1 David Baker 2018-04-12 12:59:27 +01:00
  • c631858ab3 Bump js-sdk & react-sdk David Baker 2018-04-12 12:57:04 +01:00
  • 8dd616462a Revert "Merge pull request #5286 from turt2live/travis/presence" Travis Ralston 2017-12-25 14:29:50 -07:00
  • 29ebb5ceea Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-12 11:55:26 +00:00
  • 7e977d0016 Merge branch 'master' into develop David Baker 2018-04-12 12:54:46 +01:00
  • c06fc31bb2 v0.12.2 David Baker 2018-04-12 12:50:52 +01:00
  • 4a1d0fc8ab Prepare changelog for v0.12.2 David Baker 2018-04-12 12:50:51 +01:00
  • f38bb1f2c2 Bump js-sdk David Baker 2018-04-12 12:40:33 +01:00
  • 3f069af067 Also remove the setting Travis Ralston 2017-12-25 14:33:46 -07:00
  • 91a41392b4 Remove presence management Travis Ralston 2017-12-25 14:25:13 -07:00
  • 760f21b1d9 Put Tinter loop body in a try/catch David Baker 2018-04-11 18:31:54 +01:00
  • 5f2d9b6c54 Null check stylesheet href David Baker 2018-04-11 18:20:40 +01:00
  • 8a8a37cef0 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-12 10:47:27 +00:00
  • 1c7ff85a4c Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-12 10:31:02 +00:00
  • d0827586e6 Merge pull request #1676 from turt2live/travis/remove-presence Matthew Hodgson 2018-04-12 11:47:21 +01:00
  • 03ee99281f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-12 10:46:34 +00:00
  • fa1e383db1 Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-12 10:33:31 +00:00
  • 976c818406 Merge pull request #5881 from turt2live/travis/remove-presence Matthew Hodgson 2018-04-12 11:46:26 +01:00
  • c77807bd22 Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to Michael Telatynski 2018-04-12 09:48:06 +01:00
  • 8371774d13 move default ringtones over from riot-web Matthew Hodgson 2018-04-12 00:25:36 +01:00
  • 8ce4df7ce3 move non-Riot image resources over from riot-web Matthew Hodgson 2018-04-12 00:25:07 +01:00
  • 848403a0ab move default fonts over from riot-web Matthew Hodgson 2018-04-12 00:24:51 +01:00
  • cdb5d489a4 organise themes (even light & dark) in the SDK layer Matthew Hodgson 2018-04-12 00:24:22 +01:00
  • 79d3cca6e9 move components' CSS to be in the same repo as their JS Matthew Hodgson 2018-04-12 00:23:35 +01:00
  • 70f3804227 move room directory logic over from riot-web Matthew Hodgson 2018-04-11 23:58:46 +01:00
  • 178fb647ad move notifications logic over from riot-web Matthew Hodgson 2018-04-11 23:58:37 +01:00
  • 8ab8f76254 move non-Riot-specific components over from riot-web Matthew Hodgson 2018-04-11 23:58:04 +01:00
  • 3ecbfae371 move everything not explicitly riot (or status) branded into matrix-react-sdk Matthew Hodgson 2018-04-11 23:49:52 +01:00
  • 5845a1ec7a Merge branch 'develop' into travis/remove-presence Travis Ralston 2018-04-11 15:18:30 -06:00
  • fe2cbc584d Merge branch 'develop' into travis/remove-presence Travis Ralston 2018-04-11 15:17:28 -06:00
  • a2a7668840 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-11 17:40:48 +00:00
  • 979452628f Merge pull request #1835 from matrix-org/dbkr/fix_firefox_extension_death David Baker 2018-04-11 18:40:43 +01:00
  • dbed29a7cc Put Tinter loop body in a try/catch David Baker 2018-04-11 18:31:54 +01:00
  • 91024007aa Null check stylesheet href David Baker 2018-04-11 18:20:40 +01:00
  • e8e1fd933f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-11 14:47:48 +00:00
  • ab578a5c0c Merge pull request #1819 from pvagner/jump_to_first_unread_a11y Luke Barnard 2018-04-11 15:47:43 +01:00
  • edcf516cef Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-11 11:05:13 +00:00
  • 8644a5ead9 Merge branch 'master' into develop Luke Barnard 2018-04-11 12:04:58 +01:00
  • eaeb495349 v0.14.0 v0.14.0 Luke Barnard 2018-04-11 12:01:45 +01:00
  • 1b602495b1 Prepare changelog for v0.14.0 Luke Barnard 2018-04-11 12:01:44 +01:00
  • b2a0031fe1 v0.14.0 Luke Barnard 2018-04-11 11:57:33 +01:00
  • 1f7ee7cf2c Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-11 10:55:35 +00:00
  • 1c6c180908 Merge branch 'master' into develop Luke Barnard 2018-04-11 11:55:24 +01:00
  • 1adb82b985 v0.12.1 Luke Barnard 2018-04-11 11:54:54 +01:00
  • d392eef6a8 Prepare changelog for v0.12.1 Luke Barnard 2018-04-11 11:54:53 +01:00
  • 478c2bab33 Bump js-sdk version to 0.10.0 Luke Barnard 2018-04-11 11:51:16 +01:00
  • 5fc37032ad Bump js-sdk to 0.10.0, react-sdk to 0.12.1 Luke Barnard 2018-04-11 11:42:56 +01:00
  • fd73e8ce9e Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-11 10:33:06 +00:00