Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-22 09:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,956 Commits 3 Branches 492 Tags 100 MiB
7262291dda
Commit Graph

432 Commits

Author SHA1 Message Date
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
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
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
cd0888ce5a Highlight group members icon in group member info 2017-10-25 15:27:50 +01:00
Luke Barnard
0561c5bd4f Swap ui_opacity for panel_disabled 
Simplify the API for disabling panels in the UI. `mx_fadable_faded` is applied instead of setting opacity.
 2017-10-25 10:29:57 +01:00
Luke Barnard
bd15a88c89 Use CSS to stop greyed Right/LeftPanel UI from being interactable 2017-10-24 17:10:29 +01:00
Luke Barnard
6a0ecfba7f Merge branch 'develop' into luke/fix-privileged-group-ui-1 2017-10-24 11:09:05 +01:00
Luke Barnard
f1a700ef99 Only show UI for adding rooms/users to groups to privileged users 2017-10-24 10:38:40 +01:00
Luke Barnard
cc1fb8ac94 Only show "Invite to this community" when viewing group members 2017-10-24 10:22:13 +01:00
Luke Barnard
e5df06b2ab Groups->Communities 2017-10-19 15:07:22 +01:00
Luke Barnard
2cefa58d5d CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475 2017-10-16 11:44:38 +01:00
Luke Barnard
70bbf2df7a Fix bug that made sub list placeholders not show for ILAG etc. 2017-10-04 15:58:40 +01:00
Luke Barnard
d3b8d8bf9d Create basic icon for the GroupRoomList tab and adding rooms to groups 2017-09-29 17:03:58 +01:00
Luke Barnard
5544270bc4 Merge pull request #5131 from vector-im/luke/groups-button 
Add button to get to MyGroups
 2017-09-29 11:00:29 +01:00
Luke Barnard
47919bc291 Honour the Groups feature flag 2017-09-29 10:39:49 +01:00
Luke Barnard
f9a92ad15a Lint 2017-09-28 10:02:16 +01:00
Luke Barnard
ce13837216 Remove key prop pass-thru on HeaderButton 
This is redundant and throws a warning
 2017-09-28 09:46:10 +01:00
Luke Barnard
9c86a655ca Add button to get to MyGroups 2017-09-27 17:46:53 +01:00
Luke Barnard
888e3abc75 Implement "Add room to group" feature 
This step needs to be taken before adding a room to a group summary
 2017-09-26 14:35:38 +01:00
Luke Barnard
bfdb92ff6b Nit: Re-order property 2017-09-25 16:13:54 +01:00
Luke Barnard
77f30aacf9 Re-add clickPhase for FilePanel header button 2017-09-25 16:13:13 +01:00
Luke Barnard
fd7e81193e Less coupling between HeaderButton and RightPanel 
Use isHighlighted as a prop instead of computing based on phases and currentPhase
 2017-09-25 16:06:46 +01:00
Luke Barnard
28e9fdc873 rebase in progress; onto 7137ba71 2017-09-25 14:42:44 +01:00
Luke Barnard
7137ba7188 Refactor right panel header buttons 
To reduce repetition of code, simplify the process of adding header buttons and remove the need for many handler functions.
 2017-09-25 14:13:02 +01:00
Luke Barnard
96b9570465 Update comment 2017-09-21 17:31:06 +01:00
David Baker
06fe240be2 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-09-13 16:35:37 +01:00
David Baker
3ac154b7da Add comment to update shouldComponentUpdate 
if adding new props
 2017-09-11 18:30:43 +01:00
David Baker
47ddc6dedf Comment typo 2017-09-11 18:29:20 +01:00
David Baker
82f2e47667 Avoid re-rendering RoomList on room switch 
See https://github.com/matrix-org/matrix-react-sdk/pull/1375
 2017-09-11 17:06:40 +01:00
David Baker
76be54b2be Make isInvite default to false 
as things are assuming it's optional but it isn't which is causing
a ton of warnings.
 2017-09-07 13:35:13 +01:00
Luke Barnard
da9dcc8f50 Merge pull request #4858 from Nostradamos/fix-4804 
Fix overflowing login/register buttons on some languages issue #4804
 2017-08-31 09:51:06 +01:00
David Baker
e5912b996d copyright 2017-08-30 09:23:20 +01:00
Michael Telatynski
f560dc4c11
add useful comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-29 14:58:30 +01:00
Michael Telatynski
1c387c1fd1
fix two room list regressions: 
+ missing roomsublist badge for invites
+ missing room badge for invites if i18n!=English

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-27 23:37:13 +01:00
David Baker
a673cbcf1e s/member/groupMember/ 2017-08-25 13:00:43 +01:00
Nostradamos
1dfa8361c5 Fixed https://github.com/vector-im/riot-web/issues/4804 2017-08-23 22:12:02 +02:00
David Baker
ee6e36cd90 Allow extra tiles to be put into room sub lists 
So we can put in tiles for group invites & other stuff
 2017-08-18 11:23:55 +01:00
