gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,432 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

710 Commits

Author SHA1 Message Date
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
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
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
David Baker d81f894a50 Add buttons to room sub list headers 
Conflicts:
	src/components/structures/RoomSubList.js
	src/components/structures/RoomSubListHeader.js

cherry-picking commit 095da68.
 2017-05-25 11:58:12 +01:00
David Baker af305ea540 Make left panel more friendly to new users 
https://github.com/vector-im/riot-web/issues/3609
 2017-05-25 11:42:12 +01:00
David Baker ee85eb961a Bulk change counterpart imports 
to use react-sdk wrapper function, rather than using counterpart
directly.
 2017-05-25 11:39:56 +01:00
Luke Barnard 365a46777c Remove GuestWarningBar 2017-05-25 11:02:26 +01:00
Luke Barnard e253f86c63 Improve teamToken prop doc on homePage 2017-05-25 10:23:26 +01:00
Luke Barnard efb6316ba0 Implement default welcome page and allow custom URL /w config 
counterpart to https://github.com/matrix-org/matrix-react-sdk/pull/922
 2017-05-24 17:58:03 +01:00
David Baker 6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
Luke Barnard 299dc7fe84 Merge branch 'develop' into new-guest-access 2017-05-22 16:17:36 +01:00
Luke Barnard 9fc57786f1 Add warm-fuzzy for successful password entry 2017-05-22 16:11:52 +01:00
Luke Barnard 5d712d27d3 autoFocus new password input in SetPasswordDialog 2017-05-22 14:45:40 +01:00
Kieran Gould cae62c8383 MessageTimestamp now has 12 hour prop 2017-05-19 22:36:02 +01:00
Maxwell Kepler 9e37fa46b1 Add 12 hour support 2017-05-19 22:29:20 +01:00
Michael Telatynski 09f987559b rename action, now forwarding any event is possible, limited by where 
button is shown, i.e easy to modify

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 01:30:36 +01:00
Michael Telatynski eaeac1230f Merge branch 'develop' of github.com:vector-im/riot-web into forward_message 2017-05-19 01:15:31 +01:00
Michael Telatynski 7777be89ee only for finalised events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-18 23:53:37 +01:00
Richard van der Hoff 86055bc476 Fix some setState-after-unmount in roomdirectory 
Give the RoomDirectory and unmounted guard, and use it to avoid some setState
warnings. Also, cancel the filterTimeout (no point in leaving it around).

There are still plenty of other opportunities to setState after unmount, but
the filterTimeout was causing noise in the test.
 2017-05-18 13:41:54 +01:00
David Baker 7ea0ecd125 Merge branch 'new_release_process_stable' into develop 
This reverts PRs on riot-web marked as notready, turning the develop
branch into a more stable version.
 2017-05-17 10:43:02 +01:00
David Baker 9fc9de3af5 Revert "Merge pull request #3654 from vector-im/matthew/quick-search" 
This reverts commit 8f20fcfa6b, reversing
changes made to 751f715e77.
 2017-05-16 17:21:49 +01:00
David Baker 844ea390c8 Revert "clear the searchbox after quick-search" 
This reverts commit ddd12edc06.
 2017-05-16 17:13:55 +01:00
David Baker fdf326c9f0 Revert "Cancel quick-search on Escape, clearing it and returning focus to composer." 
This reverts commit 52a119244b.
 2017-05-16 17:13:39 +01:00
David Baker 9399b7ddf0 Revert "fix incoming call box" 
This reverts commit b3431bb750.
 2017-05-16 16:35:17 +01:00
David Baker 03476705b1 Revert "better solution to incomingcallbox weirdness" 
This reverts commit be52787473.
 2017-05-16 16:35:06 +01:00
David Baker 3cead032c2 Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2" 
This reverts commit e6133820a2, reversing
changes made to d1db602b3a.
 2017-05-16 16:27:58 +01:00
Luke Barnard 219bfffea2 Only dispatch password_changed when password has changed 2017-05-16 14:24:09 +01:00
Michael Telatynski 58ada2c27d move mxEvent.status check to js-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:14:06 +01:00
Michael Telatynski db78534b45 remove no longer required parseIntWithDefault 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:10:00 +01:00
Michael Telatynski d55f4f9e6a use new RoomState method from matrix-org/matrix-js-sdk/pull/435 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:08:00 +01:00
Luke Barnard 11d88aa6a2 import dispatcher 2017-05-16 13:56:12 +01:00
Luke Barnard 36ec39ffc0 Merge branch 'new-guest-access' into luke/new-guest-access-set-pwd-dialog 2017-05-16 13:49:18 +01:00
Luke Barnard 48856c31f8 Dispatch password_changed when SetPasswordDialog finished 2017-05-16 13:48:56 +01:00
Michael Telatynski aff1e14efc first go at show redact only if we can redact 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 13:15:14 +01:00
Luke Barnard e367fb5a98 disabledConfirmation -> confirm 2017-05-16 12:45:30 +01:00
Luke Barnard 79d32868a6 Replace NeedToRegister with SetMxId dialog 2017-05-16 11:39:30 +01:00
Luke Barnard 5814a3fdc8 Fix copyright 2017-05-16 10:11:44 +01:00
Luke Barnard 0e787a09c3 Implement dialog to set password 
Until https://github.com/matrix-org/matrix-react-sdk/pull/881, ChangePassword will not know about the cached password (so it won't hide "Current Password" yet).

There's also a bit of work left - informing the SessionStore that the password has changed (marked with a TODO)
 2017-05-16 09:44:52 +01:00
Matthew Hodgson 25a727b8d8 use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874 2017-05-15 00:26:02 +01:00
Luke Barnard 2eccdf56b9 Merge branch 'develop' into new-guest-access 2017-05-11 09:50:13 +01:00
David Baker e6133820a2 Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2 
Make left panel better for new users (mk II)
 2017-05-08 10:37:59 +01:00
Luke Barnard 5766a6e93d Give warning icon better alt 2017-05-08 10:02:05 +01:00
David Baker 0deed1b511 Merge pull request #3790 from t3chguy/patch-2 
Fix scope of callback
 2017-05-05 18:25:29 +01:00
Luke Barnard f14c2a0a71 Implement PasswordNagBar 
This will tell the user that they need to set a password to return to their account.
 2017-05-05 16:30:18 +01:00