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
5,079 Commits 3 Branches 492 Tags 100 MiB
69939e2fe3
Commit Graph

5079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Ralston
69939e2fe3 Merge branch 'develop' into travis/granular 2017-11-03 21:56:46 -06:00
Matthew Hodgson
31c5122fa6
Merge pull request #5293 from turt2live/travis/pinned-led-css 
CSS for new pinned events indicator
 2017-11-03 23:10:31 +00:00
Matthew Hodgson
c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1 
T3chguy/devtools 1
 2017-11-03 23:10:00 +00:00
Matthew Hodgson
c90834114b
Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms 
Use margin to separate "perms" in the room directory
 2017-11-03 22:44:41 +00:00
Luke Barnard
5d9a1b42a6
Merge pull request #5505 from vector-im/luke/groups-add-style-to-create-group-dialog 
Add CSS for CreateGroupDialog to give group ID input suffix and prefix style
 2017-11-03 16:14:54 +00:00
Luke Barnard
290a501523 Use prefixed class names to avoid collisions with other libraries 2017-11-03 16:02:25 +00:00
Luke Barnard
67bc346ebb Add CSS for CreateGroupDialog to give group ID input suffix and prefix style 2017-11-03 15:39:24 +00:00
Luke Barnard
04c866ce9c Fix #5359 - unbreakable topics not breaking 
The room directory CSS has `word-break: break-word` applied to the entire mx_RoomDirectory, which is questionable. For now, add the same rule to RoomDetailList
 2017-11-03 14:39:24 +00:00
Luke Barnard
3192c345be rethemedex 
Needed, having removed _GroupInviteTile.scss
 2017-11-03 14:11:07 +00:00
Luke Barnard
22b82182a7
Merge pull request #5504 from vector-im/luke/fix-groups-invites-appearance 
Fix group invites such that they look similar to room invites
 2017-11-03 13:53:56 +00:00
Luke Barnard
c60ff5d283 Fix group invites such that they look similar to room invites 
- Remove CSS for GroupInviteTile - the component should be using RoomTile CSS
 - Added extra tiles to roomCount of RoomSubList header

Part of fixing https://github.com/vector-im/riot-web/issues/5226
 2017-11-03 12:17:49 +00:00
Luke Barnard
2c4c6e82bb
Merge pull request #5501 from vector-im/luke/groups-fix-my-groups-layout 
CSS for Your Communities scrollbar
 2017-11-03 12:03:10 +00:00
Luke Barnard
4d11e739b5 Comment 0px height and margin on joinBox 2017-11-03 11:42:06 +00:00
Luke Barnard
f6974407e3 CSS for Your Communities scrollbar 
and also attempt to fix GroupTile flex weirdness.
 2017-11-03 11:22:29 +00:00
David Baker
69a82f7859
Merge pull request #5497 from vector-im/luke/groups-room-info 
Add toggle to alter visibility of room-group association
 2017-11-02 15:37:52 +00:00
Luke Barnard
ee71c72685 Use margin to separate "perms" in the room directory 
instead of a space.
 2017-11-02 15:13:55 +00:00
Luke Barnard
06ce467876 Add CSS for group room visibility label alignment 2017-11-02 15:05:08 +00:00
Luke Barnard
c01ea56676 Add toggle to alter visibility of room-group association 2017-11-02 13:40:07 +00:00
Luke Barnard
fb8e41a9c1
Merge pull request #5494 from vector-im/dbkr/pillify_at_room 
CSS for room notification pills
 2017-11-02 12:53:29 +00:00
David Baker
2e8f960ee3
Merge pull request #5493 from vector-im/luke/groups-room-info 
Implement simple GroupRoomInfo
 2017-11-02 11:07:00 +00:00
David Baker
65ea7a8460 Use more spercific selector instead of !important 2017-11-02 10:37:25 +00:00
David Baker
cd84d86fd1 CSS for room notification pills 2017-11-01 19:45:59 +00:00
Luke Barnard
2163a54617 Implement simple GroupRoomInfo 
See matrix-org/matrix-react-sdk#1563
 2017-11-01 17:32:01 +00:00
