Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,497 Commits 3 Branches 492 Tags 100 MiB
59d2b4d819
Commit Graph

4497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Hodgson
60d2d45255 readd in the .mx_EntityTile_power class. don't understand why it was killed :'( 2016-01-20 15:39:42 +00:00
Matthew Hodgson
6ecdb02e81 sanitize avatar border radii 2016-01-20 15:26:48 +00:00
Matthew Hodgson
4d3918109a skin new invite UI CSS 2016-01-20 14:58:27 +00:00
Matthew Hodgson
9a9db53e0a fix tinting of read marker again 2016-01-20 14:58:17 +00:00
Kegsay
ad6a19a0df Merge pull request #668 from vector-im/matthew/roompreview 
Support non-guest peeking
 2016-01-19 16:09:36 +00:00
Matthew Hodgson
3e8c6a42d3 roomsettings layout tweaks 2016-01-18 19:58:02 +00:00
Matthew Hodgson
3b8e5073b5 improve layout 2016-01-18 19:57:32 +00:00
Matthew Hodgson
a775086e81 wording from amandine 2016-01-18 19:57:17 +00:00
Matthew Hodgson
d5c291ae62 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-18 18:00:58 +00:00
Matthew Hodgson
d6f6f32c74 WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now 2016-01-18 17:37:13 +00:00
Kegan Dougal
317e1fb9cd Merge branch 'develop' into kegan/invite-search 2016-01-18 17:33:26 +00:00
manuroe
37e8a35967 Merge pull request #641 from vector-im/push-rules-settings 
Push rules settings
 2016-01-18 18:25:31 +01:00
manuroe
6182c983ab PushRules settings: Applied review remarks (2/2) 2016-01-18 18:24:53 +01:00
Kegan Dougal
ac4b221690 More CSS fun for border bottom 2016-01-18 17:22:02 +00:00
manuroe
fdf5b0a4fc Merge branch 'develop' into push-rules-settings 
# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
 2016-01-18 18:14:20 +01:00
manuroe
7c0fffa79b PushRules settings: Applied easy review remarks 2016-01-18 18:07:33 +01:00
Kegan Dougal
fef02f2fd1 s/MemberTile/EntityTile/ 2016-01-18 16:43:00 +00:00
manuroe
bdcf683942 PushRules settings: Create a dedicated rule for "Messages sent to group". 
The default fallback rule cannot be used because it matches with too much events.
 2016-01-18 16:41:48 +01:00
manuroe
ae14210763 PushRules settings: Put keywords in the right position 2016-01-18 16:31:18 +01:00
manuroe
830160f074 PushRules settings: Enabled all radio buttons of the table. 
Each rule is described in the code so that if the server does not have it in its default rules or if the user wants to use actions different from the hs one, the code will create a new rule that will override the hs one.
 2016-01-18 16:24:06 +01:00
Matthew Hodgson
0ef03c5ca4 Merge pull request #653 from vector-im/matthew/roomsettings2 
Finish off RoomSettings (part 2)
 2016-01-18 13:39:55 +00:00
Matthew Hodgson
5a1b0a1dab Merge pull request #657 from vector-im/matthew/memberlist 
Fix up MemberList and MemberInfo cosmetics a bit
 2016-01-18 13:39:42 +00:00
Kegan Dougal
77621fe035 Add missing CSS from #638 2016-01-18 12:06:46 +00:00
Kegsay
7e40d81a44 Merge pull request #638 from vector-im/kegan/base-avatar 
CSS for BaseAvatar
 2016-01-18 10:17:57 +00:00
Matthew Hodgson
8792be4db2 moar space 2016-01-18 01:25:57 +00:00
Matthew Hodgson
1fef91b82c MemberInfo lipstick 2016-01-18 01:18:11 +00:00
Matthew Hodgson
b2a1c89e83 bring back power badges 2016-01-18 00:16:04 +00:00
Matthew Hodgson
40d2018c17 fix checkbox css 2016-01-17 12:26:54 +00:00
Matthew Hodgson
a61afa0f31 fix css thinko 2016-01-17 02:46:22 +00:00
Matthew Hodgson
4e7c58e242 fix broken icon 2016-01-17 02:46:15 +00:00
Matthew Hodgson
8771369937 more layout 2016-01-15 20:29:44 +00:00
Matthew Hodgson
394fb2373b more layout tweaks for RoomSettings 2016-01-15 16:50:12 +00:00
Matthew Hodgson
eb8064f961 fix cursors for changeavatar 2016-01-15 16:32:39 +00:00
Matthew Hodgson
531aa153bb no more textarea in roomsettings 2016-01-15 16:32:23 +00:00
manuroe
d7ffe70d44 PushRules settings: Applied Amandine's review comments 2016-01-15 17:28:57 +01:00
Kegan Dougal
17489ae350 s/MemberAvatar/BaseAvatar/ and rename classes 2016-01-15 16:12:28 +00:00
Matthew Hodgson
762dd69f0a more bottom margin on editable roomheader 2016-01-15 15:48:29 +00:00
manuroe
cb8b052dc0 PushRules settings: Show unmanaged rules into an "advanced section" 2016-01-15 16:45:27 +01:00
Matthew Hodgson
1fcb4ba94f droptarget and usersettings and roomsettings layout tweaks 2016-01-15 15:26:00 +00:00
David Baker
ea6ed81517 Merge pull request #630 from vector-im/read_marker_position 
Shift read marker down by 5px
 2016-01-15 13:57:25 +00:00
manuroe
2dd2acd4e0 PushRules settings: BF adding a keyword when the keywords rule is OFF 2016-01-15 14:28:50 +01:00
Matthew Hodgson
41ae851df4 fix up user settings CSS somewhat 2016-01-15 12:34:01 +00:00
manuroe
c3469b5b51 PushRules settings: coding: separate UI and data management 2016-01-15 11:33:54 +01:00
manuroe
7412fc7f97 PushRules settings: changed wordings 2016-01-15 10:51:42 +01:00
Matthew Hodgson
d1f26e3911 camera icon 2016-01-14 17:26:16 +00:00
Matthew Hodgson
c1aac1aaca roomsetting icons 2016-01-14 17:25:21 +00:00
Matthew Hodgson
f2fa9fe398 Merge branch 'develop' into matthew/roomsettings2 2016-01-14 16:49:48 +00:00
David Baker
a65a15e9bb Shift read marker down by 5px 2016-01-14 16:45:13 +00:00
Matthew Hodgson
9ada5f7ddd CSS for tab complete slashcommands 2016-01-14 16:29:03 +00:00
Matthew Hodgson
17e540d372 fix line wrapping of code blocks in multiline msgs 2016-01-14 11:57:07 +00:00