Commit Graph

  • 31290f3377 Remove redundant, unused decorators from RTE Luke Barnard 2017-07-17 14:27:50 +01:00
  • 57be0cf23d Added translation using Weblate (Latvian) Lauris Mierkalns 2017-07-17 03:12:22 +00:00
  • faa9fa8db9 Added translation using Weblate (Czech) František Šindelář 2017-07-15 13:26:27 +00:00
  • 6aa0f68ee9 Show beta testing icon and help message for widgets tile. Richard Lewis 2017-07-14 23:31:57 +01:00
  • f272961fbd Styling for beta testing icon. Richard Lewis 2017-07-14 23:30:47 +01:00
  • ac0d29dc06 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-14 17:04:10 +00:00
  • cb4f57eb4a Merge pull request #4583 from vector-im/luke/feature-rte-pills Luke Barnard 2017-07-14 18:04:05 +01:00
  • a1b4b9992e Use $accent-fg-color instead of #fff Luke Barnard 2017-07-14 17:59:53 +01:00
  • 18a6ee5a52 white -> #fff Luke Barnard 2017-07-14 17:52:11 +01:00
  • de0fd588b6 Add $rte-room-pill-color: #aaa Luke Barnard 2017-07-14 17:51:25 +01:00
  • ee5117525c Merge pull request #1225 from matrix-org/luke/feature-rte-pills Luke Barnard 2017-07-14 17:47:17 +01:00
  • 54f44af494 Make editing prettier David Baker 2017-07-14 17:23:44 +01:00
  • 38899c6011 CSS for decorated matrix.to links in the composer Luke Barnard 2017-07-14 17:23:16 +01:00
  • f6f80bf9ce Remove now unused 'edit' block David Baker 2017-07-14 17:22:17 +01:00
  • 3aed1a6293 Merge pull request #1224 from matrix-org/rav/upload_progress David Baker 2017-07-14 17:18:48 +01:00
  • 434660166c Decorate http://matrix.to links in the composer as pills Luke Barnard 2017-07-14 17:04:28 +01:00
  • ad085a6273 Fix file uploading Richard van der Hoff 2017-07-14 17:01:03 +01:00
  • dd77147313 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-14 15:43:17 +00:00
  • 1690f875ca Merge pull request #4579 from vector-im/rav/wait_longer_for_client David Baker 2017-07-14 16:43:13 +01:00
  • 66ddf25977 Deflake the joining test Richard van der Hoff 2017-07-14 16:14:42 +01:00
  • c24b04d19b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-14 14:43:00 +00:00
  • 0c31c62a62 build fix: bump to mock-request 1.1 Richard van der Hoff 2017-07-14 15:41:13 +01:00
  • 8c9afc2dfd Make GroupView more consistent with RoomView David Baker 2017-07-14 15:39:46 +01:00
  • bd06a1c393 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-14 14:05:12 +00:00
  • 40a47f8c7a Allow Riot to load up different configs depending on the domain (#4575) Kegsay 2017-07-14 15:05:07 +01:00
  • 8516c9d5b5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-14 13:55:25 +00:00
  • caa5751d50 Merge pull request #4577 from vector-im/rav/bump_react_versions David Baker 2017-07-14 14:55:21 +01:00
  • 2a52c902e2 Merge pull request #1223 from matrix-org/rav/roomsettings_promise_usage Richard van der Hoff 2017-07-14 14:47:14 +01:00
  • 01d954e4ab Bump react to 15.6 to fix build problems Richard van der Hoff 2017-07-14 14:45:44 +01:00
  • 9df1fb91ff Fix RoomSettings save Richard van der Hoff 2017-07-14 14:24:35 +01:00
  • f6f461c571 Translated using Weblate (Chinese (Simplified)) Tong Hui 2017-07-04 17:31:33 +00:00
  • e1e7492f17 Translated using Weblate (French) Brendan Abolivier 2017-06-26 15:22:45 +00:00
  • 5274cf59a0 Hook up the edit widget button (#1218) Kegsay 2017-07-14 11:17:59 +01:00
  • 1db2431c9f Merge pull request #1222 from matrix-org/luke/fix-rte-allow-split-code-block Luke Barnard 2017-07-14 09:48:47 +01:00
  • ea85a3c3d9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-13 17:46:57 +00:00
  • c0830b48d0 Merge pull request #4567 from vector-im/rxl881/widgetButtons Richard Lewis 2017-07-13 18:46:53 +01:00
  • 219c00bbc3 Add code-block to the list of blocks where hitting return will split-block Luke Barnard 2017-07-13 18:42:37 +01:00
  • e60bf48134 CSS for start of group edit support David Baker 2017-07-13 18:42:14 +01:00
  • 381f685013 Start on editing groups David Baker 2017-07-13 18:41:51 +01:00
  • 7945abe6b9 Merge pull request #1219 from matrix-org/luke/fix-autcompleter-promises Luke Barnard 2017-07-13 18:11:45 +01:00
  • 33df4fafaa Merge pull request #1221 from matrix-org/luke/feature-rte-autoemoji Luke Barnard 2017-07-13 17:51:34 +01:00
  • dcc4db53f9 Async functions now return bluebird promises, remove redundant Promise.resolve Luke Barnard 2017-07-13 17:51:14 +01:00
  • c47398e7fe Merge branch 'develop' into luke/fix-autcompleter-promises Luke Barnard 2017-07-13 17:48:10 +01:00
  • 5a701d3b06 Merge pull request #1220 from matrix-org/rav/async_to_bluebird Luke Barnard 2017-07-13 17:46:22 +01:00
  • ea7d923d76 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-13 16:46:16 +00:00
  • 5e259ec176 Merge pull request #4572 from vector-im/rav/async_to_bluebird Luke Barnard 2017-07-13 17:46:12 +01:00
  • d97de4d576 Implement disabled-by-default setting for auto-replacement of plaintext emojis Luke Barnard 2017-07-13 17:37:43 +01:00
  • 3ec4b25793 Transform async functions to bluebird promises Richard van der Hoff 2017-07-13 17:34:47 +01:00
  • f78a49b3a9 Do reflect in the same map Luke Barnard 2017-07-13 17:20:17 +01:00
  • 4d83150855 Transform async functions to bluebird promises Richard van der Hoff 2017-07-13 17:10:08 +01:00
  • c9f3a12693 Fix Autocompleter promises Luke Barnard 2017-07-13 16:51:14 +01:00
  • 7fc10789fc Merge pull request #1217 from matrix-org/luke/fix-rte-html-links Luke Barnard 2017-07-13 13:57:58 +01:00
  • f1a4209d6b Fix indentation Luke Barnard 2017-07-13 13:47:08 +01:00
  • 5826b6f22a Instead of sending HTML for any Entity, only send HTML for Links Luke Barnard 2017-07-13 13:41:17 +01:00
  • c5b72f0192 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-13 12:33:54 +00:00
  • b9b0e98ccf Merge pull request #4570 from vector-im/rav/joining_test David Baker 2017-07-13 13:33:50 +01:00
  • be045a6dc0 Interpret whitespace after entity as the end of the entity Luke Barnard 2017-07-13 13:28:51 +01:00
  • 4b96963408 Send HTML if there are any entities present in the composer Luke Barnard 2017-07-13 13:27:49 +01:00
  • 55e1202c09 Decorate pasted links so that they look like links Luke Barnard 2017-07-13 13:26:13 +01:00
  • 32ef273f9d use flushAllExpected in joining test Richard van der Hoff 2017-07-13 13:23:10 +01:00
  • 2a68cce3d5 Merge pull request #1216 from matrix-org/dbkr/history_save_unload_nullcheck David Baker 2017-07-13 12:38:28 +01:00
  • 76f6a19733 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-13 11:20:13 +00:00
  • 348ec52b14 Merge pull request #4565 from vector-im/rav/bluebird Richard van der Hoff 2017-07-13 12:20:08 +01:00
  • 086304532e Merge pull request #1213 from matrix-org/rav/bluebird Richard van der Hoff 2017-07-13 12:06:11 +01:00
  • 76181f4771 Merge remote-tracking branch 'origin/develop' into rav/bluebird Richard van der Hoff 2017-07-13 12:04:54 +01:00
  • 9072ff93b9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-13 10:58:24 +00:00
  • a303e1e1b8 Merge pull request #4564 from vector-im/rav/await_login_component Luke Barnard 2017-07-13 11:58:21 +01:00
  • 917133219f Remove sentHistory save altogether David Baker 2017-07-13 11:53:22 +01:00
  • ce0f9e8803 Merge pull request #1214 from matrix-org/luke/fix-rte-remove-old-disable-md-setting Luke Barnard 2017-07-13 11:33:42 +01:00
  • acbcde85ce Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-13 10:33:32 +00:00
  • ba1166d0d0 Merge pull request #4568 from vector-im/luke/remove-old-composer Luke Barnard 2017-07-13 11:33:28 +01:00
  • 7238c4dfac Fix overlooked q Richard van der Hoff 2017-07-13 11:33:25 +01:00
  • 4d844ebc34 Merge pull request #1215 from matrix-org/luke/remove-old-composer Luke Barnard 2017-07-13 11:33:23 +01:00
  • 1e80edb43c Prevent exception on page unload David Baker 2017-07-13 11:30:25 +01:00
  • 04dd98e6e9 Remove references to tabComplete, which are now redundant Luke Barnard 2017-07-13 10:16:59 +01:00
  • 0e12e384cb Remove TabComplete-related files Luke Barnard 2017-07-13 10:16:42 +01:00
  • d901515059 rethemedex Luke Barnard 2017-07-13 10:16:23 +01:00
  • f5c4d903e6 Remove CSS for TabComplete Luke Barnard 2017-07-13 10:11:58 +01:00
  • 441954c8c1 Remove i18n for "Unknown command" Luke Barnard 2017-07-13 09:55:11 +01:00
  • e15c8e473f AppTile menu bar button styling. Richard Lewis 2017-07-13 09:44:19 +01:00
  • 69eb1a49d4 Fix a broken test Richard van der Hoff 2017-07-13 00:56:13 +01:00
  • 1d2d086a58 Replace q.allSettled() Richard van der Hoff 2017-07-13 00:41:18 +01:00
  • 4c5b5ca0ba replace q.Promise with new Promise Richard van der Hoff 2017-07-13 00:37:04 +01:00
  • d5b550f89a replace q method calls with bluebird ones Richard van der Hoff 2017-07-13 00:33:28 +01:00
  • b29b4a959b q(...) -> Promise.resolve Richard van der Hoff 2017-07-13 00:32:07 +01:00
  • 10decf95f6 replace imports of q with bluebird Richard van der Hoff 2017-07-13 00:48:31 +01:00
  • 9a1e7ad170 Hide widget panel while it is being deleted. Richard Lewis 2017-07-13 00:27:03 +01:00
  • b2403d59b7 loading tests: wait for login component Richard van der Hoff 2017-07-13 00:18:49 +01:00
  • 0f8a2554dc Enable colours for karma test output Richard van der Hoff 2017-07-13 00:18:10 +01:00
  • 668199e219 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-12 17:29:15 +00:00
  • 498feeed21 Translated using Weblate (Russian) Andrey 2017-07-12 17:05:08 +00:00
  • 4040c1d931 Translated using Weblate (Italian) erciccione 2017-07-12 02:01:56 +00:00
  • e774e807c6 Translated using Weblate (German) Bamstam 2017-07-12 09:30:07 +00:00
  • f80629db44 Translated using Weblate (Arabic) Rami Taibah 2017-07-11 20:25:12 +00:00
  • 248944a300 Merge pull request #4560 from vector-im/luke/fix-ctrl-k Luke Barnard 2017-07-12 18:29:10 +01:00
  • 4cc8b5621d Merge pull request #1212 from matrix-org/luke/fix-ctrl-k Luke Barnard 2017-07-12 18:20:45 +01:00
  • 188a58e5c7 RateLimitedFunc -> rate_limited_func Luke Barnard 2017-07-12 18:18:13 +01:00
  • 33f330d434 Manual fixup for remaining q incantaions Richard van der Hoff 2017-07-12 15:15:59 +01:00
  • 0d7cc59d99 replace q method calls with bluebird ones Richard van der Hoff 2017-07-12 14:04:20 +01:00
  • 0254d2b3a2 q(...) -> Promise.resolve Richard van der Hoff 2017-07-12 14:02:00 +01:00