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
05e479a76c
Use then() chaining rather than manual callbacks
2016-03-16 10:59:40 +00:00
fe9816abf5
Merge pull request #1163 from vector-im/markjh/cleanup
...
Remove trailing whitespace
2016-03-16 10:52:12 +00:00
29815b1d13
try a new message tone
2016-03-16 00:54:43 +00:00
cb45db36c2
use new start_login_from_guest dispatch for cancellable logins from guest accounts
2016-03-15 21:02:25 +00:00
31915db6f6
Remove trailing whitespace
2016-03-15 18:38:24 +00:00
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
2a8afd49fb
mx_Login_fieldLabel CSS
2016-03-15 18:09:54 +00:00
9b85d88036
s/somme/some/
2016-03-15 15:23:18 +00:00
c2049e991b
padding for radio buttons on login pages
2016-03-15 13:37:07 +00:00
3224a4e49e
Add helper functions for decoding and encoding lists of push actions
2016-03-15 11:26:32 +00:00
cfc4b89225
fix https://github.com/vector-im/vector-web/issues/1154
2016-03-15 10:56:54 +00:00
8b1444c954
Port the legacy im.vector rules to the new format on startup
2016-03-15 10:49:10 +00:00
d4d2ef326e
Bump to dev branch of js-sdk
2016-03-14 15:54:56 +00:00
2a62fdb652
Switch back to dev version of react-sdk
2016-03-14 14:08:47 +00:00
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
da7e9840f3
reinstate npm 3 warning
2016-03-11 15:12:28 +00:00
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
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
8fa059fc4b
Prep 0.3.0
2016-03-11 13:00:31 +00:00
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
e777db3fc4
Add setting for audio notifications
...
Expose the enableAudioNotifications setting in the user settings panel.
2016-03-10 11:01:29 +00:00
a4d22ffe8c
improve IS warning
2016-03-06 17:11:08 -05:00
622a4b0e4c
improve cosmetics of login prompts slightly
2016-03-06 13:46:27 -05:00
7433f50c8c
make settings button always visible
2016-03-04 23:16:36 +00:00
9c82938b35
Merge pull request #1100 from vector-im/audio_notifications
...
Add audio tag for message notifications
2016-03-04 17:54:57 +00:00
4e3985d446
Merge pull request #1102 from vector-im/dbkr/reenable_upgrade_registration
...
Re-enable upgrade registration.
2016-03-04 17:54:47 +00:00
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
0343bd1022
Merge pull request #1098 from ajohnson23/audio_notifications
...
Added audio/source tags for message notifications.
2016-03-04 15:27:54 +00:00
b75cb3c6cb
Added audio/source tags for message notifications.
...
Signed-off-by: Andrew Johnson <ajohnson@draster.com>
2016-03-04 10:23:13 -05:00
2586280f2c
add opera
2016-03-03 15:31:08 +00:00
516647ad04
fix placeholder opacity on moz
2016-03-03 15:31:02 +00:00
04fb8f9a81
de-kegan the CompatibilityPage :(
2016-03-03 15:22:12 +00:00
52f259ccfa
explicit fg color for MessageComposer
2016-03-03 15:08:13 +00:00
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
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
b03e6a8d73
add comment explaining data passing hack
2016-03-02 14:34:31 +00:00
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
332354e5b6
Uncommit 71cb04c50a (I failed to branch)
2016-03-02 14:23:20 +00:00
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
3b2d0a6c01
Fix up reading the push rules
2016-02-29 16:56:33 +00:00
731d94eea4
Update the actions of default rules instead of overriding.
...
The Matrix CS API, and synapse now supports setting the actions for default
rules. Doing that makes managing the rules much simpler from a vector
persepctive since the ON/LOUD/OFF toggle buttons can be implemented by
setting the actions and enabling/disabling the default rules rather than
overidding them.
Overriding the default rules was difficult because it was not possible
to intermingle the evaluation of user-specified rules with the default
rules. So even though you could add a rule with the same conditions as a
default rule, it would evaluate before *all* the other default rules.
Also creating new rules under a im.vector namespace creates challenges
if we want vector to cooperate with other matrix clients that want to
provide a similar set of toggle switches for the push rules.
2016-02-26 20:51:16 +00:00
c3b819b4da
fix the version and improve changelog
2016-02-25 20:12:57 +01:00
c4b4f5a44a
Merge remote-tracking branch 'origin/master' into develop
2016-02-25 17:32:59 +00:00
21410354ab
Merge branch 'rav/jenkins_build' into develop
2016-02-25 16:59:44 +00:00
de50518282
s/version.txt/git-revision.txt/
2016-02-25 16:57:34 +00:00
025a026f45
Use js-sdk and react-sdk from jenkins artifacts
2016-02-25 15:31:04 +00:00
49525f22c2
Changelog
2016-02-25 12:10:30 +00:00
642c33e8d9
Mention package script in readme
2016-02-25 10:47:09 +00:00
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
Mark Haines