63695 Commits

Author SHA1 Message Date
Luke Barnard a3e02f470f Merge pull request #1156 from matrix-org/luke/fix-rte-debounce
Do debouncing for autocomplete in a sane way
2017-06-28 18:03:36 +01:00
Weblate af3374e210 Merge remote-tracking branch 'origin/develop' into develop 2017-06-28 16:38:56 +00:00
Luke Barnard 515f8de2c5 Merge pull request #4456 from vector-im/luke/css-rte-improvements
Add some style improvements to autocompletions
2017-06-28 17:38:53 +01:00
Luke Barnard de81188b13 Do debouncing for autocomplete in a sane way
- Fixes https://github.com/vector-im/riot-web/issues/4419
 - Fixes https://github.com/matrix-org/matrix-react-sdk/pull/518#issuecomment-285901871
 - Fixes https://github.com/matrix-org/matrix-react-sdk/pull/518#issuecomment-285910503
 - Fixes bug where the setting being used was the `autocompleteDelay` "syncedSetting" when it should have been the "localSetting" (so the setting being used was always the default)
2017-06-28 17:27:21 +01:00
Luke Barnard d5585e29b1 Merge pull request #1155 from matrix-org/luke/fix-rte-cursor-at-start-of-history
Fix issue where the cursor is put at the start of selected history item
2017-06-28 17:17:56 +01:00
Luke Barnard 2ea69624af Add some style improvements to autocompletions
- Fix https://github.com/vector-im/riot-web/issues/2230 by adding text-overflow: ellipsis to pill spans
 - Add padding to pills
 - Make sure to only apply horizontal margin of pill children at one level of the DOM tree
2017-06-28 16:36:32 +01:00
Weblate ed6ea13773 Merge remote-tracking branch 'origin/develop' into develop 2017-06-28 15:07:03 +00:00
strix aluco 7aff42ca9d Translated using Weblate (Ukrainian)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-06-28 15:07:03 +00:00
Carlos A. Carnero Delgado c320c64f27 Translated using Weblate (Spanish)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2017-06-28 15:07:03 +00:00
Andrey b55fa94db9 Translated using Weblate (Russian)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-06-28 15:07:03 +00:00
bldrzzy a5bc9a953c Translated using Weblate (Polish)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2017-06-28 15:07:03 +00:00
Rayeshman 34f52e8315 Translated using Weblate (Persian)
Currently translated at 98.0% (202 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fa/
2017-06-28 15:07:03 +00:00
IMIN 15dcc507d8 Translated using Weblate (Korean)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
2017-06-28 15:07:03 +00:00
Bamstam 962f081fcd Translated using Weblate (German)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-06-28 15:07:03 +00:00
Rayeshman 991789da72 Translated using Weblate (Esperanto)
Currently translated at 97.5% (201 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-06-28 15:07:03 +00:00
Jeff Huang d5c37ad8bc Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2017-06-28 15:07:02 +00:00
Tong Hui 4ee5431e07 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2017-06-28 15:07:02 +00:00
Richard Lewis 176f7f1515 Merge pull request #4447 from vector-im/rxl881/apps
Styling for apps / widgets
2017-06-28 16:06:57 +01:00
Richard Lewis d61525e420 Merge pull request #1152 from matrix-org/rxl881/apps
Add support for apps
2017-06-28 16:06:20 +01:00
Richard Lewis ea83d7eee2 Add missing import and fix apps reference. 2017-06-28 15:53:18 +01:00
Luke Barnard d696373bc2 Fix issue where the cursor is put at the start of selected history item
Leading to strange behaviour when selecting all and deleting it.

Fixes https://github.com/vector-im/riot-web/issues/4450
2017-06-28 15:29:07 +01:00
Luke Barnard bcb67bb273 Refactor shared code between onUpArrow and onDownArrow 2017-06-28 15:20:16 +01:00
Luke Barnard b3eee0c007 Merge pull request #1153 from matrix-org/luke/fix-rte-pre-extra-nls
Work around draft-js-export-html#62 by post-processing <br>\n
2017-06-28 15:13:39 +01:00
Luke Barnard 9b24f70d00 Update comment 2017-06-28 14:29:53 +01:00
Luke Barnard dc72dfae7a Merge pull request #1154 from matrix-org/luke/fix-rte-emoji-suggestions
Order emojis by standard ordering, add alternate shortnames
2017-06-28 14:28:11 +01:00
Luke Barnard eeb1c33868 Do the less invasive fix of replacing <br>\n with \n but only within <pre> 2017-06-28 14:27:24 +01:00
David Baker 105c54a1f1 CSS for Groups page 2017-06-28 13:57:20 +01:00
David Baker a2ff289ed8 Add 'groups' page 2017-06-28 13:56:18 +01:00
Richard Lewis 3a10cda2ca Add translations. 2017-06-28 13:55:18 +01:00
Richard Lewis f8c064ec25 REmove redundant call to _getApps 2017-06-28 13:45:29 +01:00
Luke Barnard 48eb6f251b Update comment 2017-06-28 13:44:44 +01:00
Luke Barnard 30f80b57f2 Instead of making this part of the build process, let the devs generate stripped-emoji.json
With the expectation that when the file needs to be regenerated to include other keys, the developer will run this script.
2017-06-28 13:28:48 +01:00
Richard Lewis e70eca0b0c Comment unused code and add TODO to handle scalar errors. 2017-06-28 12:58:09 +01:00
Richard Lewis d06d066050 Move getInitialState to top of file. 2017-06-28 12:54:47 +01:00
Richard Lewis e752cc8557 Use 'this' in preference to local reference. 2017-06-28 12:32:38 +01:00
Richard Lewis 481a66ef3c Fix header. 2017-06-28 12:26:05 +01:00
Richard Lewis 93bdfc99df i18n "Cancel" alt text. 2017-06-28 12:25:36 +01:00
Richard Lewis ddea1f35d2 Fix header. 2017-06-28 12:23:33 +01:00
Richard Lewis ff1636aaf5 Simplify boolean assignment. 2017-06-28 12:21:05 +01:00
Richard Lewis 06dafdc099 Remove unused state variable. 2017-06-28 12:20:07 +01:00
Richard Lewis bf2a4afce5 Change to allow setting of DEBUG at run-time. 2017-06-28 12:02:07 +01:00
Richard Lewis 2b1d15717a Add translation for Matrix Apps labs setting. 2017-06-28 12:00:22 +01:00
Luke Barnard 22ddbc63c3 Make lib dir prior to building
-p option will not error if lib already exists
2017-06-28 11:54:05 +01:00
Luke Barnard f73fa4b49b Move processing into renamed function processHtmlforSending
And explain why this fix is necessary
2017-06-28 11:49:50 +01:00
Luke Barnard 2b8da85726 Strip the emoji meta-data for the data we need
This is done at build time by parsing emojione/emoji.json, stripping it and then writing to ./lib/stripped-emoji.json.
2017-06-28 11:36:19 +01:00
Luke Barnard 8ca3b382ed Use emojione/emoji.json because we don't want two sets of emoji meta 2017-06-28 11:19:16 +01:00
Luke Barnard f4db765239 Fix indentation 2017-06-28 10:32:46 +01:00
Luke Barnard 907aaebe2f Remove redundant emoji data file 2017-06-28 10:31:59 +01:00
Luke Barnard 1523d304f2 WIP to prevent RTE from deleting current message input when up arrow pressed 2017-06-28 10:30:59 +01:00
Richard Lewis ad2517bd8b Uppercase the first letter of the app tile name. 2017-06-28 10:27:06 +01:00