David Baker
1a7a670c96 Show the group invite dialog 
What to TODO said!
 2017-08-16 14:59:00 +01:00
David Baker
57eb2feeb6 Make right panel collpasing work in GroupView 2017-08-15 13:18:16 +01:00
David Baker
be611f53e1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-15 10:49:20 +01:00
David Baker
d610788866 Merge pull request #4777 from vector-im/luke/fix-quick-search-nav 
move focus-via-up/down cursors to LeftPanel
 2017-08-11 10:52:36 +01:00
David Baker
3eeabe8d91 Merge pull request #4775 from vector-im/luke/fix-user-url-no-middle-panel 
Remove userId property on RightPanel
 2017-08-11 10:49:25 +01:00
Matthew Hodgson
5bfb5d4c3c move focus-via-up/down cursors to LeftPanel 
Conflicts:
	src/components/structures/LeftPanel.js
 2017-08-10 18:18:15 +01:00
Luke Barnard
44c6f3fafc Add todo to make RP listen to RVS 2017-08-10 16:59:12 +01:00
Michael Telatynski
4c6836bc3f
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:13:30 +01:00
Michael Telatynski
9c5ceb6775
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:56:01 +01:00
Luke Barnard
7269e7b84a Remove userId property on RightPanel 
because we shouldn't have a dispatch AND have a property that do vaguely similar things. Ideally, the dispatch would send a userId and RP would do async work to get the member/avatar/displayname.
 2017-08-10 13:16:31 +01:00
David Baker
7c4b6739fc Add group member right panel 2017-08-09 15:36:51 +01:00
Michael Telatynski
5b6dbfb701
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics 2017-07-28 21:02:48 +01:00
Michael Telatynski
93a3c896a4
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:45:02 +01:00
David Baker
4fa85723ab Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-07-25 17:16:05 +01:00
David Baker
3ff628254d CSS for group userlist 2017-07-25 15:56:40 +01:00
Richard van der Hoff
bc2f639aae Fix a couple of minor errors in the room list 
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
 2017-07-24 17:19:46 +01:00
Richard van der Hoff
76181f4771 Merge remote-tracking branch 'origin/develop' into rav/bluebird 2017-07-13 12:04:54 +01:00
Richard van der Hoff
b29b4a959b q(...) -> Promise.resolve 
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
 2017-07-13 00:50:01 +01:00
Richard van der Hoff
10decf95f6 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-13 00:48:31 +01:00
Luke Barnard
188a58e5c7 RateLimitedFunc -> rate_limited_func 2017-07-12 18:18:13 +01:00
Luke Barnard
3e1a909b1d Just use the onKeyDown of the <input> 2017-07-12 17:46:27 +01:00
Luke Barnard
41cd238e02 Update to reflect previous implementation 
Which was a74bbb424c
 2017-07-12 17:10:43 +01:00
Luke Barnard
4fe4e10abb Implement the focus_room_filter action 
This is for ctrl+k room filtering and switching
 2017-07-12 13:49:57 +01:00
Richard van der Hoff
bc60fa81af more HomePage tweaks 
* Don't log errors with no context
* i18nify the "Couldn't load home page" message
 2017-07-11 14:29:47 +01:00
Richard van der Hoff
d755903fdb typo 2017-07-11 14:10:18 +01:00
Richard van der Hoff
8ac26dd19f Give HomePage an unmounted guard 
Also add missing return in error-handling path
 2017-07-11 14:08:16 +01:00
Richard van der Hoff
60703bdcfc Log errors thrown by getThirdpartyProtocols 
- so that it appears in rageshakes and test logs.
 2017-07-05 10:54:10 +01:00
Matthew Hodgson
1c82b7b0c3 add register button 2017-06-19 00:54:07 +01:00
David Baker
91295c68ad Don't show the tooltips when filtering rooms 
Fixes https://github.com/vector-im/riot-web/issues/4281
 2017-06-12 17:54:58 +01:00
David Baker
bbb9dd9228 Fix broken riot.im link on homepage 
For want of a quote the something something

Also add noopeners
 2017-06-12 17:33:02 +01:00
