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

1850 Commits

Author SHA1 Message Date
Matthew Hodgson 3339fa2a39 Merge pull request #1232 from vector-im/matthew/permalink 
permalink button
 2016-03-21 15:39:03 +00:00
Matthew Hodgson d4a36f5081 permalink button 2016-03-19 23:26:04 +00:00
Matthew Hodgson 19cb06d040 prop fix 2016-03-18 20:08:31 +00:00
Richard van der Hoff a5e0aa763b Bump gemini-scrollbar version 
To fix scrollbar fail thanks to npm's lack of dependency-version conflict
resolution.
 2016-03-18 16:34:20 +00:00
Matthew Hodgson a1e3cf76e1 top-align search results 2016-03-18 16:24:48 +00:00
Matthew Hodgson 866bd55bc3 give notif bar a pointer cursor 2016-03-18 16:16:13 +00:00
Matthew Hodgson a6257a1148 show right panel if needed when viewing users 2016-03-18 16:09:00 +00:00
Matthew Hodgson 92e187da64 fix ugly spinner on MemberList 2016-03-17 18:44:53 +00:00
Matthew Hodgson f950b675bd workaround to avoid accidental click-throughs on narrow vertical scrollbars 2016-03-17 18:26:00 +00:00
Matthew Hodgson aca4457a89 apparently we don't need a default onClick 2016-03-17 17:00:58 +00:00
Matthew Hodgson 725b9a6619 Merge pull request #1191 from vector-im/matthew/insert-displayname 
make senderprofiles clickable
 2016-03-17 16:59:03 +00:00
Matthew Hodgson d7a851a353 make senderprofiles clickable 2016-03-17 16:28:49 +00:00
Matthew Hodgson c6f95dfb3b Merge pull request #1180 from vector-im/matthew/fix-notif-spam 
fix notif spam when logging in from a guest session by correctly logging out first.
 2016-03-17 14:37:21 +00:00
Matthew Hodgson 4164688c24 add pointer to EventTile 2016-03-17 13:09:28 +00:00
Matthew Hodgson cddfa62e27 reorder the push settings as off, on, loud - fixes https://github.com/vector-im/vector-web/issues/1117 2016-03-17 02:24:48 +00:00
Matthew Hodgson a6e3b39f16 fix notif spam on launch by correctly logging out again. reverts start_login_from_guest stuff 2016-03-17 02:08:05 +00:00
Matthew Hodgson f8fb3a7fe1 fix aspect ratio of roomavatar preview 2016-03-16 20:00:50 +00:00
Matthew Hodgson 50d18ac771 Merge pull request #1165 from vector-im/matthew/cancellable-upgrade 
use new start_login_from_guest dispatch for cancellable logins from guest accounts
 2016-03-16 14:37:50 +00:00
Mark Haines 1e0c4d8797 Merge pull request #1171 from vector-im/markjh/cleanup_promise 
Use then() chaining rather than manual callbacks
 2016-03-16 11:16:06 +00:00
Mark Haines 05e479a76c Use then() chaining rather than manual callbacks 2016-03-16 10:59:40 +00:00
Mark Haines fe9816abf5 Merge pull request #1163 from vector-im/markjh/cleanup 
Remove trailing whitespace
 2016-03-16 10:52:12 +00:00
Matthew Hodgson 29815b1d13 try a new message tone 2016-03-16 00:54:43 +00:00
Matthew Hodgson cb45db36c2 use new start_login_from_guest dispatch for cancellable logins from guest accounts 2016-03-15 21:02:25 +00:00
Mark Haines 31915db6f6 Remove trailing whitespace 2016-03-15 18:38:24 +00:00
Mark Haines eb01cb9cba Merge pull request #1037 from vector-im/markjh/change_push_actions 
Update the actions of default rules instead of overriding.
 2016-03-15 18:10:04 +00:00
