element-web

mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 17:21:33 +03:00

Author	SHA1	Message	Date
lazz0	56219dd649	Translated using Weblate (Spanish) Currently translated at 74.9% (728 of 971 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/	2017-08-22 17:09:29 +00:00
Andrey	ce4abc6bcc	Translated using Weblate (Russian) Currently translated at 94.9% (922 of 971 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-08-22 17:09:29 +00:00
Krombel	ca0061f7a1	Translated using Weblate (German) Currently translated at 99.1% (963 of 971 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-08-22 17:09:28 +00:00
kaiyou	e427df4133	Translated using Weblate (French) Currently translated at 98.6% (958 of 971 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-08-22 17:09:28 +00:00
Weblate	729d3f7608	Merge remote-tracking branch 'origin/develop' into develop	2017-08-22 16:47:01 +00:00
strix aluco	eeadf63b6f	Translated using Weblate (Ukrainian) Currently translated at 20.7% (200 of 963 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/	2017-08-22 16:46:58 +00:00
lazz0	9f762db59f	Translated using Weblate (Spanish) Currently translated at 75.7% (729 of 963 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/	2017-08-22 16:46:58 +00:00
kaiyou	3c34c141c2	Translated using Weblate (French) Currently translated at 99.5% (959 of 963 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-08-22 16:46:58 +00:00
Jan Kudrik	630c405728	Translated using Weblate (Czech) Currently translated at 5.5% (53 of 963 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-08-22 16:46:57 +00:00
Richard Lewis	502a0480a0	Merge pull request #1327 from matrix-org/matthew/multiple-widgets Matthew/multiple widgets	2017-08-22 10:53:51 +01:00
David Baker	e72bdffd62	Remove unused import	2017-08-22 10:22:51 +01:00
David Baker	5f816666e1	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-22 10:08:02 +01:00
Richard Lewis	a69cc9169f	lint fix.	2017-08-22 10:04:57 +01:00
Richard Lewis	74ab7c9bb3	Fix encoding	2017-08-22 09:59:27 +01:00
Szimszon	5648a7488a	Translated using Weblate (Hungarian) Currently translated at 100.0% (963 of 963 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-08-21 19:55:31 +00:00
David Baker	ac64e9b705	Lint	2017-08-21 19:34:07 +01:00
David Baker	b898d15580	Specify default number of members to load	2017-08-21 19:30:28 +01:00
David Baker	e77ea352e4	Support full group membership cycle Apart from knocking, ie. Invite / accept / reject / leave	2017-08-21 19:18:32 +01:00
David Baker	a0fe3d1cb0	Merge pull request #1326 from matrix-org/rav/userpicker_proptypes Fix proptypes on UserPickerDialog	2017-08-21 16:43:15 +01:00
Richard van der Hoff	764d5891ad	Fix proptypes on UserPickerDialog ... so that it doesn't log an error	2017-08-21 16:30:49 +01:00
Richard Lewis	b7569a9831	Revert auxPanel changes (this should already have been fixed in a separate PR).	2017-08-21 15:29:11 +01:00
Robert Swain	385205471b	AppsDrawer: Remove unnecessary bind	2017-08-21 15:34:13 +02:00
Richard Lewis	c0f0425907	Merge pull request #1322 from matrix-org/rxl881/styling Position add app widget link	2017-08-21 14:03:27 +01:00
Richard Lewis	e8e3117099	Merge pull request #1323 from matrix-org/rxl881/beta Remove app tile beta tag.	2017-08-21 14:03:15 +01:00
Richard Lewis	866f6f1dd3	Add missing translation.	2017-08-21 12:11:21 +01:00
Richard Lewis	6c8391e3ea	Remove beta tag.	2017-08-21 11:39:06 +01:00
Richard Lewis	e93a1fac3d	Position add app widget link	2017-08-21 11:29:42 +01:00
Richard Lewis	38720e6216	Add internationlisation.	2017-08-21 10:05:16 +01:00
Robert Swain	2eac869e27	Merge branch 'develop' into rob/apps-not-e2ee	2017-08-21 10:30:38 +02:00
Robert Swain	70824960ee	AppPermission: Make strings translatable	2017-08-21 10:23:55 +02:00
Jean	c6a48cbda6	Translated using Weblate (French) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-08-19 11:03:09 +00:00
kaiyou	345903514a	Translated using Weblate (French) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-08-19 11:03:04 +00:00
Matthew Hodgson	d7f5295949	untested WIP for supporting multiple widgets properly	2017-08-18 18:40:00 +01:00
Richard Lewis	1862057695	Only render appTile body (including warnings) if drawer shown.	2017-08-18 18:33:56 +01:00
Richard Lewis	7395f96b77	Rearrange timeline update wording for better internationalisation. Fix widget name values.	2017-08-18 18:02:50 +01:00
Luke Barnard	b678c2cf0f	Don't bind Pill function, React does this for us	2017-08-18 17:15:27 +01:00
Krombel	45e7f1c401	Translated using Weblate (German) Currently translated at 100.0% (963 of 963 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-08-18 15:56:09 +00:00
Robert Swain	2e00968bcd	AppPermission: Note that apps are not E2E encrypted in E2E rooms	2017-08-18 17:44:33 +02:00
Bamstam	4a1106de2f	Translated using Weblate (German) Currently translated at 94.9% (914 of 963 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-08-18 15:32:53 +00:00
Luke Barnard	273abd9327	Merge pull request #1318 from matrix-org/luke/fix-widget-event-name Add a space between widget name and "widget" in widget event tiles	2017-08-18 16:09:20 +01:00
Richard Lewis	1c36e47403	Fix add widget link	2017-08-18 15:59:12 +01:00
Luke Barnard	7a277bff3a	Add a space between widget name and "widget" in widget event tiles	2017-08-18 15:45:02 +01:00
Richard Lewis	b7d46d91ed	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-18 15:35:01 +01:00
Luke Barnard	bf07333915	Merge pull request #1316 from matrix-org/luke/fix-app-name-case Don't apply case logic to app names	2017-08-18 15:08:40 +01:00
Luke Barnard	5e0a7212d9	Don't apply case logic to app names As they should have the Correct Case in integrations land now	2017-08-18 14:57:28 +01:00
Luke Barnard	36fffa1696	Stop integ manager opening on every room switch This was caused by a broken assumption which was AppsDrawer component mounting === clicking on apps draw toggle. This was introduced in matrix-org/matrix-react-sdk#1312. Known issue with this fix: deleting the last app doesn't hide the app drawer.	2017-08-18 14:48:58 +01:00
Richard Lewis	857a8c9519	Remove empty defaultProps.	2017-08-18 13:28:47 +01:00
Luke Barnard	3a7aa926c3	Merge pull request #1313 from matrix-org/luke/feature-app-tile-ux Add behaviour to toggle app draw on app tile header click	2017-08-18 13:08:57 +01:00
Luke Barnard	caff761df7	Merge pull request #1308 from matrix-org/t3chguy/mels_fix Change OOO so that MELS generation will continue over hidden events	2017-08-18 13:08:35 +01:00
Richard Lewis	84f5e5aad2	REmove unused onCancelClick	2017-08-18 12:21:48 +01:00
Luke Barnard	1a1a80b633	Merge branch 'develop' into luke/feature-app-tile-ux	2017-08-18 12:12:00 +01:00
Luke Barnard	cab3123bd8	Merge pull request #1312 from matrix-org/luke/feature-widget-timeline-events Implement TextualEvent tiles for im.vector.modular.widgets	2017-08-18 12:10:22 +01:00
Luke Barnard	1bba1f0fa6	Add comment	2017-08-18 12:04:34 +01:00
Luke Barnard	6c37a9a3af	Simplify getting of content, prev content for widget event	2017-08-18 12:03:29 +01:00
Michael Telatynski	615d96a065	catch hidden event being RM Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-18 11:53:52 +01:00
Richard Lewis	96900e76a0	Move error logging to where it is first caught.	2017-08-18 11:51:32 +01:00
Richard Lewis	4b5cdac032	Don't show widget security warning to the person who added it to the room.	2017-08-18 11:41:27 +01:00
David Baker	55998028b4	Show group invites in 'invites' section	2017-08-18 11:22:50 +01:00
Luke Barnard	57505c3a61	Add behaviour to toggle app draw on app tile header click	2017-08-18 10:56:35 +01:00
Luke Barnard	9382689675	Merge branch 'develop' into luke/feature-widget-timeline-events	2017-08-18 10:47:25 +01:00
Luke Barnard	20a0ec35af	Use short form to get event URL	2017-08-18 10:45:43 +01:00
Luke Barnard	acc54b97f1	Implement TextualEvent tiles for im.vector.modular.widgets E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget" The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised.	2017-08-18 10:35:33 +01:00
Krombel	42d9e3bc8a	remove unused strings introduced by string change in `bb084595`	2017-08-17 20:26:34 +02:00
Matthew Hodgson	bb0845954d	improve wording for directory listings	2017-08-17 19:10:45 +01:00
Matthew Hodgson	7c04a6671d	expand auxPanel when showing apps	2017-08-17 19:06:19 +01:00
Jan Kudrik	b0d088dfd0	Added translation using Weblate (Czech)	2017-08-17 17:11:38 +00:00
Richard Lewis	120a4f4f44	Check for valid roomId before renering manageIntegsButton.	2017-08-17 18:10:50 +01:00
Richard Lewis	0907fff080	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-17 17:47:46 +01:00
David Baker	91fe308f06	Merge pull request #1310 from matrix-org/t3chguy/hotfix1 hotfix bad fn signature regression	2017-08-17 17:31:55 +01:00
Michael Telatynski	766c188a1e	hotfix bad fn signature regression Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-17 17:15:18 +01:00
Michael Telatynski	bdb2d6b475	Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings # Conflicts: # src/components/structures/MatrixChat.js	2017-08-17 13:39:19 +01:00
Michael Telatynski	ca5e26744f	Make dialog more specific and hide options behind advanced spoiler	2017-08-17 13:33:07 +01:00
Richard Lewis	02edadbd15	Don't bubble cancel click to room header.	2017-08-17 12:21:44 +01:00
Richard Lewis	d1ee257b5a	Pass roomId rather than whole room object.	2017-08-17 12:15:01 +01:00
Richard Lewis	eb77dcc8e3	Camel case variable name	2017-08-17 11:24:25 +01:00
Richard Lewis	2c25639a61	Fix copyright header	2017-08-17 11:22:42 +01:00
Richard Lewis	9111cb421e	Merge pull request #1291 from matrix-org/rxl881/maxWidgets Show a dialog if the maximum number of widgets allowed has been reached.	2017-08-17 10:03:42 +01:00
MTRNord	59815359f8	Add misiing _tJsx import	2017-08-16 23:55:43 +02:00
MTRNord	fceccfc503	Add missing Robot string to translation	2017-08-16 23:54:36 +02:00
Luke Barnard	0935f26cf3	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-08-16 16:04:47 +01:00
Luke Barnard	0844beac79	Enable matrix-apps by default	2017-08-16 16:04:39 +01:00
David Baker	ddf1017799	Make group invites work	2017-08-16 14:58:30 +01:00
David Baker	252ab208e4	Merge pull request #1300 from matrix-org/dbkr/userpicker Refactor ChatInviteDialog to be UserPickerDialog	2017-08-16 14:29:07 +01:00
Michael Telatynski	14903274c0	Change OOO so that MELS generation will continue over hidden events this fixes the scenario of N Member events, then an invisible event e.g. (m.room.aliases) then more Member events. Pre hide-join-parts this is how it worked. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-16 13:20:32 +01:00
Luke Barnard	a379f04ca8	Merge pull request #1306 from matrix-org/luke/fix-te-i18n-variables Fix i18n variable names and `)s` syntax for TE.json (Tegulu)	2017-08-15 18:18:54 +01:00
Luke Barnard	eae5a45ec2	Fix variable case	2017-08-15 18:02:46 +01:00
Luke Barnard	063cbcfc73	Merge pull request #1303 from matrix-org/luke/fix-autocomplete-by-mxid Allow autocompletion when typing user IDs	2017-08-15 17:32:03 +01:00
Luke Barnard	036fa0e944	Merge pull request #1305 from matrix-org/t3chguy/fix_async_modal fix async modal create fn signature	2017-08-15 17:31:45 +01:00
Luke Barnard	9818007022	Fix i18n variable names and `)s` syntax for TE.json (Tegulu)	2017-08-15 17:29:55 +01:00
Michael Telatynski	72a412589d	Fix vector-im/riot-web#4799 regression by fixing fn signature Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-15 15:52:38 +01:00
Luke Barnard	454a848e47	Remove erroneous line	2017-08-15 15:10:23 +01:00
Luke Barnard	b40cc111bd	Remove incidental diff syntax	2017-08-15 15:03:25 +01:00
Weblate	d443368aa3	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop Conflicts: src/i18n/strings/en_EN.json src/i18n/strings/fr.json src/i18n/strings/ru.json	2017-08-15 14:00:35 +00:00
strix aluco	97ee9d72db	Translated using Weblate (Ukrainian) Currently translated at 19.1% (175 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/	2017-08-15 13:39:11 +00:00
Pitchaya Boonsarngsuk	df898e1c45	Translated using Weblate (Thai) Currently translated at 70.4% (645 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/	2017-08-15 13:39:10 +00:00
Sri Lakshmi	5112134345	Translated using Weblate (Telugu) Currently translated at 36.7% (337 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/	2017-08-15 13:39:10 +00:00
Max Sandholm	29b5a03e02	Translated using Weblate (Swedish) Currently translated at 56.8% (521 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/	2017-08-15 13:39:10 +00:00
Simó Albert i Beltran	4da6c811e9	Translated using Weblate (Spanish) Currently translated at 69.9% (641 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/	2017-08-15 13:39:10 +00:00
Alexey Murz Korepov	7bc754618e	Translated using Weblate (Russian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-08-15 13:39:10 +00:00
daniel tygel	2f373de574	Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.7% (914 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/	2017-08-15 13:39:10 +00:00
Tomasz Kontusz	435028a68b	Translated using Weblate (Polish) Currently translated at 30.5% (280 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/	2017-08-15 13:39:10 +00:00
test9753	3e765d52bc	Translated using Weblate (Malayalam) Currently translated at 4.1% (38 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ml/	2017-08-15 13:39:10 +00:00
Lauris Mierkalns	430389309d	Translated using Weblate (Latvian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/	2017-08-15 13:39:10 +00:00
yuurii	535b16ac3f	Translated using Weblate (Japanese) Currently translated at 20.8% (191 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/	2017-08-15 13:39:10 +00:00
random	e7ccd6792c	Translated using Weblate (Italian) Currently translated at 19.2% (176 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/	2017-08-15 13:39:10 +00:00
Oon Arfiandwi	2c3484bfe6	Translated using Weblate (Indonesian) Currently translated at 25.3% (232 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/id/	2017-08-15 13:39:10 +00:00
Kevin Németh	013fa108b5	Translated using Weblate (Hungarian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-08-15 13:39:10 +00:00
Bamstam	3578234689	Translated using Weblate (German) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-08-15 13:39:10 +00:00
Brendan Abolivier	b77aa5b2a8	Translated using Weblate (French) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-08-15 13:39:10 +00:00
Ross Schulman	b3989bb01a	Translated using Weblate (Esperanto) Currently translated at 1.4% (13 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/	2017-08-15 13:39:10 +00:00
Andrey	c332a26322	Translated using Weblate (English) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_EN/	2017-08-15 13:39:09 +00:00
Nathan van Beelen	bd2fd07959	Translated using Weblate (Dutch) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/	2017-08-15 13:39:09 +00:00
Jeff Huang	7d7afeb276	Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/	2017-08-15 13:39:09 +00:00
Tong Hui	9150b687eb	Translated using Weblate (Chinese (Simplified)) Currently translated at 40.6% (372 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/	2017-08-15 13:39:09 +00:00
Osoitz	cc6af53db8	Translated using Weblate (Basque) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/	2017-08-15 13:39:09 +00:00
Rami Taibah	14c474c6ef	Translated using Weblate (Arabic) Currently translated at 1.2% (11 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ar/	2017-08-15 13:39:09 +00:00
David Baker	e1ddd3781d	Merge branch 'dbkr/userpicker' into dbkr/group_userlist	2017-08-15 14:10:45 +01:00
Luke Barnard	5b1467a4c9	Allow autocompletion when typing user IDs Because we need to support tab completing `"@some_user"` if `@some_user` has a display name that is totally different and will therefore not match what the user typed in. This does have the disadvantage of a display name appearing (the pill) that isn't at all what the user typed in, but the autocomplete box and the tooltip should give enough information to let the user know what's going on. (e.g. typing `@kyrtab` and getting `Remmy`). This _does_ run contrary to vector-im/riot-web#4495 related to vector-im/riot-web#4794 cc @lampholder	2017-08-15 14:08:26 +01:00
David Baker	753ea38654	Add UserAddress	2017-08-15 14:01:50 +01:00
David Baker	0df8a63847	de-lint Invite.js	2017-08-15 13:50:15 +01:00
David Baker	81273ec855	Move non-invite specific stuff to UserAddress	2017-08-15 13:42:23 +01:00
David Baker	bbcf7e1d9b	s/inviteList/userList/	2017-08-15 13:30:13 +01:00
David Baker	a15c2100d1	Sort out right panel callapsing on GroupView	2017-08-15 13:12:39 +01:00
Luke Barnard	472b5b5350	Merge pull request #1299 from matrix-org/luke/fix-text-offsets-to-selection-state Fix bugs in textOffsetsToSelectionState	2017-08-15 11:37:35 +01:00
David Baker	fa660c8211	PR feedback	2017-08-15 10:57:24 +01:00
David Baker	64f352dda7	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-15 10:49:07 +01:00
Luke Barnard	65dc9fda6e	Alter comments	2017-08-15 09:25:23 +01:00
Luke Barnard	5f00bbbff6	Add comments	2017-08-15 09:22:50 +01:00
Luke Barnard	004cc42cfc	Merge pull request #1298 from matrix-org/luke/store-history-as-raw-content Store history as raw content	2017-08-15 09:18:22 +01:00
Luke Barnard	6baca05968	Merge pull request #1297 from matrix-org/luke/fix-user-pill-onclick Add onClick to user pills	2017-08-15 09:15:50 +01:00
David Baker	b7b449434d	Lint	2017-08-15 09:10:13 +01:00
David Baker	d1c54e1224	Switch to prop-types	2017-08-15 08:58:08 +01:00
David Baker	1b66e88b6e	ChatInviteDialog -> UserPickerDialog pt 2 The other changes I forgot to add	2017-08-14 17:43:00 +01:00
David Baker	447aa1e5a0	Refactor ChatInviteDialog to be UserPickerDialog Now it's just a means of choosing users and all the actual inviting functionality is moved out to Invite.js. This will allow us to reuse it for inviting to groups. Adds the ability to restrict what types of addresses may be chosen, although this isn;t used yet, it will be necessary for groups because groups don't support 3pid invites.	2017-08-14 17:38:59 +01:00
Luke Barnard	844ca249d0	Fix bugs in textOffsetsToSelectionState This just had some thinkos in it. Namely the conditionals were slightly wrong and this lead to negative offset selection state being returned, causing vector-im/riot-web#4792 fixes vector-im/riot-web#4792	2017-08-14 17:31:16 +01:00
Luke Barnard	ecef9cf22f	Use plaintext when loading a markdown history item into RT mode	2017-08-14 16:48:29 +01:00
Luke Barnard	6b1b643d41	Merge branch 'develop' into luke/store-history-as-raw-content	2017-08-14 16:42:22 +01:00
Luke Barnard	7d10a7556b	Merge pull request #1295 from matrix-org/luke/fix-emoji-picker-gone preventDefault when moving autocomplete selection with vertical arrow	2017-08-14 16:37:32 +01:00
Luke Barnard	5eff2a3df2	Merge branch 'develop' into luke/fix-user-pill-onclick	2017-08-14 16:32:01 +01:00
Luke Barnard	e48c4911b8	Merge pull request #1294 from matrix-org/revert-1290-luke/fix-user-url-no-middle-panel Revert "At /user, view member of current room"	2017-08-14 16:31:24 +01:00
Luke Barnard	0079e70006	Display RM when it = a standalone member event Standalone = not next to any member events in the timeline. fixes vector-im/riot-web#4694	2017-08-14 15:40:49 +01:00
Luke Barnard	9742962d61	preventDefault when moving autocomplete selection with vertical arrow Otherwise the composer selection updates, in turn hiding the autocomplete box - fixes vector-im/riot-web#4790	2017-08-14 15:16:13 +01:00
Luke Barnard	867e83edff	Fix log to include some useful info	2017-08-14 14:47:26 +01:00
Luke Barnard	bb229d33a4	Add onClick to user pills instead of using the converted matrix.to href. This is undesirable and a better solution would be to fix routing in Riot in general and then change user pills to do something like `/room/../member/@userId`.	2017-08-14 14:44:08 +01:00
Luke Barnard	2844b574d5	Re-add useful comment	2017-08-14 14:41:03 +01:00
Luke Barnard	b59de7964c	Wait for first sync before dispatching view_user on /user the RightPanel will be mounted once we're done doing the first sync, so wait until then and then dispatch a view_user. This is not very nice but it's what we do for view_room.	2017-08-14 14:37:49 +01:00
Luke Barnard	d9e8292a5e	Revert "At /user, view member of current room"	2017-08-14 14:06:54 +01:00
Luke Barnard	3d5d7fa9c8	Lint	2017-08-14 13:59:12 +01:00
Luke Barnard	c97ae5c2e1	Override matrix-apps to be disabled - ignores localStorage setting - hides feature from labs section in user settings	2017-08-14 12:29:42 +01:00
Luke Barnard	cbd8018ac8	Support semi-perma-disabling of lab features Adding `override: true` will remove the feature from the labs section, and force Riot to always use the default value (i.e. ignoring localStorage). This is useful removing features entirely when they might be deliberately not working but we still want to do a release.	2017-08-14 12:26:31 +01:00
Andrey	ab7aeccd35	Translated using Weblate (Russian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-08-13 18:07:28 +00:00
IMIN	d4a5bd86e6	Translated using Weblate (Korean) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/	2017-08-13 04:05:38 +00:00
IMIN	0e2d5a798f	Translated using Weblate (Korean) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/	2017-08-13 03:59:17 +00:00
MTRNord	4a1ba01f44	fix deprecation warning	2017-08-13 00:56:37 +00:00
kaiyou	018c8721f4	Translated using Weblate (French) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-08-11 21:11:46 +00:00
ErCiccione Calcifer	305adf8b62	Translated using Weblate (Italian) Currently translated at 19.2% (176 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/	2017-08-11 13:02:45 +00:00
David Baker	02217c8bd2	Merge pull request #1290 from matrix-org/luke/fix-user-url-no-middle-panel At /user, view member of current room	2017-08-11 10:49:22 +01:00
Szimszon	8b4e00330a	Translated using Weblate (Hungarian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-08-11 09:44:03 +00:00
Richard Lewis	454ec40b00	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-11 10:35:20 +01:00
Richard Lewis	0323151bee	Show a dialog if the maximum number of widgets allowed has been reached.	2017-08-10 23:53:43 +01:00
Krombel	975aa0f08a	Added translation using Weblate (Indonesian)	2017-08-10 22:24:12 +00:00
Michael Telatynski	b75ae63956	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/devtools	2017-08-10 16:10:20 +01:00
Luke Barnard	12966d06cd	Merge pull request #1255 from matrix-org/t3chguy/i18n_analytics un-i18n Modal Analytics	2017-08-10 15:35:46 +01:00
Luke Barnard	d3ba1f40dc	Merge pull request #1272 from matrix-org/t3chguy/hide_other_events allow hiding of avatar/display name changes	2017-08-10 15:35:11 +01:00
Luke Barnard	89254e77f4	When no member, use `null` `roomId`	2017-08-10 15:23:14 +01:00
Michael Telatynski	5450d6b9ca	remove redundant check and add comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 15:22:53 +01:00
Michael Telatynski	41843f021d	don't track two more potential risks Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 15:21:01 +01:00
Michael Telatynski	56ea528f43	don't track error messages .2 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 15:17:52 +01:00
Michael Telatynski	625ca96d86	add comment about why state key must be not undefined Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 14:01:24 +01:00
Michael Telatynski	a6064c53d3	export shouldHideEvent fn named Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 14:00:26 +01:00
Michael Telatynski	ab3abd2f7f	fix string casing Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:59:55 +01:00
Michael Telatynski	1603360c13	s/Membership/Member/ Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:58:19 +01:00
Michael Telatynski	b19c1010aa	Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/Analytics.js	2017-08-10 13:54:55 +01:00
Michael Telatynski	67f9c3774d	make string more human-friendly Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:51:47 +01:00
Michael Telatynski	24599ace32	don't track error messages Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:49:11 +01:00
Marcel	60c1ba4f4d	Add LanguageDropdown to LoginPage (#1284 )	2017-08-10 13:29:10 +01:00
Luke Barnard	07633fe67f	At /user, view member of current room With the fallback of existing behaviour, which is UserView (no middle panel and no avatar, display name). To improve, MemberInfo should probably track the current roomId and userId and then update the view asynchronously by re-fetching the member object when either roomId or userId change. Also, it should be hitting the profile API to get the user's avatar if a room hasn't been specified.	2017-08-10 13:12:50 +01:00
Luke Barnard	b2fd4be166	Merge pull request #1289 from matrix-org/luke/fix-quote-innerText Quote by taking the innerText of eventTiles	2017-08-10 10:35:49 +01:00
Luke Barnard	678c472b75	Quote by taking the innerText of eventTiles because using `body` gives inconsistent results - sometimes it will contain markdown and sometimes not, and this may not correspond with the `formatted_body`. TODO: Do quoting proper - using `in_response_to`.	2017-08-10 10:14:14 +01:00
Luke Barnard	390e77ee22	Merge pull request #1288 from matrix-org/luke/track-richtext-mode Track whether the user has richtext mode enabled	2017-08-10 09:31:09 +01:00
Luke Barnard	fc6977e68d	Track RT mode once we've retrieved the setting from account data	2017-08-09 19:00:38 +01:00
Luke Barnard	e121440d05	Track whether the user has richtext mode enabled	2017-08-09 18:39:06 +01:00
David Baker	f4092cc9b4	Merge pull request #1287 from matrix-org/luke/fix-hide-autocomp-on-selection-change Hide autocomplete when RTE selection state (cursor) changes	2017-08-09 18:21:25 +01:00
David Baker	4daf9064d9	Convert to API objects & remove redundant power label	2017-08-09 18:15:31 +01:00
Luke Barnard	794bf820cc	Merge pull request #1259 from matrix-org/t3chguy/fix-select-mxid-dialog Fix Set MXID Dialog woes	2017-08-09 17:53:50 +01:00
Luke Barnard	2d47d3d2c3	Hide autocomplete when RTE selection state (cursor) changes	2017-08-09 17:36:35 +01:00
Michael Telatynski	579090a4e3	add comment	2017-08-09 16:37:38 +01:00
Richard Lewis	185379b037	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-09 14:07:45 +01:00
David Baker	c1546ceb59	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-09 13:46:15 +01:00
Richard Lewis	4bc25f12cb	Move manage integrations button in to stand-alone component	2017-08-09 11:44:24 +01:00
Luke Barnard	610b2a3a42	For mentions, always use rawDisplayName and remove (IRC)	2017-08-09 10:40:06 +01:00
Richard van der Hoff	38114711fd	Make MatrixChat do fewer render cycles during mount This is mostly with the intent of making the login tests more reliable, but it seems generally worthwhile: * keep screenAfterLogin in the object props rather than `state` so that we can clear it without triggering a rerender * also move our record of the window width to the object props, and call `handleResize` from componentWillMount rather than componentDidMount so that we don't trigger a rerender by updating `state.width` * Remove update of unused `loading` state	2017-08-08 22:31:40 +01:00
David Baker	8426ada24c	Merge pull request #1282 from matrix-org/rav/show_unencrypted_messages_as_unencrypted Show unencrypted messages as unencrypted	2017-08-08 18:11:56 +01:00
Richard van der Hoff	da85cb9f45	Show unencrypted messages as unencrypted Previously, we were special-casing outgoing messages such that they were shown as encrypted even when encryption had failed for some reason. There's no need for this: outgoing messages have a working isEncrypted() method which we can use to show whether the event has been encrypted yet. Arguably we could do better than an open padlock for events in the 'encrypting' send state, but I'm not really sure what.	2017-08-08 17:49:41 +01:00
David Baker	34adda590b	Merge pull request #1280 from matrix-org/luke/fix-rte-prevent-completion-pills-in-commands Disable autocompletions for users and rooms when entering a command	2017-08-08 17:48:56 +01:00
David Baker	b76b6791b2	Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions Always use message `body` when quoting	2017-08-08 17:47:25 +01:00
Richard Lewis	9f8e8ae1fd	Split timeline updates in to different PR.	2017-08-08 17:34:54 +01:00
Luke Barnard	cb8a66b5a1	When `hide`ing autocomplete, also remove completion state	2017-08-08 17:25:11 +01:00
Luke Barnard	a72f38799f	Disable autocompletions for users and rooms when entering a command This only affects commands that take a room alias or user ID as an argument. (Leaving commands such as `/me` unaffected)	2017-08-08 15:58:15 +01:00
Luke Barnard	503fa6a7b3	Always use message `body` when quoting (not formatted_body) This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756	2017-08-08 14:59:56 +01:00
David Baker	ca2273519d	Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting Add optional setting for hiding avatars in <Pill>s	2017-08-08 14:01:34 +01:00
Luke Barnard	bef6726290	Lint	2017-08-08 13:42:51 +01:00
Luke Barnard	91a1cc4431	Mandate ctrl/meta ONLY for a subset of key bindings Because by default dratf-js doesn't check that other modifiers are _not_ pressed.	2017-08-08 13:36:43 +01:00
Luke Barnard	b08d32371d	Add optional setting for hiding avatars in <Pill>s As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445	2017-08-08 11:13:29 +01:00
David Baker	3639fc0c3c	Merge pull request #1276 from matrix-org/luke/fix-rte-completion-raw-disp-name Use the rawDisplayName for the user provider completion	2017-08-08 10:38:24 +01:00
Luke Barnard	1743c047bd	Use the rawDisplayName for the user provider completion to make sure that the length of text in the decoration (See <Pill>) is equal to the length of text in the completion (underlying text range that the Entity covers).	2017-08-08 10:28:11 +01:00
Luke Barnard	7018deee44	Fix ctrl+a, backspace toggling block format Now it will delete the selected range (and not toggle the block format). Fixes vector-im/riot-web#4753	2017-08-07 17:16:42 +01:00
Luke Barnard	641fda0162	Adjust comment	2017-08-07 16:29:22 +01:00
Luke Barnard	d9d8f2055f	Allow default for ctrl+shift+b, ctrl+shift+u in RTE fixes vector-im/riot-web#4750	2017-08-07 16:23:37 +01:00
David Baker	4aff43afda	Forgot to commit this file	2017-08-07 10:24:51 +01:00
Richard Lewis	18ae5fd129	Send messages on widget addition and deletion	2017-08-06 11:01:14 +01:00
Richard Lewis	308d932b2f	CancelClick prop.	2017-08-06 10:29:43 +01:00
Richard Lewis	a22e768343	Move room settings button to RoomHeader	2017-08-06 10:01:48 +01:00
Michael Telatynski	c4803c6d89	suppressOnHover for member entity tiles which have no onClick Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-05 13:01:19 +01:00
Richard Lewis	1973b2bbe7	Switch app drawer icons	2017-08-05 00:00:19 +01:00
Michael Telatynski	ffdffb643d	allow hiding of avatar/display name changes	2017-08-04 17:22:01 +01:00
David Baker	234a88c098	WIP group member list/tiles	2017-08-04 15:00:34 +01:00
Luke Barnard	ee18ddb700	MD-escape URLs/alises/user IDs prior to parsing markdown So that MD characters in them do not result in formatting being applied. Fixes https://github.com/vector-im/riot-web/issues/3428 Fixes https://github.com/vector-im/riot-web/issues/4674	2017-08-04 10:02:22 +01:00
Luke Barnard	a27eefd893	Fix a couple of more errors due to API changes	2017-08-03 15:20:44 +01:00
Luke Barnard	901cbf495d	Update decorator strategy API in accordance with recent changes to 0.11.0 See `590cdc6c54`, which is a change to the API not mentioned in the migration to v0.10 notes https://draftjs.org/docs/v0-10-api-migration.html	2017-08-03 12:02:29 +01:00
Luke Barnard	1d1cd5f691	Reflect API change for decorator strategy	2017-08-03 11:36:07 +01:00
Luke Barnard	fb5dc295aa	Reflect API change for getting an Entity	2017-08-03 11:29:26 +01:00
Luke Barnard	124795006c	Reflect API change for creating an Entity	2017-08-03 11:18:56 +01:00
yuurii	4835123256	Added translation using Weblate (Japanese)	2017-08-03 09:15:56 +00:00
David Baker	fe19dbee02	Remove unused component	2017-08-03 09:26:41 +01:00
Osoitz	5872f2389f	Translated using Weblate (Basque) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/	2017-08-03 06:30:46 +00:00
Jeff Huang	da2b3c067b	Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/	2017-08-03 06:11:15 +00:00
Richard Lewis	5752345b80	Merge pull request #1263 from matrix-org/rxl881/warnings Display warning if widget is mixed content	2017-08-02 17:30:46 +01:00
Richard Lewis	7599bde1f6	Fix logging line length.	2017-08-02 17:05:46 +01:00
Luke Barnard	700dd51584	Merge pull request #1267 from matrix-org/luke/fix-complete-after-blocks Account for `\n` after each block	2017-08-02 16:41:47 +01:00
Kegan Dougal	c914f1607b	scalar-develop is a scalar URL	2017-08-02 14:35:14 +01:00
Michael Telatynski	6e39e72849	fix m.federate always being false because value is a string. Y HTML... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-02 14:00:24 +01:00
Michael Telatynski	e9afcec5b2	fix m.federate=false warning in room settings Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-02 13:42:24 +01:00
Michael Telatynski	4b4b730233	fix and i18n the impl Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-02 13:41:26 +01:00
Michael Telatynski	fd454b476a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings	2017-08-02 12:15:00 +01:00
Luke Barnard	1512aff326	Add comments	2017-08-02 11:06:02 +01:00
Luke Barnard	2c86086444	Account for `\n` after each block when converting from text offsets to selection state. fixes vector-im/riot-web#4728	2017-08-02 10:51:34 +01:00
Luke Barnard	72c1cf9288	When sorting completions, use matched string, not entire query Otherwise the results vary depending on where you start autocompleting in your message. We only care about the matched string.	2017-08-02 10:09:00 +01:00
Luke Barnard	dbade448c1	Don't try to match query against roomId We only care about aliases.	2017-08-02 09:40:00 +01:00
Luke Barnard	8053d2933a	Order room completions more intuitively by index of the query in displayedAlias and then length of displayedAlias. (So that aliases where the query appears earlier in the string appear first and if the query is in the same index for two aliases, the shorter one appears first).	2017-08-02 09:35:07 +01:00
Richard Lewis	48faf72fdc	Disable eslint rule	2017-08-01 21:00:18 +01:00
Richard Lewis	2ab6bc84a7	Improve clarity	2017-08-01 17:49:41 +01:00
Richard Lewis	f0224460d2	Fix comparison and handle case where app has permission to load but content is mixed protocol.	2017-08-01 17:48:02 +01:00
Richard Lewis	d29610bdd2	Fix boolean comparison.	2017-08-01 17:45:06 +01:00
Richard Lewis	f57b0d4cc7	Fix invalid translation	2017-08-01 17:43:38 +01:00
Luke Barnard	ff95542549	Adjust emoji sorting such that exact matches/prefixes appear first fixes https://github.com/vector-im/riot-web/issues/4704	2017-08-01 17:36:41 +01:00
Richard Lewis	bc4d979d1e	Display warning if widget is mixed content	2017-08-01 17:29:29 +01:00
Osoitz	240a3545d0	Translated using Weblate (Basque) Currently translated at 29.2% (268 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/	2017-08-01 16:11:16 +00:00
Osoitz	2a82201551	Translated using Weblate (Basque) Currently translated at 17.1% (157 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/	2017-08-01 16:06:46 +00:00
Luke Barnard	a40a86669a	Merge pull request #1260 from matrix-org/luke/fix-rte-pills-not-updating Use componentWillReceiveProps to update pill state when props change	2017-08-01 16:30:25 +01:00
Osoitz	435455c9f0	Added translation using Weblate (Basque)	2017-08-01 15:29:58 +00:00
Luke Barnard	630c2968eb	Use componentWillReceiveProps	2017-08-01 16:20:32 +01:00
Luke Barnard	71abd3aff8	Revert setting of `key`	2017-08-01 16:14:12 +01:00
Luke Barnard	7fcb8c5ff0	Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace Only auto-replace emoji following ^ or \s	2017-08-01 15:56:42 +01:00
Richard Lewis	546173d246	Fix scalar token	2017-08-01 15:53:42 +01:00
Luke Barnard	438b63bee2	Only auto-replace emoji following ^ or \s So as not to cause issues when typing e.g. `This is what was tested: ` (the "d:" used to be transformed into an emoji)	2017-08-01 14:26:30 +01:00
Luke Barnard	9e71ba26c4	Add `key` prop to RTE decorated entities (Pills and links) This will cause a re-render when the URL of the pill/link changes. fixes vector-im/riot-web#4718	2017-08-01 13:51:08 +01:00
Richard Lewis	abae43b65e	Merge pull request #1257 from matrix-org/rxl881/widgetPermissions Widget permissions	2017-08-01 12:13:09 +01:00
Richard Lewis	5f8e86197f	Check that wurl is scalar, before checking for curl	2017-08-01 12:00:03 +01:00
Richard Lewis	596efb6062	Fix missing comma	2017-08-01 11:42:50 +01:00
Richard Lewis	46755de962	Fix event type.	2017-08-01 11:41:41 +01:00
Richard Lewis	15f39040a0	Simplify canUserModifyWidgets API	2017-08-01 11:39:17 +01:00
Michael Telatynski	62af06104d	resolve -> reject because semantics.	2017-07-31 14:22:05 +01:00
Michael Telatynski	f310d4446c	i18n the title of the set mxid dialog	2017-07-31 13:31:07 +01:00
Michael Telatynski	25d1d21d93	copy logic from RegistrationForm to detect invalid localparts	2017-07-31 13:28:43 +01:00
Michael Telatynski	79b83e60ab	add /devtools command	2017-07-31 12:08:28 +01:00
Michael Telatynski	4bdaa15c47	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics	2017-07-28 21:01:59 +01:00
Richard Lewis	a310ff3bab	Add ToDo item.	2017-07-28 18:21:23 +01:00
Richard Lewis	6aa1d923ce	Add comment	2017-07-28 16:48:13 +01:00
Richard Lewis	9935dd0051	Add comment to explain "fullWidth" component porperty.	2017-07-28 16:46:21 +01:00
Richard Lewis	8529a21f5c	Translate "Allow"	2017-07-28 16:42:07 +01:00
Richard Lewis	700ef34e95	Translate warning	2017-07-28 16:39:18 +01:00
Richard Lewis	4308d2c635	Inline setState.	2017-07-28 16:36:06 +01:00
Richard Lewis	50ad80ad86	Use ES6 style import	2017-07-28 16:24:32 +01:00
Richard Lewis	2e6fb1f956	Fix license header	2017-07-28 16:23:49 +01:00
Richard Lewis	6238c1d704	Fix default prop initialisation	2017-07-28 16:23:38 +01:00
Richard Lewis	6f57fe96f2	Add JS doc to indicate that the function may throw an error.	2017-07-28 16:19:20 +01:00
Richard Lewis	a901ca5308	Remove invalid OM license header.	2017-07-28 16:17:18 +01:00
Luke Barnard	8a5f2bf2ca	Interpret a `split-block` as format toggle for an empty block (`split-block` is emitted when "return" is pressed) part of fixing https://github.com/vector-im/riot-web/issues/4580	2017-07-28 14:46:57 +01:00
Richard Lewis	aff1cd9469	Add allow-presentation permission to iframe sandbox permissions	2017-07-28 11:14:04 +01:00
Richard Lewis	11335b1488	Rename variable to curlBase, for clarity	2017-07-28 10:18:06 +01:00
Richard Lewis	e1d9301eb4	Strip query parameters from content URLs	2017-07-28 10:01:58 +01:00
Andrei Shevchuk	f4f85d053d	Translated using Weblate (Russian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-07-28 07:20:47 +00:00
Andrei Shevchuk	c0d312af10	Translated using Weblate (Russian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-07-28 03:16:55 +00:00
Andrey	9bbe3871e7	Translated using Weblate (Russian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-07-28 00:25:06 +00:00
Richard Lewis	d69c9a36b3	Factor out check permissions code.	2017-07-27 23:38:26 +01:00
Richard Lewis	20a1693c71	Only display add app link if user has permission to add widgets in the room.	2017-07-27 23:38:02 +01:00
Richard Lewis	ccf3c1de7a	Add widget utility class. Add static method to determine if user can modify widgets in the specified room.	2017-07-27 23:37:33 +01:00
Richard Lewis	5e23d676b4	Remove comments.	2017-07-27 23:05:43 +01:00
Richard Lewis	51d160e7d6	Hide edit button when user does not have permission to edit.	2017-07-27 20:18:31 +01:00
Richard Lewis	f7e9dd4118	Add edit translation	2017-07-27 19:56:28 +01:00
Luke Barnard	6cb8b12cda	Instead of inserting MD for completion, convert the Entity later This makes sure that the length of the range for a completed Entity = the length of the text in the decoration, which apparently draftjs assumes when calculating selection state offsets. Fixes https://github.com/vector-im/riot-web/issues/4666	2017-07-27 18:17:41 +01:00
Richard Lewis	ab7fcbb5e7	Add function to determine if a user can modify widgets and style UI components as a result.	2017-07-27 18:10:28 +01:00
Richard Lewis	27923e300c	Add JSX wrapper.	2017-07-27 17:47:04 +01:00
Richard Lewis	997c7493eb	Add translations for delete widget and revoke widget access.	2017-07-27 17:46:45 +01:00
Michael Telatynski	bf98c0da7c	un-i18n Modal Analytics Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-27 17:19:18 +01:00
Richard Lewis	9ee1f3962d	Set display URL from wurl if curl not specified.	2017-07-27 16:42:29 +01:00
Richard Lewis	8e4f1f0989	Add message spinner.	2017-07-27 16:41:52 +01:00
Richard Lewis	f2058e0a6c	Add message spinner component.	2017-07-27 16:41:20 +01:00
David Baker	92746f8cb5	Merge pull request #1254 from matrix-org/luke/fix-join-command Fix /join #alias command in markdown mode	2017-07-27 15:43:02 +01:00
Luke Barnard	5c7891a25b	Remove logs	2017-07-27 15:26:36 +01:00
Luke Barnard	e71df44fc9	Fix /join #alias command in markdown mode Tab-completing a room alias inserts a markdown link, which is now stripped before a command is parsed. We also strip the MD links when doing the autocompletion itself (getAutocompleteQuery). There is still an issue where `/invite` will not work at all with tab-completion - the text of a user Pill is not the userID but rather the display name, which cannot be used as an argument to the command.	2017-07-27 15:18:06 +01:00
Luke Barnard	dff79c4688	Only apply room pills to matrix.to room links, exclude event links This fixes https://github.com/vector-im/riot-web/issues/4680 and fixes https://github.com/vector-im/riot-web/issues/4670	2017-07-27 13:01:40 +01:00
Andrei Shevchuk	6e7adedf1e	Translated using Weblate (Russian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-07-27 11:33:52 +00:00
Luke Barnard	4d4078be7e	Remove disambiguation from pills	2017-07-27 10:54:23 +01:00
Luke Barnard	f19fade448	Strip " (IRC)" from display names inserted into the timeline	2017-07-27 10:50:41 +01:00
Javier Quevedo	35ce336c35	Translated using Weblate (Spanish) Currently translated at 69.2% (634 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/	2017-07-26 18:21:48 +00:00
Luke Barnard	c4f049effe	Merge pull request #1243 from matrix-org/t3chguy/hide-join-part-2 T3chguy/hide join part (attempt) 2	2017-07-26 17:15:43 +01:00
David Baker	9cb28ff33c	Merge pull request #1248 from matrix-org/luke/fix-rte-auto-scroll Scroll to the bottom of editor if on last line	2017-07-26 16:58:36 +01:00
Richard Lewis	9f52c13bea	Grant permission to load app widget.	2017-07-26 16:47:58 +01:00
Michael Telatynski	2348c24369	revert the rm-always-moves-down loop as thats done Server side...	2017-07-26 14:33:48 +01:00
Michael Telatynski	3b8c408482	update comment to make explain behaviour better	2017-07-26 13:37:33 +01:00
Michael Telatynski	3eb87e2aa3	change lastShownEventIndex -> lastShownEvent since some places do not have the same i reference (namely MELS generation) this way a member event at bottom of MELS (if is the last event in the timeline will have last set appropriately)	2017-07-26 12:17:05 +01:00
Michael Telatynski	762e6780d7	fix this hiding unbans as found by Luke's review	2017-07-26 11:51:41 +01:00
Michael Telatynski	f42ae1662b	change wording of comment as per Luke's review	2017-07-26 11:46:59 +01:00
Richard Lewis	76f4f88fcd	App tile permissions -- broken	2017-07-26 11:28:43 +01:00
David Baker	598411dd03	Add translation	2017-07-25 17:22:05 +01:00
David Baker	7469a9ae2a	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-07-25 17:20:16 +01:00
Luke Barnard	fc00eaf546	Merge branch 'develop' into luke/store-history-as-raw-content	2017-07-25 17:19:35 +01:00
Luke Barnard	1ef2a2bcf9	Merge pull request #1250 from matrix-org/dbkr/fix_truncatedlist_i18n Fix i18n on truncatedlist & friends to be sane	2017-07-25 16:17:44 +01:00
Luke Barnard	2138b4a705	Merge pull request #1249 from uhoreg/imgfix1 allow width, height, alt, title attributes in img	2017-07-25 16:09:01 +01:00
David Baker	fa7a9818c6	Fix i19n on truncatedlist & friends to be sane Use the proper counterpart tool for plurals rather than if > 1. Fix up all the translation files respectively.	2017-07-25 15:59:06 +01:00
David Baker	c2034d5335	Add user list to groups	2017-07-25 15:56:16 +01:00
Hubert Chathi	df71502dbb	allow width, height, alt, title attributes in img fixes vector-im/riot-web#4646 Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>	2017-07-25 10:43:40 -04:00
Luke Barnard	7e0fecbc8c	Scroll to the bottom of editor if on last line Make the MessageComposerInput scroll to the bottom if we are on the last line of the contents. fixes https://github.com/vector-im/riot-web/issues/4652	2017-07-25 15:22:10 +01:00
Luke Barnard	eccdceae33	Rename `props` to `entityProps` for clarity	2017-07-25 11:43:12 +01:00
Luke Barnard	143994e44f	Use `data-offset-key` in RTE decorators This makes sure the selection state is correct when moving the cursor through an entity in the composer but only in rich text mode. https://github.com/vector-im/riot-web/issues/4666 still persists despite this, probably because the text content inserted during a completion in markdown mode has a different length to the text node within the entity. fixes vector-im/riot-web#4654	2017-07-25 11:25:33 +01:00
Luke Barnard	b372e5d55d	Merge pull request #1246 from matrix-org/luke/feature-async-pills Get user pill profile remote data and show unrecognised rooms as links	2017-07-25 10:21:55 +01:00
Luke Barnard	76e281662b	Merge pull request #1229 from matrix-org/dbkr/groupview_edit UI for editing groups	2017-07-25 10:13:49 +01:00
Luke Barnard	11f3a1db72	Merge branch 'luke/feature-async-pills' of github.com:matrix-org/matrix-react-sdk into luke/feature-async-pills	2017-07-25 09:37:47 +01:00
Luke Barnard	ac597996e0	Remove outdated comment	2017-07-25 09:37:18 +01:00
Luke Barnard	026582bcf7	Add unmounted guard	2017-07-25 09:22:08 +01:00
Luke Barnard	5efd5bf927	done -> then, style	2017-07-25 09:20:14 +01:00
Luke Barnard	d13c4b510c	Merge branch 'develop' into luke/feature-async-pills	2017-07-24 17:39:35 +01:00
Luke Barnard	bcd1ab5cd4	Merge pull request #1245 from matrix-org/luke/feature-mentions-ambiguate Remove disambiguation from user mentions, add tooltip for mxid	2017-07-24 17:36:42 +01:00
Luke Barnard	61c16569cb	Get user pill profile remote data Instead of relying on the local avatar/displayname of a user, request the data from the server and update the pill if it shows up. This required a slight refactor which means we're not doing everything in `render` now. Also I noticed unknown rooms weren't being rendered _at all_! So now you get something that looks like a normal link but with the room alias/ID in it.	2017-07-24 17:18:29 +01:00
Luke Barnard	727b1ca545	Remove disambiguation from user mentions, add tooltip for mxid Also add a tooltip for room pills = room alias/ID Requires: https://github.com/matrix-org/matrix-js-sdk/pull/513	2017-07-24 15:08:22 +01:00
Luke Barnard	dc09ad8db4	Re-add NL	2017-07-24 14:50:44 +01:00
Luke Barnard	6945fa54ea	Reimplement so that only tab-completed mentions are stripped Instead of blindly stripping all MD mentions, only strip those that were tab-completed. We do this by adding the `isCompleted` flag to the Entity data.	2017-07-24 14:41:13 +01:00
Luke Barnard	397201a74d	Remove subjective comment	2017-07-24 09:41:46 +01:00
Glandos	b15f3c08ea	Translated using Weblate (French) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-07-22 14:12:05 +00:00
Michael Telatynski	8e66e64621	fix for loop - check happens before pre-inc so cause issues at end of TL Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 13:16:16 +01:00
Michael Telatynski	c9b547368b	add algo to ensure that RM always moves forwards this is needed so that if a client which does not hide any events sets and RM at bottom of timeline, then riot-web which hides events sets the RM it'd set it at X-N where X is bottom and N is the amount of hidden events at bottom of the timeline, this way now an RM will fall through to the hidden events below a seen event. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 13:10:57 +01:00
Michael Telatynski	b976649b5b	re-add i18n string Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 12:52:19 +01:00
Michael Telatynski	a4abd1baa7	fix comment and remove unused const Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 12:03:32 +01:00
Michael Telatynski	ae973e1e99	unrevert some more... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 11:37:21 +01:00
Lauris Mierkalns	3631870c96	Translated using Weblate (Latvian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/	2017-07-22 03:05:04 +00:00
Michael Telatynski	7e355f7cda	unrevert most of the logic. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 23:18:18 +01:00
Michael Telatynski	1fa4fe0b9a	remove comments/commented code Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 22:51:31 +01:00
Michael Telatynski	5808fce60e	fix logic ordering Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 22:45:19 +01:00
Michael Telatynski	17758cd1db	attempt to incorporate more code #2 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 20:43:03 +01:00
Michael Telatynski	e47e14ed19	attempt to incorporate more code #1 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 20:22:01 +01:00
Michael Telatynski	3859708114	re-add Unread shouldHideEvent code Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 19:51:13 +01:00
Michael Telatynski	8167c004a8	re-add core logic Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 19:38:01 +01:00
Michael Telatynski	928294eba3	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide-join-part-2	2017-07-21 19:23:42 +01:00
Luke Barnard	e315b30f6a	Merge branch 'develop' into luke/fix-rte-pt-md-mentions	2017-07-21 18:06:31 +01:00
Luke Barnard	eb0575d9c1	Merge pull request #1241 from matrix-org/luke/refactor-pills Factor out shared logic in two code-paths for pill rendering	2017-07-21 17:54:20 +01:00
Luke Barnard	feaafc7a1a	Remove logging	2017-07-21 17:18:48 +01:00
Luke Barnard	e8495f637f	Strip MD mentions from the `body` of sent messages Because previously we just sent the display name and MD links are not very readable.	2017-07-21 16:38:31 +01:00
David Baker	f9cff50ef5	_loadGroupFromServer doesn't return a promise	2017-07-21 14:41:29 +01:00
David Baker	d48924e768	Lint	2017-07-21 14:30:09 +01:00
David Baker	be7228996a	This should be null rather than false	2017-07-21 14:18:28 +01:00
David Baker	4eda2ab083	Swap classes instead of using 0 height elements	2017-07-21 14:13:57 +01:00
Luke Barnard	7db7192701	Factor out shared logic in two code-paths for pill rendering This isn't an entirely side-effect-free refactoring: - the text of the timeline pills is now either the room ID/alias or user ID/ display name of the linked resource (which means that until we do a roundtrip to get user displaynames, mentions for users not in the current room will have their user IDs shown instead of what was in the link body). - timeline links to rooms without avatars are now rendered as links - fixed issue that would throw an error whilst rendering (i.e. unusable client) a room link to a room that the client doesn't know about	2017-07-21 14:07:48 +01:00
David Baker	3c44af11f7	Revert changes to ChangeAvatar This component was basically adding nothing for group editing	2017-07-21 14:06:08 +01:00
David Baker	f2afd852d8	Make group editing work	2017-07-21 14:03:10 +01:00
Richard Lewis	b589fcc3b0	Merge pull request #1240 from matrix-org/rxl881/deleteWidgets Hide widget panel while it is being deleted.	2017-07-21 11:14:42 +01:00
David Baker	571fada77e	Make group profile editing mostly work apart from avatars	2017-07-21 11:12:15 +01:00
Alexandre Morignot	511ab7c9ea	Translated using Weblate (French) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-07-20 20:12:48 +00:00
Luke Barnard	bac22cfb7c	Re-add removal of (IRC) suffix	2017-07-20 18:04:12 +01:00
Luke Barnard	08cc0c421d	insert_displayname -> insert_mention	2017-07-20 18:02:54 +01:00
Luke Barnard	0cc890c020	WIP store history as raw content state Not sure this solves any problems because we still have to convert from md and back	2017-07-20 18:01:39 +01:00
Luke Barnard	6d7bff83ca	Update type Completion	2017-07-20 16:49:23 +01:00
Luke Barnard	0600c5b049	Pretend that insert_displayname is a completion on that user This has the advantage of us not reimplementing things and fixing the same bugs twice.	2017-07-20 16:46:53 +01:00
Luke Barnard	4bee9bd8c7	Merge branch 'develop' into luke/feature-rte-insert-pills-on-click-tl-profile	2017-07-20 15:48:38 +01:00
Luke Barnard	0419eff230	Insert pill onClick of timeline profile When clicking someone in the timeline, insert a user pill instead of the plaintext "displayname:"	2017-07-20 15:46:36 +01:00
Luke Barnard	26b16b076c	Merge pull request #1238 from matrix-org/luke/fix-rte-md-mentions Insert MD links when autocompleting in MD mode	2017-07-20 15:32:36 +01:00
Luke Barnard	e893f994e1	Default to first room alias and then roomID	2017-07-20 15:17:07 +01:00
Luke Barnard	84fe51a162	Insert MD links when autocompleting in MD mode These will appear decorated because they are inserted as entities. It was necessary to modify pills to have an explicit linkText that is derived from the `href` being pillified (and is thus no longer the inserted completion but rather the display name (or user ID) or room alias.	2017-07-20 15:09:59 +01:00
Richard Lewis	563f5f7bac	Merge pull request #1226 from matrix-org/rxl881/beta Show beta testing icon and help message for widgets tile.	2017-07-20 14:04:53 +01:00
David Baker	199b771051	Merge pull request #1237 from matrix-org/luke/fix-rte-colon-parity Implement old composer feature that inserts ': ' or ' '	2017-07-20 13:05:40 +01:00
Luke Barnard	0185119146	Merge pull request #1236 from matrix-org/luke/fix-rte-emoji-match-by-name Match emojis by long name	2017-07-20 11:53:41 +01:00
Luke Barnard	352f70f9ce	Implement old composer feature that inserts ': ' or ' ' after a user completion	2017-07-20 11:52:18 +01:00
Luke Barnard	b3df546cb9	Fix comment	2017-07-20 10:51:15 +01:00
LuPa	206c771eb1	Translated using Weblate (Spanish) Currently translated at 68.2% (625 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/	2017-07-20 09:15:25 +00:00
Luke Barnard	a7feb58b63	Match emojis by long name For example, searching for `:tong` will now match `:stuck_out_tongue` because the query `:tong` has all non-word characters removed, becoming `tong` and is then matched against the (long) names of emojis such as `smiling face with open mouth and tightly-closed eyes`.	2017-07-20 10:01:58 +01:00
Richard van der Hoff	0e8ad75248	Merge pull request #1233 from matrix-org/rav/async_crypto Prepare for asynchronous e2e APIs	2017-07-19 21:11:36 +01:00
Luke Barnard	2f293adad5	Fix userId undefined in pillifyLinks	2017-07-19 18:21:26 +01:00
Luke Barnard	ecaf6e5223	Merge pull request #1234 from matrix-org/luke/feature-mention-pill Add mx_UserPill_me class to user pills that match credentials.userId	2017-07-19 17:56:24 +01:00
Luke Barnard	61d5d078dd	Merge pull request #1235 from matrix-org/luke/fix-rte-inline-code-format Mimic ctrl+j of RT mode in MD mode	2017-07-19 17:44:56 +01:00
Luke Barnard	5d1b33d2a8	Merge branch 'develop' into luke/feature-mention-pill	2017-07-19 17:22:03 +01:00
Luke Barnard	3a53fabb87	Merge pull request #1228 from matrix-org/luke/feature-auto-complete-matrixto-pills Implement composer completion user/room pill insertion	2017-07-19 17:19:47 +01:00
Luke Barnard	29b6d70aff	Merge branch 'develop' into luke/fix-rte-inline-code-format	2017-07-19 17:19:25 +01:00
Luke Barnard	d179398cf2	Merge pull request #1227 from matrix-org/luke/feature-matrixto-timeline-pills Decorate matrix.to anchor tags as mx_UserPill and mx_RoomPill	2017-07-19 17:17:48 +01:00
Luke Barnard	75ca141cf9	Merge pull request #1232 from matrix-org/luke/fix-rte-backspace-unstyled-block Interpret backspace at start of style block as block style toggle	2017-07-19 17:16:34 +01:00
Richard van der Hoff	8d7ff127f1	Merge pull request #1231 from matrix-org/luke/fix-rte-duplicate-autocompletions Use _uniq instead of _sortedUniq for return unique matched results	2017-07-19 17:05:12 +01:00
Luke Barnard	c8722292e3	Don't truncate EmojiProvider completion pills	2017-07-19 16:20:57 +01:00
Luke Barnard	28c98d93d1	Mimic ctrl+j of RT mode in MD mode by inspecting whether multiple lines are selected or the selection is empty. If either of these are true, insert a code block surrounding the selection, otherwise insert single backticks around the selection for inline code formatting.	2017-07-19 16:13:47 +01:00
Luke Barnard	b131637a11	Add mx_UserPill_me class to user pills that match credentials.userId	2017-07-19 11:00:26 +01:00
Richard van der Hoff	4998d1b359	Prepare for asynchronous e2e APIs the js-sdk is making some of its APIs asynchronous, and adding an `initCrypto` method which you have to call. Particular methods we need to worry about are: * `getStoredDevice` * `getStoredDevicesForUser` * `getEventSenderDeviceInfo` * `isEventSenderVerified`	2017-07-18 23:47:36 +01:00
Luke Barnard	98ca937fef	Interpret backspace at start of style block as block style toggle Part of fixing https://github.com/vector-im/riot-web/issues/4580	2017-07-18 17:52:04 +01:00
Luke Barnard	b185f43d3d	Use _uniq instead of _sortedUniq for return unique matched results _sortedUniq claims to be like _uniq but optimised for sorted arrays - https://lodash.com/docs/4.17.4#sortedUniqBy. But in practice this isn't quite true, so stick with the unoptimised version.	2017-07-18 16:23:54 +01:00
David Baker	8a818d250f	Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit	2017-07-18 11:34:48 +01:00
David Baker	7cfef04c1f	Remove other promise notify	2017-07-18 11:27:21 +01:00
David Baker	b261c89a63	Fix inviting multiple people to a room Removes the promise notify as bluebird doesn't support it. It's also not used anywhere now. Fixes https://github.com/vector-im/riot-web/issues/4614	2017-07-18 11:11:42 +01:00
Luke Barnard	d207ee5244	Expand groups into variables with readable names	2017-07-17 19:31:36 +01:00
David Baker	859239f881	Lint / comment out line correctly	2017-07-17 18:13:20 +01:00
David Baker	7041106bf2	Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit	2017-07-17 17:23:02 +01:00
David Baker	6f65128928	Disable edit button again until we have an API to edit group profile info	2017-07-17 17:18:46 +01:00
David Baker	1cd79fc918	Rename group settings to 'Edit Group'	2017-07-17 17:17:18 +01:00
Luke Barnard	29757fcf11	Merge branch 'luke/feature-matrixto-timeline-pills' into pills	2017-07-17 16:43:46 +01:00
Luke Barnard	897ff05d87	Implement composer completion user/room pill insertion This modifies the composer completion such that completing a room or user will insert an IMMUTABLE matrix.to LINK Entity for the range that was replaced. Display names will not have a colon after their name anymore as it seemed strange that we would insert one after a pill.	2017-07-17 15:53:29 +01:00
Luke Barnard	b1e3dc406c	Decorate matrix.to anchor tags as mx_UserPill and mx_RoomPill Requires https://github.com/vector-im/riot-web/pull/4597 to look OK	2017-07-17 14:50:45 +01:00
David Baker	a32113ad97	Add onChange handlers & tabIndexes	2017-07-17 14:40:38 +01:00
Luke Barnard	31290f3377	Remove redundant, unused decorators from RTE These have since been replaced by decorators that operator whether in MD mode or otherwise. This might not be optimal because LINK entities do not appear in MD mode at all at the moment, but instead you see the ()[] md notation version.	2017-07-17 14:27:50 +01:00
Lauris Mierkalns	57be0cf23d	Added translation using Weblate (Latvian)	2017-07-17 03:12:22 +00:00
Richard Lewis	6aa0f68ee9	Show beta testing icon and help message for widgets tile.	2017-07-14 23:31:57 +01:00
Luke Barnard	ee5117525c	Merge pull request #1225 from matrix-org/luke/feature-rte-pills Decorate http://matrix.to links in the composer as pills	2017-07-14 17:47:16 +01:00
David Baker	f6f80bf9ce	Remove now unused 'edit' block And add some css classes	2017-07-14 17:22:17 +01:00
David Baker	3aed1a6293	Merge pull request #1224 from matrix-org/rav/upload_progress Fix file uploading	2017-07-14 17:18:48 +01:00
Luke Barnard	434660166c	Decorate http://matrix.to links in the composer as pills Any links in the composer that are recognised as matrix.to links will be decorated as `<span>`s with CSS classes (one of mx_UserPill or mx_RoomPill). This implementation has the nice bonus that switching to markdown (and back) will Just Work. This will have some CSS changes coming to better match the design.	2017-07-14 17:04:28 +01:00
Richard van der Hoff	ad085a6273	Fix file uploading File uploading no longer supports the .progress API; we now need to pass a callback to get updates on the upload.	2017-07-14 17:01:03 +01:00
Richard van der Hoff	2a52c902e2	Merge pull request #1223 from matrix-org/rav/roomsettings_promise_usage Fix RoomSettings save	2017-07-14 14:47:14 +01:00
Richard van der Hoff	9df1fb91ff	Fix RoomSettings save Looks like saving RoomSettings had been broken since `0d7cc59`. `isFulfilled` cannot be used as a static function.	2017-07-14 14:24:42 +01:00
Kegsay	5274cf59a0	Hook up the edit widget button (#1218 ) * Hook up the edit widget button * Review comments	2017-07-14 11:17:59 +01:00
Luke Barnard	1db2431c9f	Merge pull request #1222 from matrix-org/luke/fix-rte-allow-split-code-block Add code-block to the list of blocks where hitting return will split-…	2017-07-14 09:48:47 +01:00
Luke Barnard	219c00bbc3	Add code-block to the list of blocks where hitting return will split-block Hitting return in a code-block will now split the block into two code blocks. (Holding shift will still insert a soft newline into the current block). We still need to make it a bit more obvious that consecutive code-blocks are not contiguous - https://github.com/vector-im/riot-web/issues/4535	2017-07-13 18:42:37 +01:00
David Baker	381f685013	Start on editing groups	2017-07-13 18:41:51 +01:00
Luke Barnard	7945abe6b9	Merge pull request #1219 from matrix-org/luke/fix-autcompleter-promises Fix Autocompleter promises	2017-07-13 18:11:45 +01:00
Luke Barnard	dcc4db53f9	Async functions now return `bluebird` promises, remove redundant Promise.resolve	2017-07-13 17:51:14 +01:00
Luke Barnard	d97de4d576	Implement disabled-by-default setting for auto-replacement of plaintext emojis FTR a list of plaintexts and their unicode equivalents can be found here - https://github.com/vector-im/riot-web/issues/4554#issuecomment-314374303 Pressing space after a matching emoji will replace the plaintext emoji with the equivalent unicode emoji.	2017-07-13 17:37:43 +01:00
Luke Barnard	f78a49b3a9	Do `reflect` in the same `map`	2017-07-13 17:20:17 +01:00
Luke Barnard	c9f3a12693	Fix Autocompleter promises Use bluebird instead of the now removed "q" library. Also, make sure we timeout and then `reflect` to effectively do an `allSettled` that waits for all promises to either be resolved or rejected. Then we filter for those that are fulfilled and return the completions.	2017-07-13 16:51:14 +01:00
Luke Barnard	7fc10789fc	Merge pull request #1217 from matrix-org/luke/fix-rte-html-links Improve RTE HTML link handling	2017-07-13 13:57:58 +01:00
Luke Barnard	f1a4209d6b	Fix indentation	2017-07-13 13:47:08 +01:00
Luke Barnard	5826b6f22a	Instead of sending HTML for any Entity, only send HTML for Links Otherwise emoji messages are sent as HTML, needlessly	2017-07-13 13:41:17 +01:00
Luke Barnard	be045a6dc0	Interpret whitespace after entity as the end of the entity The easiest way to stop the user from inserting whitespace onto the end of an entity is to toggle the entity state of the whitespace that was just entered. This allows the user to continue drafting a message without editing the link content. This is for pasted `<a>` tags that have been copied from a website. We probably also want to be storing entities for substrings of content that are determined to be URLs.	2017-07-13 13:28:51 +01:00
Luke Barnard	4b96963408	Send HTML if there are any entities present in the composer This is so that pasted HTML links that are represented as entities are sent as HTML.	2017-07-13 13:27:49 +01:00
Luke Barnard	55e1202c09	Decorate pasted links so that they look like links By default, draftjs will represent pasted `<a>` tags as `LINK` entities, but it doesn't do any default decoration of these links. Add a decorator to do so. Most of this was taken from https://github.com/facebook/draft-js/blob/v0.8.1/examples/link/link.html (note the version, v0.8.1).	2017-07-13 13:26:13 +01:00
David Baker	2a68cce3d5	Merge pull request #1216 from matrix-org/dbkr/history_save_unload_nullcheck Prevent exception on page unload	2017-07-13 12:38:28 +01:00
Richard van der Hoff	086304532e	Merge pull request #1213 from matrix-org/rav/bluebird Switch matrix-react-sdk to bluebird	2017-07-13 12:06:11 +01:00
David Baker	917133219f	Remove sentHistory save altogether	2017-07-13 11:53:22 +01:00
Luke Barnard	ce0f9e8803	Merge pull request #1214 from matrix-org/luke/fix-rte-remove-old-disable-md-setting Remove `disableMarkdown` setting	2017-07-13 11:33:42 +01:00
Luke Barnard	4d844ebc34	Merge pull request #1215 from matrix-org/luke/remove-old-composer Remove MessageComposerInputOld	2017-07-13 11:33:23 +01:00
David Baker	1e80edb43c	Prevent exception on page unload Null check when saving sent history	2017-07-13 11:30:25 +01:00
Luke Barnard	04dd98e6e9	Remove references to tabComplete, which are now redundant (since the old composer has been removed)	2017-07-13 10:16:59 +01:00
Luke Barnard	0e12e384cb	Remove TabComplete-related files	2017-07-13 10:16:42 +01:00
Luke Barnard	441954c8c1	Remove i18n for "Unknown command"	2017-07-13 09:55:11 +01:00
Richard Lewis	9a1e7ad170	Hide widget panel while it is being deleted.	2017-07-13 00:27:03 +01:00
Luke Barnard	4cc8b5621d	Merge pull request #1212 from matrix-org/luke/fix-ctrl-k Enable ctrl+k room filter focus	2017-07-12 18:20:45 +01:00
Richard van der Hoff	33f330d434	Manual fixup for remaining q incantaions * don't try to use `finally` as a static method * work around absence of `allSettled`	2017-07-12 18:05:40 +01:00
Richard van der Hoff	0d7cc59d99	replace q method calls with bluebird ones ``` find src test -name '*.js' \| xargs perl -i -pe 's/q\.(all\|defer\|reject\|delay\|try\|isFulfilled)\(/Promise.$1(/' ```	2017-07-12 18:05:40 +01:00
Richard van der Hoff	0254d2b3a2	q(...) -> Promise.resolve ``` find src test -name '*.js' \| xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/' ```	2017-07-12 18:05:08 +01:00
Richard van der Hoff	a06bd84213	replace imports of `q` with bluebird update `package.json` ``` find src test -name '.js' \| xargs perl -i -pe 'if (/require$.[qQ].$/) { $_ = "import Promise from '\''bluebird'\'';\n"; }' find src test -name '.js' \| xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }' ```	2017-07-12 18:05:08 +01:00
Luke Barnard	6ff924fc0d	Remove MessageComposerInputOld	2017-07-12 18:03:13 +01:00
Alexey Murz Korepov	c668e754f1	Translated using Weblate (Russian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-07-12 16:59:58 +00:00
Luke Barnard	0585fa048f	Remove `disableMarkdown` setting This was used by the old composer to control whether to interpret text as markdown prior to sending. The new setting is `MessageComposerInput.isRichTextEnabled`.	2017-07-12 17:35:19 +01:00
Luke Barnard	6547a55852	Update to reflect previous implementation Which was originally `a74bbb424c`	2017-07-12 17:12:57 +01:00
Sri Lakshmi	9d56cbcf8f	Translated using Weblate (Telugu) Currently translated at 25.7% (236 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/	2017-07-12 14:43:13 +00:00
David Baker	a48c7d2364	Only allow http and https widget URLs	2017-07-12 14:16:47 +01:00
Luke Barnard	0dbd1d988e	Enable ctrl+k room filter focus By using the `focus_room_filter` dispatch	2017-07-12 13:51:55 +01:00
David Baker	918f5abe81	Lint correctly	2017-07-12 10:34:50 +01:00
David Baker	53316a76f4	Sandbox app iframes	2017-07-12 10:22:14 +01:00
Dreamwhite	a05dbb1994	Translated using Weblate (Italian) Currently translated at 1.0% (10 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/	2017-07-12 01:58:44 +00:00
Richard van der Hoff	7ae4e96e4d	Merge pull request #1207 from matrix-org/rav/fix_dispatcher_race Fix a race in session loading code	2017-07-11 23:21:33 +01:00
David Baker	569ea909c4	Merge pull request #1209 from matrix-org/luke/fix-emoji-support-zwj Update `unicodeToImage` to maintain compatibility with emojione	2017-07-11 18:38:54 +01:00
David Baker	eb4e4a66ff	Merge pull request #1206 from matrix-org/rav/login_unmounted_guard Give Login an unmounted guard	2017-07-11 18:37:50 +01:00
Luke Barnard	0df144cb62	Update `unicodeToImage` to maintain compatibility with emojione We recently updated our version of emojione but this update included the addition of emoji represented in unicode with ZWJ (Zero-Width-Joiners). These ZWJs are not present in the asset file names, so any emoji with ZWJ in them were just not found (404 on the web client). This updates `unicodeToImage` to be compatible with emojione 2.2.7 so that the correct filenames are used when converting from unicode to <img>.	2017-07-11 18:27:35 +01:00
Luke Barnard	3bab720a7b	Merge pull request #1208 from matrix-org/rav/timelinepanel_test_flakiness Fix a flaky test in the timelinepanel code	2017-07-11 18:10:55 +01:00
Richard van der Hoff	1139dd2be5	Fix a flaky test in the timelinepanel code Sometimes it was possible for there to be a scroll event before the initial pagination completed, which then upset the rest of the test. Just give it a few ms to sort itself out instead.	2017-07-11 17:34:46 +01:00
Richard van der Hoff	f5f1fe6ae6	Fix a race in session loading code it was possible for on_logging_in to get dispatched after on_logged_in, causing the app to wedge. Fix it by dispatching on_logging_in synchronously.	2017-07-11 17:09:06 +01:00
Richard van der Hoff	67372d4fed	Give Login an unmounted guard	2017-07-11 17:04:19 +01:00
Luke Barnard	af3b6484cd	Merge pull request #1196 from matrix-org/dbkr/groups_better_groupview Add more features to Group View	2017-07-11 17:03:47 +01:00
Kegsay	6369253142	Scalar messaging: Add can_send_event operation (#1204 ) This is mainly for use to pre-emptively show/hide buttons.	2017-07-11 15:20:33 +01:00
David Baker	ff3c21ef10	Lint, including putting key in right place	2017-07-11 15:16:58 +01:00
David Baker	4e49ebd6ce	Change incorrect refs to this.props	2017-07-11 14:31:07 +01:00
David Baker	8690ed2181	Make the category functions React components	2017-07-11 14:28:44 +01:00
Andrey	b830f82c65	Translated using Weblate (Russian) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-07-11 13:16:05 +00:00
David Baker	e242e5e714	Merge pull request #1205 from matrix-org/luke/feature-new-emojis Bump the dep on emojione to 2.2.7 to add 🦈 and others	2017-07-11 14:13:13 +01:00
Luke Barnard	d146246805	Move "regional" category to after "flags" Otherwise by default it appears first, pushing "people" further down the list Also, remove "unicode9" category ordering, as this category does not exist as part of emojione	2017-07-11 14:06:15 +01:00
Luke Barnard	4766447e15	Bump the dep on emojione to 2.2.7 to add 🦈 and others Also, re-run node scripts/emoji-data-strip.js to update emoji meta data in src/stripped-emoji.json	2017-07-11 13:48:15 +01:00
David Baker	222ca054c5	Use PropTypes.shape to define our required inputs	2017-07-11 13:41:00 +01:00
Kegsay	cf158530f5	Implement new widget API (#1201 ) * Implement new widget API This allows clients to see who provisioned which widgets. * Update to make state_key the wid * Update to latest API * Only show widgets which have required fields * Don't constantly show apps dialog * Fix example to include data key	2017-07-11 12:15:27 +01:00
David Baker	5c89d3303b	Merge pull request #1203 from matrix-org/luke/fix-rte-user-completion Fix bug where a received message would remove completions for users	2017-07-11 11:04:07 +01:00
David Baker	29990296d2	Lint	2017-07-11 11:02:23 +01:00
Luke Barnard	e18924c8fc	Fix bug where a received message would remove completions for users `Array.prototype.splice` will return the array of removed items, not a new array. The array operated on is actually modified in-place. This was causing a few weird things to happen: https://github.com/vector-im/riot-web/issues/4511 and https://github.com/vector-im/riot-web/issues/4533. This should fix both of them but it is concerning that doing the tab completion is required to reproduce. Let's just see how this goes before closing the issues. Thanks @turt2live for reproducing both bugs, giving enough information for a fix :)	2017-07-11 10:42:02 +01:00
David Baker	925d5bd480	Add featured users to Group View	2017-07-10 19:32:02 +01:00
Luke Barnard	dfa97e8452	Add comment	2017-07-10 17:48:01 +01:00
Luke Barnard	6877b99435	Strip `<img src="https?://..">`s when transforming `img`s instead of using `allowedSchemesByTag`	2017-07-10 17:44:49 +01:00
Luke Barnard	bb9080425a	Allow image tags with src attributes with schemes http[s] And transform `mxc:*` URLs to `https?://`	2017-07-10 16:27:23 +01:00
Travis Ralston	33e56de550	Translated using Weblate (English (United States)) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/	2017-07-10 15:05:54 +00:00
Luke Barnard	96f5f92c7f	Disallow data attribute, we don't need it currently	2017-07-10 15:44:46 +01:00
Luke Barnard	f9ee89b2f4	Merge branch 'develop' into matthew/whitelist-uri-schemes	2017-07-10 15:42:03 +01:00
David Baker	0e67a9158c	hide settings button until it's wired up	2017-07-10 15:32:57 +01:00
David Baker	048912a241	Remove commented ordering code No lomger needed now roosm come down in order	2017-07-10 15:17:58 +01:00
Luke Barnard	66525f6826	Null-guard RR logic	2017-07-10 15:07:22 +01:00
David Baker	ac4be03f7b	Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview	2017-07-10 14:51:13 +01:00
Luke Barnard	b104228a7b	Remove redundant functions, bindings, props	2017-07-10 14:27:41 +01:00
David Baker	49ca29e422	Lint	2017-07-10 14:07:16 +01:00
David Baker	696c72be2b	Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview	2017-07-10 14:03:30 +01:00
David Baker	0112afad3c	Merge pull request #1199 from matrix-org/luke/fix-rte-emoji-prefixes Only allow completion of emoji in certain circumstances	2017-07-10 14:02:01 +01:00
Luke Barnard	c9df079464	Merge pull request #1176 from matrix-org/luke/feature-enable-RTE Take RTE out of labs! 🎉	2017-07-10 13:56:00 +01:00
Luke Barnard	9643f0c00b	Merge pull request #1167 from matrix-org/dbkr/my_groups Implement 'Groups' page	2017-07-10 09:37:06 +01:00
Sri Lakshmi	20672dde03	Translated using Weblate (Telugu) Currently translated at 20.6% (189 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/	2017-07-10 07:04:18 +00:00
Carlos A. Carnero Delgado	d2ddb36203	Translated using Weblate (Spanish) Currently translated at 68.2% (625 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/	2017-07-10 04:16:05 +00:00
David Baker	86e717f30d	Fix indenting Also autocomplete delay was duplicated	2017-07-09 12:34:50 +01:00
Alexandre Morignot	997c1e269a	Translated using Weblate (French) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-07-08 16:38:21 +00:00
നിദര്‍ശ്	3d0c71b1a2	Translated using Weblate (Malayalam) Currently translated at 3.6% (33 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ml/	2017-07-08 02:49:38 +00:00
Nathan van Beelen	c7e818d1c5	Translated using Weblate (Dutch) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/	2017-07-07 20:09:49 +00:00
Kelvin	0061757c91	Translated using Weblate (Malayalam) Currently translated at 3.6% (33 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ml/	2017-07-07 19:27:59 +00:00
Luke Barnard	4218308bef	Merge pull request #1200 from matrix-org/luke/fix-invite-sync-type-error Possibly fix accepting invites	2017-07-07 20:03:26 +01:00
Luke Barnard	62ee0f4e02	Fix accepting invites Accepting an invite would cause a room to arrive via /sync only for it to throw an error in the auto complete code and cause the client to go wibbly (infinite spinner or preview bar). The logs that lead to the debugging of this are https://github.com/matrix-org/riot-web-rageshakes/issues/239 Hopefully the error being throw isn't totally unrelated but looking at the sync handling for inviteRooms in sync.js, new rooms are stored and _then_ the Room event is emitted. The Room event could trigger setUserListFromRoom, which is where the bug was. So the room should have been stored regardless of this bug and the client should have been recoverable by swapping away and viewing the room again.	2017-07-07 19:43:30 +01:00
Luke Barnard	9a272d4965	Only allow completion of emoji in certain circumstances Which are: - the emoji to complete is at the start of the query - there is a whitespace character before the emoji - there is an emoji before the emoji (so that several emoji can be input in-a-row) Fixes https://github.com/vector-im/riot-web/issues/4498 (although it seems to be fixed through some other fix)	2017-07-07 19:02:51 +01:00
David Baker	1e713557bb	PR feedback	2017-07-07 18:34:40 +01:00
Kegan Dougal	f2d243443b	Suppress more errors from spurious postMessage calls on the demo instance	2017-07-07 17:44:25 +01:00
zottel	ea68cca233	Translated using Weblate (German) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-07-07 16:30:08 +00:00
Luke Barnard	7a8f524f4a	Remove two possible sources for the "AutoComplete stays visible bug which is now https://github.com/vector-im/riot-web/issues/4537 <- there. This does two things: - Track which query was the most recent one requesting completion and only process completions for that one. (In this case the empty string "" doesn't have any completions but we still track it so that previous calls with non-empty queries would not race and cause completions to be shown when we actuall don't want any.) - Make the "do we want to show the AutoComplete box?" logic a bit more sane	2017-07-07 15:30:31 +01:00
Sri Lakshmi	82ee0d4106	Translated using Weblate (Telugu) Currently translated at 12.5% (115 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/	2017-07-07 14:02:54 +00:00
David Baker	681fd512d7	Lint	2017-07-07 13:46:05 +01:00
David Baker	c1833f9833	Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview	2017-07-07 13:44:35 +01:00
David Baker	c21f90338d	Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview	2017-07-07 12:02:15 +01:00
David Baker	bc8c2d442b	WithMatrixClient -> withMatrixClient because we're using it as a function rather than a React component	2017-07-07 11:34:20 +01:00
Richard Lewis	e970b68859	Merge pull request #1194 from matrix-org/rxl881/apps Use app ID for element key and pass screen parameter to scalar.	2017-07-07 11:28:39 +01:00
David Baker	fea0a941ce	Fix lint	2017-07-07 11:01:54 +01:00
David Baker	183f45bc1f	Fix lint errors	2017-07-07 10:41:59 +01:00
David Baker	45986306cc	Merge remote-tracking branch 'origin/develop' into dbkr/my_groups	2017-07-07 10:32:37 +01:00
David Baker	1deb406294	Fix race	2017-07-07 10:12:06 +01:00
Luke Barnard	32a01b54b8	Merge branch 'develop' into erikj/group_server	2017-07-07 10:08:49 +01:00
Richard Lewis	0a1647e5c6	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps	2017-07-07 09:48:24 +01:00
Bamstam	b414db06e0	Translated using Weblate (German) Currently translated at 100.0% (916 of 916 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-07-07 07:27:02 +00:00
Luke Barnard	7fdbec4046	Merge pull request #1195 from matrix-org/luke/fix-rte-emoji-suggestions2 Alter EMOJI_REGEX to include end of string ($)	2017-07-06 21:59:44 +01:00
David Baker	fa37d03db6	Improve the Group View page Show the rooms in the group in thir various categories, etc	2017-07-06 19:13:14 +01:00
Luke Barnard	0a4f8ffead	Alter EMOJI_REGEX to include end of string ($) Fixes https://github.com/vector-im/riot-web/issues/4529 because the match must include the remainder of the query.	2017-07-06 18:11:46 +01:00
David Baker	282b63d0cf	Merge pull request #1193 from matrix-org/luke/fix-create-room-preview Fix vector-im/riot-web#4526 by pretending to join when creating a room	2017-07-06 17:58:30 +01:00
Luke Barnard	a921059432	Fix vector-im/riot-web#4526 by pretending to join I thought about adding separate dispatches to prevent confusion but if anyone adds anything that listens to existing dispatches, they really ought to be grep-ing the world for said dispatch actions.	2017-07-06 17:40:27 +01:00
Richard Lewis	d091550ccb	Use app ID for element key and pass screen parameter to scalar.	2017-07-06 15:59:59 +01:00
Luke Barnard	6404f7603c	Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u Allow underline through MD and in RTE (MD) using <u> which works with CM	2017-07-06 14:08:01 +01:00
Luke Barnard	d9a67355d2	Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on Only insert HTML into the composer in RTE mode	2017-07-06 13:59:52 +01:00
Michael Telatynski	ff7ae5b995	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/markdown_allow_u	2017-07-06 13:56:20 +01:00
Michael Telatynski	fcd8321a63	Allow underline through MD and in RTE (MD) using <u> which works with CM Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-06 13:49:13 +01:00
Michael Telatynski	6149b37245	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-settings-unban-no-pl	2017-07-06 13:30:40 +01:00
Michael Telatynski	c6d9ec42a2	only show unban button in RoomSettings if user has sufficient PL to do so Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-06 12:51:55 +01:00
Luke Barnard	bdefb35c64	Only insert HTML into the composer in RTE mode If MD mode is enabled, paste the plaintext equivalent.	2017-07-06 11:52:02 +01:00
Luke Barnard	3e93930dcc	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-07-06 11:18:10 +01:00
Luke Barnard	6b6af3f148	Remove RTE content_state logging	2017-07-06 11:17:54 +01:00
Richard van der Hoff	c29863362f	Merge pull request #1189 from matrix-org/rav/fix_duplicate_preview_key Fix a React duplicate key error	2017-07-06 11:08:03 +01:00
Richard van der Hoff	4f8d9d869e	mention preserving ordering in comment	2017-07-06 10:47:15 +01:00
Kegan Dougal	42ba3ff410	Linting	2017-07-06 10:44:32 +01:00
Richard van der Hoff	6a2d6b2e6e	Fix a React duplicate key error If a single message contains the same link twice, we get an error from React about the clashing keys. De-dup the links to keep it quiet.	2017-07-06 10:02:25 +01:00
Kegsay	e0e321783b	Append the scalar_token to the widget URL if the widget URL is a scalar URL (#1182 )	2017-07-06 09:28:48 +01:00

... 9 10 11 12 13 ...

5691 commits