Matthew Hodgson
d8f7262eac Merge branch 'develop' into t3chguy/random_fix_1 2017-06-08 15:58:49 +01:00
Matthew Hodgson
da69d03b1d i18n powered by [matrix] sanely 2017-06-08 13:50:53 +01:00
Matthew Hodgson
cabbd16dd3 fix colour & hyperlink for home page header 2017-06-08 12:06:52 +01:00
David Baker
090a7c5761 Remove '/' from homepage URL 
As we are not always at the root of the web server.
 2017-06-07 11:20:41 +01:00
Luke Barnard
feaff9d99d Fix tests for new-guest-access 
This time the test wasn't being flaky, but it does inspect a lot of the internal of RoomView, which has had some modifications recently. I've updated the test to reflect this and it passes locally.

Also, fix a bug in HomePage with an undeclared "error" which should be "err".

Let's see what Travis thinks of this!
 2017-06-05 20:16:44 +01:00
Michael Telatynski
884322f82c remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 21:57:42 +01:00
Matthew Hodgson
a8f0ed60cf Merge branch 'new-guest-access' into matthew/i18n-welcome 2017-06-01 11:16:50 +01:00
Matthew Hodgson
623f995934 fix untested stuff with iframe homepages 2017-06-01 11:13:04 +01:00
Matthew Hodgson
a21c77f4dd make it work 2017-06-01 00:07:47 +01:00
Matthew Hodgson
17e80d7757 i18n welcome 2017-05-31 11:02:59 +01:00
Matthew Hodgson
1e1a43c78f support iframes for RTS urls 2017-05-30 21:52:43 +01:00
Matthew Hodgson
64a67583e0 Merge pull request #4038 from vector-im/tom-welcome-page 
Tom welcome page
 2017-05-30 21:36:21 +01:00
Matthew Hodgson
d264426ece Merge branch 'develop' into new-guest-access 2017-05-30 21:06:45 +01:00
Matthew Hodgson
f4c7aaf138 Merge pull request #4084 from vector-im/kegan/translation-monkey 
Translate src/components/structures
 2017-05-30 18:13:36 +01:00
Kegan Dougal
7e21e00c99 Translate src/components/structures 2017-05-30 16:27:48 +01:00
Matthew Hodgson
37b51b8a2a translate login button 2017-05-30 12:25:27 +01:00
Matthew Hodgson
1f4f86b5f8 rework tom's welcome page to fit in slightly better with riot's UI/UX 
* moves login button to top-left
* switches from iframe to a request() to load the welcome page to inherit CSS (probably breaks RTS :/)
* namespace CSS
* change the layout a bit.
 2017-05-30 03:58:45 +01:00
Matthew Hodgson
1af86405bd Merge branch 'new-guest-access' into tom-welcome-page 2017-05-29 18:38:57 +01:00
Matthew Hodgson
a92d96347b Merge branch 'develop' into new-guest-access 2017-05-28 22:50:53 +01:00
Michael Telatynski
6969baa5a6 change event wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-28 13:08:09 +01:00
Michael Telatynski
61a67c52c5 initial piwik stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 20:39:52 +01:00
Luke Barnard
aa604612a7 Add "Login" button to RHS when user is a guest 2017-05-26 18:42:07 +01:00
Thomas Lant
8f083a5fdd Welcome page + too much bootstrap stuff for now 2017-05-26 17:23:34 +00:00
David Baker
810fb42458 Fix indenting 2017-05-26 13:25:46 +01:00
Luke Barnard
aa357ff6de Always show HomeButton 2017-05-26 10:33:48 +01:00
Luke Barnard
41e7706bc6 Allow team server config to be missing 
, default to welcome page if either the teamToken or teamServerURL is undefined.
 2017-05-25 14:35:59 +01:00
Luke Barnard
9d28c8f577 Move ref to outer div 2017-05-25 13:49:41 +01:00
David Baker
284aeeb43e Call out icons on hover 
Conflicts:
	src/components/structures/BottomLeftMenu.js

cherry-picking commit 39229c5.
 2017-05-25 12:19:26 +01:00
David Baker
bf716add99 Dedicated classes for the buttons 2017-05-25 12:08:14 +01:00
David Baker
9b1ffe6fda Remove slightly misleading commented code 2017-05-25 12:07:59 +01:00
David Baker
a5ea19b900 Remove commented code 2017-05-25 12:07:54 +01:00
Luke Barnard
e3342e36c0 Fix RoomSubList (RoomSubListHeader was removed) 2017-05-25 12:07:39 +01:00
David Baker
67ecd94b4a Make bottom left menu buttons use RoleButton too 
Conflicts:
	src/components/structures/BottomLeftMenu.js

cherry-picking commit 2bf0074.
 2017-05-25 12:06:49 +01:00