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

1415 Commits

Author SHA1 Message Date
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
Matthew Hodgson 04fb8f9a81 de-kegan the CompatibilityPage :( 2016-03-03 15:22:12 +00:00
Matthew Hodgson 52f259ccfa explicit fg color for MessageComposer 2016-03-03 15:08:13 +00:00
Matthew Hodgson f89fe4fff8 when we set an explicit form foreground colour, set an explicit background one too to prevent system-level dark themes on Linux etc making the foreground text unreadable 2016-03-03 14:37:11 +00:00
David Baker adb6ab311c Merge pull request #1069 from vector-im/dbkr/directory_room_metadata 
Display room metadata from room previews when we come from the public room directory
 2016-03-02 14:35:29 +00:00
David Baker b03e6a8d73 add comment explaining data passing hack 2016-03-02 14:34:31 +00:00
David Baker 2271ec7634 Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS) 2016-03-02 14:24:00 +00:00
David Baker 332354e5b6 Uncommit 71cb04c50a (I failed to branch) 2016-03-02 14:23:20 +00:00
David Baker 71cb04c50a Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS) 2016-03-02 14:21:32 +00:00
Matthew Hodgson c3b819b4da fix the version and improve changelog 2016-02-25 20:12:57 +01:00
Richard van der Hoff c4b4f5a44a Merge remote-tracking branch 'origin/master' into develop 2016-02-25 17:32:59 +00:00
Richard van der Hoff 21410354ab Merge branch 'rav/jenkins_build' into develop 2016-02-25 16:59:44 +00:00
Richard van der Hoff de50518282 s/version.txt/git-revision.txt/ 2016-02-25 16:57:34 +00:00
Richard van der Hoff 025a026f45 Use js-sdk and react-sdk from jenkins artifacts 2016-02-25 15:31:04 +00:00
David Baker 49525f22c2 Changelog 2016-02-25 12:10:30 +00:00
David Baker 642c33e8d9 Mention package script in readme 2016-02-25 10:47:09 +00:00
David Baker fa322e8488 Auto-create a sensible version file. Copy the vector dir so we can put it in there rather than creating files in the main vector dir. 2016-02-24 18:59:33 +00:00
David Baker 874123bbfa Move package script out and make it tar into a versioned top level directory. It may as well be a shell script since it's unix specific anyway, and maintaining it inside package.json is now impractical. 2016-02-24 18:41:30 +00:00
David Baker b088651211 Use the --tags option so it works with non-annoated tags (seriously, git?) 2016-02-24 15:05:13 +00:00
David Baker a69c63cc60 Master is no longer stale. 2016-02-24 14:25:34 +00:00
David Baker 04b51f6f0f Merge branch 'develop' 2016-02-24 14:24:57 +00:00
David Baker ebd5399626 Bump to version 0.2.0 2016-02-24 14:24:15 +00:00
David Baker 5d63d2269e Use newly released versions of js-sdk & react-sdk 2016-02-24 14:21:53 +00:00
David Baker ef00bc6d56 Manually merge relevant remaining parts of https://github.com/vector-im/vector-web/pull/790 that aren't covered by @richvdh's PR. 2016-02-24 11:59:29 +00:00
David Baker 8e25a4ca36 Merge pull request #999 from vector-im/dbkr/more_readme_foolproofing 
Make the README more idiot-proof
 2016-02-24 11:50:13 +00:00
David Baker 1ecedd2769 Add back deployment info 2016-02-24 11:48:51 +00:00
David Baker 9c9e260410 Make the README more idiot-proof 2016-02-24 11:36:57 +00:00
David Baker 3f9f3e9d92 Merge pull request #998 from vector-im/rav/fix_the_sodding_deployment_instructions 
Update the README to give clearer dev instructions
 2016-02-24 11:24:48 +00:00
Richard van der Hoff ca89c09e73 formatting 2016-02-23 21:00:27 +00:00
Richard van der Hoff 10f6277de2 Update the README to make the development instructions clearer 2016-02-23 20:55:37 +00:00
David Baker acb443537a Merge pull request #997 from vector-im/dbkr/fix_new_room_crash 
Sender can be null, so null check.
 2016-02-23 18:12:42 +00:00
David Baker 55c7c08ac2 Sender can be null, so null check. 2016-02-23 17:59:13 +00:00
Richard van der Hoff 72393bf75f Merge branch 'rav/read_marker' into develop 2016-02-23 17:57:50 +00:00
David Baker 497cb8bc9c Merge pull request #993 from vector-im/dbkr/keypair_3pid_invites 
Pass through params for other URLs
 2016-02-23 11:08:28 +00:00