14143 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bruno Windels	0a404d5adc	Merge pull request #2702 from matrix-org/nadonomy/room-list ... Normalise room list font weight, bold unreads	2019-02-26 10:43:21 +01:00
Travis Ralston	18b27a72d8	Merge pull request #2692 from matrix-org/t3chguy/room_context_menu_settings ... Settings button in Room Context Menu	2019-02-25 20:28:38 -07:00
Travis Ralston	28805da9f6	Merge pull request #2689 from matrix-org/t3chguy/roomnick ... add roomnick SlashCommand	2019-02-25 20:28:13 -07:00
Michael Telatynski	7029695224	make it i18n friendly ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 23:26:24 +00:00
Travis Ralston	f6021e78b1	Merge pull request #2697 from matrix-org/t3chguy/pretty_Devtools ... replace text Inputs in Devtools with Field bcuz prettier	2019-02-25 16:13:14 -07:00
Michael Telatynski	8d149575ea	Merge branches 'develop' and 't3chguy/room_context_menu_settings' of github.com:matrix-org/matrix-react-sdk into t3chguy/room_context_menu_settings	2019-02-25 23:12:06 +00:00
Michael Telatynski	d4b6ce6932	Apply PR feedback, don't change room to go to its settings ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 23:08:51 +00:00
Michael Telatynski	dd9077f1e4	Merge branches 'develop' and 't3chguy/pretty_Devtools' of github.com:matrix-org/matrix-react-sdk into t3chguy/pretty_Devtools	2019-02-25 22:39:37 +00:00
Michael Telatynski	56d58f8600	make better use of space ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 22:38:33 +00:00
Michael Telatynski	fd2acb18f3	Merge branches 'develop' and 't3chguy/roomnick' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomnick	2019-02-25 22:24:45 +00:00
Michael Telatynski	175938f5a0	set membership in case we don't get the ev ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 22:15:50 +00:00
Michael Telatynski	5bdd61111d	Fix textareas ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 22:12:06 +00:00
Travis Ralston	9a42d2edee	Merge pull request #2685 from matrix-org/travis/settings-cleanup-1 ... Maintenance: Clean up some stuff around settings	2019-02-25 11:53:23 -07:00
Travis Ralston	1aef157d2a	Fix variable reference	2019-02-25 11:52:45 -07:00
Nad Chishtie	88dfd3287f	Normalise room list font weight and make bold when there are unreads.	2019-02-25 11:02:27 -07:00
Travis Ralston	24099de2a4	Merge branch 'develop' into travis/settings-cleanup-1	2019-02-25 10:56:43 -07:00
Travis Ralston	e0a5eeca75	Merge pull request #2686 from matrix-org/travis/old-room-sorting ... Support the old room sorting algorithm and SettingsStore watchers	2019-02-25 10:51:10 -07:00
Travis Ralston	cdf09300ac	Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1	2019-02-25 10:44:33 -07:00
Bruno Windels	a26b62ef94	Merge pull request #2703 from matrix-org/bwindels/fixhighlightdep ... pin highlight.js as they seem to have broken something in 9.15.2	2019-02-25 18:35:41 +01:00
Bruno Windels	37f54a929b	pin highlight.js as they seem to have broken something in 9.15.2	2019-02-25 18:24:59 +01:00
Travis Ralston	5bf9f721c8	Port minimize to tray to new settings tab (post-merge) ... Brings in b02b371250	2019-02-25 09:43:39 -07:00
Travis Ralston	4801b25f77	Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1	2019-02-25 09:40:50 -07:00
Travis Ralston	addc7e519b	Merge pull request #2699 from matrix-org/travis/fix-bug-in-notifications ... Fix NPE relating to toggling notifications	2019-02-25 07:31:59 -07:00
Travis Ralston	8049d5c2b2	Merge pull request #2684 from matrix-org/travis/fix-e2e-menu-item ... Only set e2e info callback if the event is encrypted	2019-02-25 07:31:17 -07:00
Travis Ralston	4d1872d0ab	Merge pull request #2700 from matrix-org/travis/revert-debugging-7838 ... Revert "Add some logging for riot-web#7838"	2019-02-25 07:26:31 -07:00
Travis Ralston	1c10b3050d	Revert "Add some logging for riot-web#7838" ... This reverts commit f5ff580e35.	2019-02-24 18:05:40 -07:00
Travis Ralston	c12bea06c8	Merge pull request #2698 from matrix-org/t3chguy/room_member_filter_clear ... Add abilities to clear Filter room members input	2019-02-24 18:00:02 -07:00
Travis Ralston	2b9b07c29d	Merge pull request #2696 from matrix-org/t3chguy/pretty_view_source ... make ViewSource less awkward	2019-02-24 17:55:07 -07:00
Travis Ralston	acbd3fb748	Merge pull request #2695 from matrix-org/t3chguy/guest_share_community ... Fix share community for guests	2019-02-24 17:52:05 -07:00
Travis Ralston	e8e9e9bcdc	Merge pull request #2694 from matrix-org/t3chguy/mx_WhoIsTypingTile_remainingAvatarPlaceholder ... Fix z ordering of the overflow tile	2019-02-24 17:51:10 -07:00
Travis Ralston	6cc534e503	Fix NPE relating to toggling notifications ... The fallthrough for `notifier_enabled` caused a NPE on `payload.error`, so this moves the fallthrough to where it is intended and sanity checks `payload.error` for next time.	2019-02-24 17:45:03 -07:00
Travis Ralston	896a8c1c1d	Merge pull request #2693 from matrix-org/t3chguy/search_toggle ... Toggle Search using Room Header button	2019-02-24 17:41:23 -07:00
Travis Ralston	8ca1c96df4	Merge pull request #2691 from matrix-org/t3chguy/user_typing_memberinfo ... view user on click typing tile	2019-02-24 17:38:25 -07:00
Travis Ralston	c261879ba7	Merge pull request #2690 from matrix-org/t3chguy/share_permalink ... Change Share Message to Share Permalink if !m.room.message||redacted	2019-02-24 17:37:25 -07:00
Travis Ralston	f0353dbc3f	Merge pull request #2688 from matrix-org/t3chguy/minimize_tray ... Allow configuration of whether closing window closes or minimizes to tray	2019-02-24 17:33:26 -07:00
Matthew Hodgson	ef3b729ff4	s/google.com/recaptcha.net/ as per https://developers.google.com/recaptcha/docs/faq#can-i-use-recaptcha-globally	2019-02-24 23:35:08 +00:00
Michael Telatynski	ee47e0f72e	pass through className ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 04:44:38 +00:00
Michael Telatynski	5052039b36	Re-use SearchBox from filter rooms for filter room members ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 04:42:04 +00:00
Michael Telatynski	dbf540074d	replace text Inputs in Devtools with Field bcuz prettier ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 04:28:42 +00:00
Michael Telatynski	7b88d5d21c	make ViewSource less awkward ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 03:43:44 +00:00
Michael Telatynski	e6bf9fe9bf	Fix share community for guests ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 03:25:02 +00:00
Michael Telatynski	fa5f1df194	Fix z ordering of the overflow tile ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 03:18:21 +00:00
Michael Telatynski	e12e2c4a3d	tidy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 02:57:13 +00:00
Michael Telatynski	ac17e22556	Toggle Search using Room Header button ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 02:56:27 +00:00
Michael Telatynski	393fd26a42	Settings button in Room Context Menu ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 02:42:41 +00:00
Michael Telatynski	c99b4bda32	view user on click typing tile ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 02:30:45 +00:00
Michael Telatynski	f2624beca4	Change Share Message to Share Permalink if !m.room.message||redacted ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 02:03:20 +00:00
Michael Telatynski	4472c66b96	delint s'more ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 01:38:31 +00:00
Michael Telatynski	f16b9d76f4	add roomnick SlashCommand ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 01:36:47 +00:00
Michael Telatynski	45e9dbe49d	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-24 01:20:49 +00:00