OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
62,694 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

62694 Commits (e3f8a7b13d7feda2b1ed5ceeb7ab926b2bd9542c)

Author SHA1 Message Date
wmwragg d2391f999e Adding back in .DS_Store, but to ignore in any directory 2016-07-14 10:42:39 +01:00
wmwragg e1779ca8bc Deleteing .DS_Store files before adding to gitignore 2016-07-14 10:41:41 +01:00
David Baker a5272542ef Lengthen timelinepanel test timeout again 
It's now hitting this timeout on the jenkins box instead of the browser disconnect timeout
 2016-07-14 10:40:12 +01:00
Kegsay 20210e7104 Log scrollTop and scrollHeight to try to debug flakey test 
Sometimes it fails because awaitScroll() on :277 isn't resolving because onScroll isn't firing. We need to know if this is because we aren't changing scrollTop
 2016-07-14 10:38:24 +01:00
David Baker ec70a08b93 Merge pull request #340 from matrix-org/dbkr/memberlist_listen_all_presence 
Listen for the new lastPreseceTs event
 2016-07-14 10:36:08 +01:00
wmwragg 65371c9a39 Adding ignoring of mac .DS_Store files to all directories 2016-07-14 10:32:30 +01:00
wmwragg a4dc844338 Added truetype font fallback for browsers that don't support WOFF2 format, i.e. safari 2016-07-14 10:24:16 +01:00
David Baker 2d6d734571 Listen for the new lastPreseceTs event 
This will catch all presence events as previously we were only listening for the actual presence string changing
 2016-07-14 10:05:40 +01:00
wmwragg 7f00053f84 Footer upload icon updated to new vesrion 2016-07-13 17:46:56 +01:00
wmwragg 0a4af647c8 Header and footer buttons updated to new versions 2016-07-13 17:46:07 +01:00
wmwragg 936a38a9f4 Updated and moved the room header settings icon 2016-07-13 16:02:18 +01:00
wmwragg 503bf541c7 Tweak to the close button css to keep the close button inline with the search box 2016-07-13 14:34:20 +01:00
wmwragg 1fbc249de5 Updated Filter room icon 2016-07-13 14:23:46 +01:00
wmwragg 959dcd0c49 Updated BottomLeftMenu buttons to the new ones 2016-07-13 14:10:44 +01:00
wmwragg ef4f2f10d9 Updated that RightPanel members icon, highlight and numbers 2016-07-13 13:56:59 +01:00
David Baker 95529df7a3 Merge pull request #339 from matrix-org/dbkr/search_by_user_id 
Fix filtering user list by ID
 2016-07-13 13:17:22 +01:00
David Baker 6b03f72474 Fix filtering user list by ID 
Fixes https://github.com/vector-im/vector-web/issues/1739
 2016-07-13 11:56:01 +01:00
David Baker 19dbd85d44 Merge pull request #1766 from vector-im/rav/use_right_olm 
webpack: always use the olm from vector-web
 2016-07-13 09:48:08 +01:00