Richard Lewis
56c6a15ddf
Merge pull request #5458 from vector-im/rxl881/widgetTitleBorder 
Add back bottom border to widget title bar
 2017-10-31 18:02:32 +00:00
Richard Lewis
04d1a72307 Undo comitted changes to package-lock.json 2017-10-31 18:02:04 +00:00
David Baker
841503f907
Merge pull request #5478 from vector-im/luke/css-header-name-clickable-for-members 
Prevent group name looking clickable for non-members
 2017-10-31 13:52:19 +00:00
Luke Barnard
ba1ad84d59 Prevent group name looking clickable for non-members 2017-10-31 10:56:14 +00:00
Luke Barnard
07a17829ea
Merge pull request #5472 from vector-im/t3chguy/fix_typecheck_warn 
Fix instanceof check, was checking against the Package rather than class
 2017-10-31 10:29:18 +00:00
Michael Telatynski
c39044f397
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/fix_typecheck_warn 2017-10-30 15:27:20 +00:00
Michael Telatynski
71c8dca91a
Fix instanceof check, was checking against the Package rather than class 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 15:12:03 +00:00
Michael Telatynski
6da2f88dc5
Devtools styling tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 13:32:31 +00:00
Michael Telatynski
ea9b630082
Refactor and add Account Data stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 12:44:50 +00:00
Travis Ralston
f1c81be633 Import the right SettingsStore 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 22:18:34 -06:00
Travis Ralston
ccf52b2a69 Convert local settings to granular settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 17:05:27 -06:00
Travis Ralston
f6177cd7b5 Use granular settings instead of synced settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 01:51:02 -06:00
Richard Lewis
19320c37df Add back bottom border to widget title bar 2017-10-27 19:57:05 +01:00
Luke Barnard
c74e6c3c0c Merge pull request #5455 from vector-im/luke/groups-fix-invite-button 
Use correct group store state when rendering "Invite to this community"
 2017-10-27 16:10:33 +01:00
Luke Barnard
3dcc397f67 Fix AuxPanel floating in the middle 
When there is no RoomView_body to push it to the top of the flex container
 2017-10-27 15:40:03 +01:00
Luke Barnard
7bae7fe9e5 Use correct group store state when rendering "Invite to this community" 
This required slight rework of how RightPanel uses the group store, and now it knows an unfortunate amount about the group store. Food for thought on stores in general, I think.
 2017-10-27 14:33:28 +01:00
Matthew Hodgson
3df1808fd0 Merge pull request #5453 from VickyKoblinski/es6-notifications 
Leverages ES6 in Notifications
 2017-10-27 09:15:22 +01:00
Vicky Koblinski
d188fdb9fe Changes requires to imports for consistancy, removes 'use strict' 2017-10-26 21:23:16 -04:00
Vicky Koblinski
7588814ec5 Leverages ES6 and fixes typo 2017-10-26 20:37:15 -04:00
Luke Barnard
507cef3ba4 Merge pull request #5437 from vector-im/luke/feature-optionally-mirror-local-video 
Re-PR #4412
 2017-10-26 09:55:17 +01:00
Luke Barnard
044519f9ea Add more specific css class to allow for optional flipping 2017-10-25 18:18:37 +01:00
Luke Barnard
5db44bd4ae Merge branch 'develop' into TheLastProject-reverse-video 2017-10-25 18:06:16 +01:00
Luke Barnard
bc3df74c2f Merge pull request #5410 from lub/patch-1 
fix comma error of features example
 2017-10-25 16:53:55 +01:00
Luke Barnard
f6a920a018 Merge pull request #5387 from vector-im/t3chguy/devtools-filter-case-sens 
Devtools: make filtering case-insensitive
 2017-10-25 16:51:57 +01:00
Luke Barnard
a627784c41 Merge pull request #5432 from vector-im/luke/fix-group-members-info-icon-highlight 
Highlight group members icon in group member info
 2017-10-25 15:41:09 +01:00
Luke Barnard
7c7ae3a31f Merge pull request #5422 from vector-im/luke/fix-interactable-greyed-ui 
Use CSS to stop greyed Right/LeftPanel UI from being interactable
 2017-10-25 15:30:38 +01:00
Luke Barnard
cd0888ce5a Highlight group members icon in group member info 2017-10-25 15:27:50 +01:00