Matthew Hodgson 2a8afd49fb mx_Login_fieldLabel CSS 2016-03-15 18:09:54 +00:00
Mark Haines 9b85d88036 s/somme/some/ 2016-03-15 15:23:18 +00:00
Matthew Hodgson c2049e991b padding for radio buttons on login pages 2016-03-15 13:37:07 +00:00
Mark Haines 3224a4e49e Add helper functions for decoding and encoding lists of push actions 2016-03-15 11:26:32 +00:00
Matthew Hodgson cfc4b89225 fix https://github.com/vector-im/vector-web/issues/1154 2016-03-15 10:56:54 +00:00
Mark Haines 8b1444c954 Port the legacy im.vector rules to the new format on startup 2016-03-15 10:49:10 +00:00
Richard van der Hoff d4d2ef326e Bump to dev branch of js-sdk 2016-03-14 15:54:56 +00:00
Richard van der Hoff 2a62fdb652 Switch back to dev version of react-sdk 2016-03-14 14:08:47 +00:00
Richard van der Hoff 6215326f8e Merge pull request #1137 from vector-im/rav/update_README 
Update README to include `npm install` in react-sdk
 2016-03-14 12:48:58 +00:00
Richard van der Hoff da7e9840f3 reinstate npm 3 warning 2016-03-11 15:12:28 +00:00
Richard van der Hoff cc18458bec Update README to include `npm install` in react-sdk 
Casual users of /develop shouldn't need to do the whole
clone-three-repositories thing.
 2016-03-11 15:09:29 +00:00
Richard van der Hoff 928915873b Use npm to fetch react-sdk and js-sdk 
After some discussion, we've agreed it's less evil to have package.json point
to git develop, even if you then have to do a manual build step. That avoids
any future problems where (for example) js-sdk develop gains experimental
changes which would break for users using a build process which involves a
manual git checkout.
 2016-03-11 14:30:53 +00:00
Richard van der Hoff 8fa059fc4b Prep 0.3.0 2016-03-11 13:00:31 +00:00
Richard van der Hoff 33b7e2046d Merge pull request #1123 from vector-im/rav/mute_desktop_notifs 
Add setting for audio notifications
 2016-03-10 14:19:05 +00:00
Richard van der Hoff e777db3fc4 Add setting for audio notifications 
Expose the enableAudioNotifications setting in the user settings panel.
 2016-03-10 11:01:29 +00:00
Matthew Hodgson a4d22ffe8c improve IS warning 2016-03-06 17:11:08 -05:00
Matthew Hodgson 622a4b0e4c improve cosmetics of login prompts slightly 2016-03-06 13:46:27 -05:00
Matthew Hodgson 7433f50c8c make settings button always visible 2016-03-04 23:16:36 +00:00
David Baker 9c82938b35 Merge pull request #1100 from vector-im/audio_notifications 
Add audio tag for message notifications
 2016-03-04 17:54:57 +00:00
David Baker 4e3985d446 Merge pull request #1102 from vector-im/dbkr/reenable_upgrade_registration 
Re-enable upgrade registration.
 2016-03-04 17:54:47 +00:00
David Baker d732927dba Re-enable upgrade registration. 
Revert https://github.com/vector-im/vector-web/issues/818 now that https://github.com/vector-im/vector-web/issues/759 is fixed.
 2016-03-04 15:42:22 +00:00
David Baker 0343bd1022 Merge pull request #1098 from ajohnson23/audio_notifications 
Added audio/source tags for message notifications.
 2016-03-04 15:27:54 +00:00
Andrew Johnson b75cb3c6cb Added audio/source tags for message notifications. 
Signed-off-by: Andrew Johnson <ajohnson@draster.com>
 2016-03-04 10:23:13 -05:00
Matthew Hodgson 2586280f2c add opera 2016-03-03 15:31:08 +00:00
Matthew Hodgson 516647ad04 fix placeholder opacity on moz 2016-03-03 15:31:02 +00:00