nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
63,241 Commits 258 Branches 582 Tags
35a9cbe3ff79ad9dfd394e4e142e01975ec93ecd
Commit Graph

63241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Barnard
ae76c76558 Fix #3450 - RM hidden by things 2017-05-04 21:27:33 +01:00
David Baker
1001c98a3c Align buttons better with the text 2017-05-04 18:23:04 +01:00
David Baker
f86ca5bc97 Hide empty tips if collapsed 2017-05-04 18:08:04 +01:00
Richard van der Hoff
bfceaa827b Log deviceid at login 
- to help understand rageshakes
 2017-05-04 18:04:47 +01:00
Richard van der Hoff
8d4663f437 Fix lint in Lifecycle.js 2017-05-04 18:03:35 +01:00
Luke Barnard
8e3851b380 Merge pull request #860 from t3chguy/patch-4 
Guests can't send RR so no point trying
 2017-05-04 17:53:59 +01:00
David Baker
23a141c5ad Remove slightly misleading commented code 2017-05-04 17:46:44 +01:00
Luke Barnard
8731e46900 Merge pull request #3808 from vector-im/dbkr/remove_babelcheck 
Remove babelcheck
 2017-05-04 17:45:59 +01:00
Luke Barnard
6e30134403 Merge pull request #861 from matrix-org/dbkr/remove_babelcheck 
Remove babelcheck
 2017-05-04 17:45:37 +01:00
David Baker
da960e776d Remove commented code 2017-05-04 17:45:11 +01:00
David Baker
d419024da9 Merge pull request #3809 from vector-im/rav/include_mx_id_in_rageshake 
Include MXID and device id in rageshakes
 2017-05-04 17:30:51 +01:00
Michael Telatynski
f76b9b4489 remove link to issue 
not very useful
 2017-05-04 17:25:23 +01:00
Richard van der Hoff
45efdbdd43 Include MXID and device id in rageshakes 
- to make for easier triage
 2017-05-04 17:21:16 +01:00
Luke Barnard
7918ff2fc2 Merge pull request #857 from t3chguy/t3chguy/settings_versions_improvements 
T3chguy/settings versions improvements
 2017-05-04 16:56:45 +01:00
David Baker
7b320f8fbb Remove babelcheck 
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
 2017-05-04 16:51:36 +01:00
David Baker
396b38512c Remove babelcheck 
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
 2017-05-04 16:50:47 +01:00
Michael Telatynski
da4c2f8b31 Guests can't send RR 
so they shouldn't try
lets not hit the HS quite as much
 2017-05-04 16:42:41 +01:00
David Baker
e6e2e6989a Merge pull request #3791 from t3chguy/patch-3 
import Modal
 2017-05-04 16:35:15 +01:00
David Baker
c8b0a15902 Merge pull request #852 from t3chguy/max-len 
Change max-len 90->120
 2017-05-04 16:24:20 +01:00
Michael Telatynski
3c6e301f7f Improve regex to ignore trailing -dirty and for rc tags 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 16:22:39 +01:00
David Baker
909cdb6e9a Depend on prop-types module 
So we can start writing code compatible with new React
 2017-05-04 16:22:06 +01:00
Michael Telatynski
2edfc3e598 remove commented out code as per review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 15:51:31 +01:00
Michael Telatynski
cb478f1194 no idea why those got in there... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 15:50:52 +01:00
David Baker
72df43d22b Year 2017-05-04 15:46:24 +01:00
David Baker
306ea58578 Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 15:45:05 +01:00
David Baker
2bf0074953 Make bottom left menu buttons use RoleButton too 2017-05-04 15:38:53 +01:00
David Baker
6a1d0fbab5 Make bottom left menu buttons use RoleButton too 2017-05-04 15:38:09 +01:00
David Baker
0998adb366 What year is it? Who's the president? 2017-05-04 15:02:21 +01:00
David Baker
ff709ed8b1 Fix import 2017-05-04 14:53:13 +01:00
Luke Barnard
d5b49a11d7 Merge pull request #829 from matrix-org/luke/fix-people-section-disappearing 
Remove DM-guessing code
 2017-05-04 14:15:28 +01:00
David Baker
cbb32968f1 Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 14:04:33 +01:00
David Baker
e1c99430cb Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 14:04:22 +01:00
David Baker
095da68aac Add buttons to room sub list headers 2017-05-04 13:58:17 +01:00
David Baker
ce119a6364 Add buttons to room sub list headers 2017-05-04 13:55:52 +01:00
Luke Barnard
694fc26a55 Merge pull request #855 from matrix-org/luke/fix-jump-to-rm-in-mels 
Fix jumping to an unread event when in MELS
 2017-05-04 13:03:30 +01:00
Luke Barnard
6d9a1f047d Typo 2017-05-04 13:03:04 +01:00
Luke Barnard
aa639ca061 Merge pull request #858 from t3chguy/patch-3 
fix typo
 2017-05-04 10:57:17 +01:00
Luke Barnard
bfa3123f9b Combine data-scroll-token and -contained-scroll-tokens 
- Instead of using one attribute, use one that might just contain one token
 - Use the first token when tracking a child
 - Mandate that no commas can be in individual tokens
 2017-05-04 10:00:13 +01:00
Michael Telatynski
c5d37ab2fb add to manifest for #334 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 22:56:39 +01:00
Michael Telatynski
9d92f93fcb consolidate call onPageUnload handler into RoomView 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 16:39:19 +01:00
Michael Telatynski
356d29939c also warn when quitting mid-call 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 16:25:27 +01:00
Michael Telatynski
b6fd771b9a move implementation to MessageComposer to it applies to any future composers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 16:21:35 +01:00
Michael Telatynski
18ba5d3e49 fix typo 
made in #849
 2017-05-03 12:39:24 +01:00
Michael Telatynski
9997cc9891 import Modal 
class seems to be referring to Modal but does not import it
 2017-05-02 22:27:30 +01:00
Michael Telatynski
d5009962cd Fix scope of callback 
This may have led to the room list not refreshing on error of deleting alias
 2017-05-02 22:19:32 +01:00
Michael Telatynski
6367344181 tidy and fix flow notation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:32:34 +01:00
Michael Telatynski
61c338a233 remove leading v in /version file so its semver 
and also then consistent with electron versioning

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:32:27 +01:00
Michael Telatynski
74b2c86f93 tidy up UserSettings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:17:12 +01:00
Michael Telatynski
76e98d4267 improve version hyperlinking 
removed redundant v prefix (key already says version)
links to most applicable version/tag
tag-commit -> commit
commit1-commit2-commit3 -> commit1
(v)x.y.z -> tag<x.y.z>
commit -> commit

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:12:58 +01:00
Luke Barnard
f4bb76922d Merge pull request #856 from matrix-org/luke/fix-phone-number-invalid-feedback 
Validate phone number on login
 2017-05-02 19:45:27 +01:00