Richard van der Hoff ef4b604caf webpack: always use the olm from vector-web 
Fixes an error when matrix-js-sdk is symlinked into node_modules, which meant
that we would (try to) use the version of olm from js-sdk instead of
vector-web (https://github.com/vector-im/vector-web/issues/1765).
 2016-07-12 23:10:53 +01:00
Richard van der Hoff da8f7df262 Merge pull request #338 from matrix-org/dbkr/fix_tab_complete_on_load 
Update tab completion list when we have a room
 2016-07-12 18:58:39 +01:00
David Baker ac58520b3b Update tab completion list when we have a room 
Fixes https://github.com/vector-im/vector-web/issues/1737
 2016-07-12 18:30:37 +01:00
Aviral Dasgupta 74f459f8a4 feat: bump emoji-body font-size down to 48px 2016-07-12 20:37:51 +05:30
Matthew Hodgson a8677b52ad major update to dev guidelines 2016-07-11 18:26:16 +01:00
Matthew Hodgson fef81748bb major update to dev guidelines 2016-07-11 18:25:58 +01:00
David Baker e00f3d9334 Mark code blocks as javascript 2016-07-11 16:28:41 +01:00
David Baker 513492e1bf Change line length as per PR discussion 2016-07-11 16:27:17 +01:00
David Baker a28a335df4 More newlines for formatting 2016-07-11 16:21:21 +01:00
David Baker 8d1d37c103 Try newline to fix code style formatting 2016-07-11 16:19:14 +01:00
Richard van der Hoff 3e53879adc Bump to olm 1.0.0 
Fixes https://github.com/vector-im/vector-web/issues/1719
 2016-07-11 14:53:51 +01:00
David Baker 4056ee7f14 Merge pull request #330 from matrix-org/dbkr/code_style 
JS code style guide
 2016-07-11 14:27:21 +01:00
David Baker ffbe045fcc Change to const-by-default 2016-07-11 10:10:51 +01:00
David Baker 30cfc6b605 Error if email already in use when resetting pw 
Use password reset specific requestToken
 2016-07-08 18:06:50 +01:00
David Baker 8e8e54a3bf Update function name as per js-sdk PR feedback 2016-07-08 17:53:06 +01:00
David Baker b78340ff51 Use HS proxy API for requestToken on adding email 
So we report an error if the email is already taken. Also fix a bug where the spinner wouldn't disappear if adding an email failed (and don't include the raw errcode in the user-facing dialog)
 2016-07-08 17:28:04 +01:00
David Baker 0fdc2d817c mark as jsx 2016-07-08 15:59:34 +01:00
David Baker 1a3bc814e1 clarify event handlers 2016-07-08 15:58:18 +01:00
David Baker afa6acc20a All the trailing commas 2016-07-08 15:42:42 +01:00
David Baker 6d403e792b Add --stage 1 to babel cmdline 
So we can use trailing function commas. The trailing comma proposal is actually at stage 3 now and there's a babel 6 plugin for it, which  we should use when we switch back to babel 6.
 2016-07-08 15:29:59 +01:00
Aviral Dasgupta b334522168 feat: code cleanup & emoji replacement in composer 2016-07-08 12:54:28 +05:30
David Baker e6ff1f8836 Merge pull request #334 from matrix-org/dbkr/error_on_email_registered 
Error on registration if email taken
 2016-07-07 13:03:58 +01:00
David Baker 345ed04ba9 Less enetering 2016-07-07 13:03:27 +01:00
David Baker 04728ae03b PR fixes + more general notes 2016-07-07 12:09:02 +01:00
David Baker a6b04c462e Comment how we're remembering form vals 2016-07-07 11:26:35 +01:00
David Baker 5c879d786e Doc the default params / guestUsername props 2016-07-07 11:23:08 +01:00
David Baker e2c473b366 Error on registration if email taken 
Use the new register-specific request token endpoint (https://github.com/matrix-org/matrix-js-sdk/pull/147) and catch the error that it gives if the email is already in use. Also add initial values to the registration form so we can reload it after the error without all the values disappearing, and split out the guest username parameter which was previously called defaultUsername.
 2016-07-06 15:22:06 +01:00
David Baker a2b64798f7 Fix timelinepanel test timeout 
The previous fix was adjusting the wrong timeout: it's hitting browserNoActivityTimeout, so revert previous fix & do this instead
 2016-07-05 14:35:34 +01:00
David Baker 63ad57a8d4 Merge pull request #332 from aviraldg/feature-emojione 
feat: render unicode emoji as emojione images
 2016-07-05 10:18:33 +01:00
David Baker 145e61b00f Merge pull request #1718 from aviraldg/feature-emojione 
feat: large emoji support
 2016-07-05 10:08:15 +01:00
David Baker 22ae60fb45 Merge pull request #333 from aviraldg/feature-img-data 
feat: unblacklist img tags with data URIs
 2016-07-05 09:59:20 +01:00
Aviral Dasgupta 545d59769e feat: unblacklist img tags with data URIs 
fixes vector-im/vector-web#1692
 2016-07-05 11:16:09 +05:30