Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-22 00:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,646 Commits 3 Branches 492 Tags 100 MiB
c7c271fb01
Commit Graph

959 Commits

Author SHA1 Message Date
Travis Ralston
6926c96f36 Hide pinning messages behind a labs settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:41:44 -06:00
Matthew Hodgson
6f819606c1 Merge pull request #4054 from ollieh/issues/3771 
Sorting of networks within a protocol based on name
 2017-10-14 23:21:51 +01:00
Travis Ralston
3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -06:00
Matthew Hodgson
2667ed2561 Merge pull request #4988 from vector-im/t3chguy/hide_notification_body 
allow hiding of notification body for privacy reasons
 2017-10-14 23:07:31 +01:00
Travis Ralston
1adb63ac74 Don't use MXIDs on the lightbox if possible 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 20:18:55 -06:00
Michael Telatynski
6df69138a2
switch to new logos, and use import rather than VAR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-11 16:46:05 +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
ec414147d1 Merge pull request #5110 from pafcu/mark-and-remove-translations 
Mark and remove some translations
 2017-10-04 10:24:36 +01:00
Travis Ralston
2d153a72c1 Split up CSS; use .catch instead of .then 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:33:14 -06:00
Travis Ralston
078ee54edf Move the PinnedEventsPanel to the react-sdk 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:15:21 -06:00
Travis Ralston
2d5acfc0bc Filter pinned events before rendering 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:30:52 -06:00
Travis Ralston
b0190f6a65 i18n for remaining strings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:22:06 -06:00
Travis Ralston
0a3bc1c667 Don't try to show redacted messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:21:44 -06:00
Travis Ralston
aff02885de Don't fail if an event doesn't belong to a room. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:21:21 -06:00
Travis Ralston
965a25ba84 Fix bug where rooms missing m.room.pinned_events could not pin messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:08:22 -06:00
Travis Ralston
f7389b70aa Hide the pin option in the context menu if the user can't pin messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:01:17 -06:00
Travis Ralston
efdb4b02c6 i18n for 'Jump to message' button 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:55:52 -06:00
Travis Ralston
59a253af37 Don't show the unpin button if the user can't unpin the message. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:53:44 -06:00
Travis Ralston
9b11f576fe Add action bar to pinned event tiles; support unpinning from the panel 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Travis Ralston
fa5a23e0df Permalink pins to their original events 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Travis Ralston
5daa16ab53 Add panel for pinned messages. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Travis Ralston
774c3dbd38 Pin/unpin message option in a message's context menu 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06: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
Stefan Parviainen
3cff8c1230 Mark some strings as translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 13:46:51 +02:00
Luke Barnard
96b9570465 Update comment 2017-09-21 17:31:06 +01:00
Matthew Hodgson
fbe1c82dfa Merge pull request #5074 from vector-im/t3chguy/devtools-1 
T3chguy/devtools 1
 2017-09-19 22:14:52 +01:00
Luke Barnard
fbcccd8be0 Merge pull request #4830 from vector-im/dbkr/group_userlist 
Group Membership UI
 2017-09-19 13:26:02 +01:00
Michael Telatynski
dccee6d419
add ability to filter room state types/results 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-18 12:03:11 +01:00
Michael Telatynski
af450df513
add ability to jump from RSE to Send Custom State Event prefilled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-18 11:27:31 +01:00
Michael Telatynski
821ab6c13e
switch to controlled inputs and require eventType !== '' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-18 11:06:46 +01:00
Matthew Hodgson
828e9d5eb4 Merge pull request #4735 from vector-im/t3chguy/devtools 
T3chguy/devtools
 2017-09-17 23:15:28 +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
f148844573 Merge pull request #4989 from vector-im/t3chguy/on_copy_tooltip 
generic contextual menu for tooltip/responses
 2017-09-13 14:27:28 +01:00
Michael Telatynski
2316f4230e
install and use prop-types over React.PropTypes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-13 14:23:35 +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
David Baker
38575a653d Revert "Implement sticky date separators" 2017-09-06 17:36:43 +01:00
Michael Telatynski
32ea675c92
fix (C) header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 14:20:12 +01:00
Michael Telatynski
60c2338543
generic contextual menu for tooltip/responses 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 11:27:04 +01:00
Michael Telatynski
fca86be077
allow hiding of notification body for privacy reasons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 10:56:32 +01:00
David Baker
b8d9276f29 Merge pull request #4939 from vector-im/luke/feature-sticky-date-separators 
Implement sticky date separators
 2017-09-05 14:16:21 +01:00
