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
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
56d58f8600
make better use of space
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-25 22:38:33 +00:00
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
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
5bdd61111d
Fix textareas
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-25 22:12:06 +00:00
3d152da822
Support custom tags in the new algorithm
2019-02-25 13:39:08 -07:00
e083d50e31
Merge branch 'develop' into travis/fix-invites
2019-02-25 12:41:19 -07:00
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
1aef157d2a
Fix variable reference
2019-02-25 11:52:45 -07:00
88dfd3287f
Normalise room list font weight and make bold when there are unreads.
2019-02-25 11:02:27 -07:00
24099de2a4
Merge branch 'develop' into travis/settings-cleanup-1
2019-02-25 10:56:43 -07:00
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
cdf09300ac
Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1
2019-02-25 10:44:33 -07:00
77f979ed6d
also pass permalinkCreator here
2019-02-25 18:43:08 +01:00
a7db42c6cf
use nesting instead of short-circuited && operator
2019-02-25 18:43:08 +01:00
b8c6bed906
adjust permalink code for tombstone message
2019-02-25 18:43:08 +01:00
fb672ffb28
change handling of event permalinks in replies
2019-02-25 18:43:08 +01:00
31dda34e6b
use new permalink class in share dialog & context menu
2019-02-25 18:43:08 +01:00
f7ea9cfeb2
rename all instances of permalinkCreator
2019-02-25 18:43:08 +01:00
be3d12721c
check room exists
2019-02-25 18:43:08 +01:00
fe71c17bb7
keep previous >= pl limit
2019-02-25 18:43:08 +01:00
63504fcc17
dont assume there are powerlevels set
2019-02-25 18:43:08 +01:00
f97ea37717
permalink is one word
2019-02-25 18:43:08 +01:00
476b81fc1e
add test for membership change
2019-02-25 18:43:08 +01:00
db5a2138ea
this is dead code actually, can go
2019-02-25 18:43:08 +01:00
ed4960f1c5
nicer formatting
2019-02-25 18:43:08 +01:00
b9c3919dc1
calculate highest pl from load!
2019-02-25 18:43:08 +01:00
35809dc7d5
also update highest power level when acls come in
2019-02-25 18:43:08 +01:00
12f55391db
observe powerlevels from state event, less handlers this way
2019-02-25 18:43:08 +01:00
5ef673e80e
port existing tests
2019-02-25 18:43:08 +01:00
29be28919d
create permalink creator in roomview and pass it on to the event tiles
2019-02-25 18:43:08 +01:00
8d929add18
delegate to class when needing a roomId permalink
2019-02-25 18:43:08 +01:00
d4c6198fa3
update copyright
2019-02-25 18:43:08 +01:00
d3f0b609f5
use URL instead of creating new a element
2019-02-25 18:43:08 +01:00
c2791b9470
refactor pickServerCandidates into statefull class
...
so we don't need to iterate over all members for every permalink
2019-02-25 18:43:08 +01:00
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
37f54a929b
pin highlight.js as they seem to have broken something in 9.15.2
2019-02-25 18:24:59 +01:00
5bf9f721c8
Port minimize to tray to new settings tab (post-merge)
...
Brings in b02b371250
2019-02-25 09:43:39 -07:00
4801b25f77
Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1
2019-02-25 09:40:50 -07:00
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
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
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
2f50aca7ce
Translated using Weblate (Swedish)
...
Currently translated at 73.4% (1134 of 1543 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2019-02-25 10:54:21 +00:00
5f760fbf4a
Change the room list algo to eagerly delete and carefully insert
...
Previously it made some complicated assumptions about the contexts it was called in (it generally assumed it just had to shuffle rooms between tags and didn't really handle new rooms very well).
The algorithm now eagerly tries to drop rooms from tags and carefully inserts them. The actual insertion logic is mostly untouched: the only part changed is how it handles failure to insert into tag. It shouldn't be possible for this algorithm to completely skip a room unless the tag is empty, so we special case that.
There are several TODO comments to be addressed here. Namely, it doesn't handle manually ordered tags (favourites, custom, etc) and doesn't check if tags are even enabled. Changes in this area are waiting for https://github.com/matrix-org/matrix-react-sdk/pull/2686 to land to take advantage of monitoring the settings flag for tags.
2019-02-24 19:45:23 -07:00
1c10b3050d
Revert "Add some logging for riot-web#7838"
...
This reverts commit f5ff580e35
2019-02-24 18:05:40 -07:00
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
2b9b07c29d
Merge pull request #2696 from matrix-org/t3chguy/pretty_view_source
...
make ViewSource less awkward
2019-02-24 17:55:07 -07:00
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
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
Michael Telatynski