Michael Telatynski
3aa12246ea Merge branch 'develop' into t3chguy/devtools 2017-08-31 17:11:53 +01:00
Michael Telatynski
b84f258f87
add bottom margin to navigation buttons of room state explorer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 13:49:52 +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
Michael Telatynski
68fc202086
remove pointless self vars and DRY render method of send custom events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 09:45:46 +01:00
Michael Telatynski
ce0861d5bd
undo `` as its hard to read 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 09:25:06 +01:00
David Baker
a70e7751e9 Merge pull request #4943 from anoadragon453/develop 
Update vector-im to riot-im on Login
 2017-08-31 08:33:21 +01:00
Andrew (anoa)
8e5427d626
Update vector-im to riot-im on Login 
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
 2017-08-30 12:06:19 -07:00
Luke Barnard
8874c4dd43 Merge pull request #4910 from vector-im/t3chguy/success_bug_report 
lets let people know that the bug report actually sent properly :)
 2017-08-30 16:16:24 +01:00
Luke Barnard
88228a5a3f Implement sticky date separators 
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1353
 2017-08-30 14:06:50 +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
a2b57f502c
lets let people know that the bug report actually sent properly :) 
RFC on the wording of it.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-28 00:07:48 +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
Michael Telatynski
d14f16f0e9
look at event property of the mxEv, this way we won't have all 
the additional internal keys :)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-27 17:25:51 +01:00
Michael Telatynski
a437f23e9d
add i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-26 18:48:24 +01:00
Michael Telatynski
78aa0a59de
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools 2017-08-26 18:29:19 +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
Michael Telatynski
84f4fbe142
DRY up code and change flow to be less destructive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 23:56:57 +01:00
Michael Telatynski
3fd1a366bf
add back button to all pages and widen textarea 2017-08-10 23:13:40 +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
2d4484e0f2
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools 2017-08-10 16:06:14 +01:00
Luke Barnard
535e33509b Merge pull request #4688 from vector-im/t3chguy/i18n_analytics 
un-i18n Modal Analytics
 2017-08-10 15:36:04 +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
Luke Barnard
57f82c3c9e Quote using innerText 
codep matrix-org/matrix-react-sdk#1289
 2017-08-10 10:18:37 +01:00
David Baker
7c4b6739fc Add group member right panel 2017-08-09 15:36:51 +01:00
Michael Telatynski
1b004f170d
make eslint happy 2017-08-03 01:10:32 +01:00
Michael Telatynski
9ab30b7b17
fix line-length and copyright header 2017-08-03 01:05:43 +01:00
Michael Telatynski
131d1c74c9
add room state explorer to devtools 2017-08-03 00:59:40 +01:00
Michael Telatynski
6bfdd69279
add devtools dialog 2017-07-31 12:08:41 +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
Luke Barnard
53ae42ed68 Use catch instead of fail to handle room tag error 
Because bluebird doesn't support fail
 2017-07-19 14:11:22 +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
7238c4dfac Fix overlooked q 2017-07-13 11:33:25 +01:00
Richard van der Hoff
1d2d086a58 Replace q.allSettled() 
Bluebird doesn't have an `allSettled` method, so instead catch the exceptions and
use `all`.
 2017-07-13 00:50:01 +01:00
Richard van der Hoff
d5b550f89a replace q method calls with bluebird ones 
```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
 2017-07-13 00:50:01 +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
Luke Barnard
c1b8879b6b Merge pull request #4500 from vector-im/luke/feature-enable-RTE 
Take RTE out of labs
 2017-07-10 13:56:02 +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
Luke Barnard
77a52b02cb Take RTE out of labs 
Goes with https://github.com/matrix-org/matrix-react-sdk/pull/1176
 2017-07-04 16:26:19 +01:00
Michael Telatynski
f36c1ca207 fix Quote not closing contextual menu 
also use `this.closeMenu();` over the explicit direct call as the wrapper exists and is a little clearer
 2017-06-27 14:51:18 +01:00
Michael Telatynski
e33e0effa3 use _t on string literals and i18n 'warning' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-22 15:05:13 +01:00
Michael Telatynski
0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	electron_app/src/tray.js
 2017-06-22 15:04:33 +01:00
Richard van der Hoff
a9c8429d2e Merge pull request #4362 from turt2live/travis/missed-redact 
Change missed 'Redact' to 'Remove' in ImageView.
 2017-06-22 14:37:31 +01:00
Luke Barnard
c4a3211cfc Use _tJsx for PasswordNagBar (because it has <u>) 2017-06-20 16:28:40 +01:00
Michael Telatynski
fe1b0b5cd8 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-20 14:32:19 +01:00
Luke Barnard
d5d29c1c92 Give _t to PasswordNagBar, add CSS for UserSettings password warning 
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1123
 2017-06-20 11:23:34 +01:00
turt2live
b9fc46fa41 Change missed 'Redact' to 'Remove' in ImageView. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-19 16:24:03 -06:00
Matthew Hodgson
1c82b7b0c3 add register button 2017-06-19 00:54:07 +01:00
Matthew Hodgson
612cad5d9e fix broken vars 2017-06-19 00:01:11 +01:00
Michael Telatynski
274536bf13 change dispatcher forward_event signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 16:11:33 +01:00
David Baker
2c186aafae Fix h2 in markdown being weird 
Date separator style was just define don any h2 in the message
list, so got picked up by any h2s in markdown too. Give date
separators their own class.

Fixes https://github.com/vector-im/riot-web/issues/4328
 2017-06-16 11:36:24 +01:00
Luke Barnard
4f55f810af Ask for email address after setting password for the first time 
This is so that the user can reset their password.
 2017-06-14 09:30:08 +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
Michael Telatynski
9493f4a872 fallback from undefined for interpolation 
because _t called with undefined interpolation name: errorDetail
even though when its undef its not used to sprinf-js would have been fine...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-12 10:42:44 +01:00
Michael Telatynski
deb7ed660c Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-11 23:13:49 +01:00
Michael Telatynski
a520f0bfed move all logic, make bar more generic 
pass through actual errors
and tidy
needs testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-11 19:19:17 +01:00
Michael Telatynski
6592526109 change /!\ to Warning for accessibility (plus weird escaping?) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-11 13:45:37 +01:00
Matthew Hodgson
919ca5d67c fix missing string and broken var 2017-06-08 22:48:12 +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
Luke Barnard
a158549a4c Merge pull request #4039 from vector-im/new-guest-access 
New guest access
 2017-06-07 13:40:00 +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
784e52f249 Align message timestamp centrally about the avatar mid-point 
Tested visually against any unintended changes to the alignment of e2e icons, with timestamps on 12h and 24h mode.
 2017-06-07 10:19:58 +01:00
David Baker
e30fcdba4c Merge branch 'develop' into new-guest-access 2017-06-06 11:39:47 +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
Luke Barnard
0919b7ce3a i18n for SetPasswordDialog 2017-06-05 16:13:44 +01:00
Michael Telatynski
5981887705 fix UpdateCheckBar image alt 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 16:04:01 +01:00
Michael Telatynski
a4c1aee5ea correct file header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 16:00:49 +01:00
Michael Telatynski
f5ba6fa952 i18n things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit d878c72)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:59:33 +01:00
Michael Telatynski
3ebd90565c add clearer concept of timeout vs error 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 104c804)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:59:27 +01:00
Michael Telatynski
b95ad701af match ENUM style to others in project 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit a871815)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:59:18 +01:00
Michael Telatynski
efc68c078e basic manual update stuff + update check bar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:59:12 +01:00
Michael Telatynski
884322f82c remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 21:57:42 +01:00
turt2live
640fa108fc Support 12hr time on DateSeparator 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-01 09:52:42 -06: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
Kegan Dougal
a7659a57a8 Add remaining translations 2017-05-31 16:56:50 +01:00
Kegan Dougal
a3ebeb5c69 Sanitize translated HTML 2017-05-31 16:38:51 +01:00
Kegan Dougal
1dce9cda9e Translate src/components/views/globals 
directory and elements already done
 2017-05-31 16:02:59 +01:00
Kegan Dougal
162f3872e5 Translate src/components/context_menus|dialogs 2017-05-31 15:40:49 +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
4493994dd5 Merge pull request #4092 from turt2live/travis/12hrtime-hotfix 
Show 12hr time on hover too
 2017-05-30 20:15:00 +01:00
Matthew Hodgson
386fcb96fd Merge pull request #4087 from vector-im/kegan/translation-ape 
Translate src/notifications
 2017-05-30 20:14:10 +01:00
turt2live
676bd6196f Show 12hr time on hover too 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-05-30 13:07:49 -06: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
2a122a25fa Translate notification strings 2017-05-30 17:39:41 +01:00
Kegan Dougal
7e21e00c99 Translate src/components/structures 2017-05-30 16:27:48 +01:00
Matthew Hodgson
60a56d0617 Merge pull request #4056 from vector-im/t3chguy/piwik 
Piwik Analytics
 2017-05-30 15:59:08 +01:00
Michael Telatynski
6a57742343 managed to eat the eventStatus check, can't redact a local-echo etc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 14:19:33 +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
Michael Telatynski
17c4e7a748 check PL on change as well as on comp load, that way it'll show remove button if PL increases later. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 23:49:56 +01:00
Michael Telatynski
d3f9304598 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/show_redact_if_can 2017-05-29 23:17:44 +01:00
Michael Telatynski
dda73cecf9 make eslint happy about MatrixToolbar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 19:12:04 +01:00
Matthew Hodgson
1af86405bd Merge branch 'new-guest-access' into tom-welcome-page 2017-05-29 18:38:57 +01:00
Matthew Hodgson
8ef7dda7bd fixing missing OK button on TextInputDialog 2017-05-29 16:43:28 +01:00
Matthew Hodgson
a92d96347b Merge branch 'develop' into new-guest-access 2017-05-28 22:50:53 +01:00
Matthew Hodgson
da7c6ca856 Merge branch 'develop' into travis/redact-to-remove 2017-05-28 22:41:38 +01:00
Michael Telatynski
6969baa5a6 change event wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-28 13:08:09 +01:00
Matthew Hodgson
2f71dc9fe5 Merge branch 'develop' into forward_message 2017-05-28 02:37:10 +01:00
Michael Telatynski
21b88ecfd5 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/piwik 2017-05-27 20:59:26 +01:00
Michael Telatynski
61a67c52c5 initial piwik stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 20:39:52 +01:00
Matthew Hodgson
4293273e55 fix a bunch of i18n fails picked up by check-i18n.pl 2017-05-27 19:26:19 +01:00
Oliver Hunt
16357a9bc7 Sorting of networks within a protocol based on name 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-05-27 19:10:17 +01:00
Luke Barnard
aa604612a7 Add "Login" button to RHS when user is a guest 2017-05-26 18:42:07 +01:00
David Baker
5e0457c32d Merge pull request #4035 from vector-im/dbkr/translations 
Translations!
 2017-05-26 18:39:07 +01:00
Thomas Lant
8f083a5fdd Welcome page + too much bootstrap stuff for now 2017-05-26 17:23:34 +00:00
David Baker
ee2a49ad41 Punctuation in translation strings 2017-05-26 13:46:01 +01:00
David Baker
92579cf463 Array literal 2017-05-26 13:36:58 +01:00
David Baker
d688eade43 Remove commented use strict 
It's even less use in a comment
 2017-05-26 13:34:18 +01: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
David Baker
2982174028 No need for repeated OKs anymore 2017-05-25 18:21:40 +01:00
David Baker
c15a66d1d4 Fix up notification settings strings 2017-05-25 17:21:41 +01:00
Luke Barnard
1db3ba676d Rejig the PaswordNagBar 
- Change the nag bar to read "To return to your account in future you need to set a password"
 - Underline "Set a password"
 - Make the whole thing clickable
 2017-05-25 15:33:40 +01:00
Luke Barnard
790fc7ca4a Remove "new" from set password dialog 2017-05-25 15:26:44 +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
David Baker
2fde2d58b6 Merge pull request #4020 from vector-im/luke/remove-guest-warning-bar 
Remove GuestWarningBar
 2017-05-25 14:30:14 +01:00