b2459b2dc6
Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte
2016-06-10 04:43:06 +05:30
819e06e2cd
MessageComposer styling for Draft
2016-06-10 04:41:59 +05:30
a030e46c69
Use join_room_by_alias in RoomDirectory
...
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
2016-06-09 17:13:02 +01:00
f61cfbc542
Fix RoomDirectory to join by alias whenever possible.
2016-06-09 16:41:01 +01:00
c4b7571c45
Merge pull request #1612 from vector-im/dbkr/optional_config
...
Make the config optional
2016-06-09 10:40:58 +01:00
4dd477e064
index.js: fix comment typo
...
Fix dave's typo for him
2016-06-09 10:38:51 +01:00
f595f6f141
This check shouldn't be here with the ||
2016-06-09 10:25:49 +01:00
24602119c5
This doesn't actually need to be global
...
(because the rendering isn't in a render method here)
2016-06-09 09:59:37 +01:00
3040d0a474
Comment typo
2016-06-09 09:57:44 +01:00
e4ea00ca23
Return here, else we'll call resolve too
2016-06-09 09:56:57 +01:00
4fc311da90
Style fix
2016-06-09 09:56:11 +01:00
7894e52529
Merge pull request #1610 from vector-im/rav/device_verification
...
CSS support for device verification
2016-06-08 21:37:35 +01:00
f6aa9a7ea4
Make the config optional
...
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
2016-06-08 18:46:21 +01:00
5f29729e82
Make unverified encrypted events red and verified ones green
2016-06-08 17:03:54 +01:00
e24851456a
CSS for the MemberDeviceInfo view
2016-06-08 17:03:28 +01:00
1e40fd750f
Don't use SdkConfig
...
instead take brand from a prop
2016-06-08 14:55:47 +01:00
ed1554f4af
index.js: fix wording in android popup
2016-06-07 22:01:56 +01:00
c6cf5febd5
Merge pull request #1516 from vith/static-config-json
...
serve config.json statically instead of bundling it
2016-06-06 19:15:35 +01:00
f9aaf7d903
Use the SdkConfig interface
...
rather than pulling in config.json directly.
json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
2016-06-06 19:13:30 +01:00
a2e73cceee
Merge branch 'develop' into matthew/scalar
2016-06-06 10:24:39 +01:00
d976046e6a
set email branding whenever emails are added from vector
2016-06-02 13:15:13 +01:00
12157edd62
Style selection color
2016-05-28 12:20:21 +05:30
7e563b89c7
initial version of rich text editor
2016-05-27 10:17:01 +05:30
6a6118e136
serve config.json statically instead of bundling it
...
issue #1344
2016-05-24 19:08:09 -05:00
bede9a814b
remove spurious top border; fix #1472
2016-05-24 00:30:36 +01:00
d70842c3c7
fix padding of badges
2016-05-24 00:29:48 +01:00
a288c5b85d
fix padding of badges
2016-05-20 12:21:45 +01:00
c4d408d095
CSS for IntegrationsManager
2016-05-18 17:02:39 +01:00
ac24d6707f
Add integs mgt
2016-05-18 15:02:03 +01:00
e5835d2731
typo
2016-05-18 15:01:36 +01:00
d8c32db14b
typos
2016-05-17 20:24:01 +01:00
2b3606d44d
switch to lozenges, and improve overlap behaviour
2016-05-17 19:52:56 +01:00
5feb31911a
better collapsed look & feel
2016-05-17 11:19:04 +01:00
9483e42508
switch from dots to per-room badges
2016-05-17 11:14:30 +01:00
e640f65640
add close button to room search filter
2016-05-16 23:36:52 +01:00
8a9c85c97d
fix wording
2016-05-16 23:00:17 +01:00
bc166f19b7
Fix NPE when loading the Settings page which infini-spinnered
2016-05-16 16:04:06 +01:00
8fb521c83c
302 android to play store
2016-05-13 17:14:01 +01:00
d9077584cd
Merge branch 'dbkr/email_notifs' into develop
2016-05-13 15:16:35 +01:00
8467d5d760
302 to iTunes if you don't have the app installed
2016-05-11 01:48:02 +02:00
9cd8f7c7f3
Merge pull request #1469 from vector-im/dbkr/email_notifs
...
Add option to enable email notifications
2016-05-10 16:39:50 +02:00
c64f71a3cb
refine memberlist cosmetics
2016-05-05 00:35:47 +01:00
af9838408b
s/devices/notification targets/
2016-05-04 11:58:37 +01:00
974a187e74
fix annoying bug where URL previews with very long lines (e.g. vector permalinks) would get clipped
2016-05-03 17:49:42 +01:00
efe1c767f0
Un-inline onChange
2016-05-03 11:36:44 +01:00
a72d0c5b7f
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-21 10:17:15 +01:00
3cb092051e
Merge branch 'develop' into dbkr/email_notifs
2016-04-21 10:11:55 +01:00
02f58ef9e3
Don't relayout scrollpanels every time something changes
...
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
2016-04-20 12:29:32 +01:00
a0b460b084
Include react-addons-perf for non-production builds
...
This makes it possible to gather a few performance stats
2016-04-19 15:01:24 +01:00
aeb438dc62
fix tbody & keying warnings
2016-04-17 17:44:04 +01:00
10a053019d
fix thinkos - thanks @richvdh for posthoc review
2016-04-17 17:35:17 +01:00
58c431abc2
fix spinner layout bouncing when changing notifs
...
all-important s/done/then/ on pushRulesPromise to ensure that the refresh completes before relaying-out the page
s/Loud/Highlight & sound/
2016-04-17 14:00:20 +01:00
d512e25cca
persist search filter over being hidden
2016-04-17 00:28:33 +01:00
65d9333104
pointer on roomsublist
2016-04-16 23:49:21 +01:00
fbd974df55
fix bottomleft bug in chrome canary
2016-04-16 23:49:16 +01:00
fdf83a5ad5
fix tooltip offset
2016-04-15 22:24:20 +01:00
c98e06e1aa
add cancelButton to simpleHeader
2016-04-15 22:16:06 +01:00
b58265a69c
fix comedy FontAwesome bug
2016-04-15 21:48:09 +01:00
37fbad0dbe
fix LeftPanel width in FF
2016-04-15 21:37:52 +01:00
756da03b9a
fix wrapping of RoomTile when selected
2016-04-15 20:50:22 +01:00
48e082e124
Merge pull request #1402 from vector-im/matthew/design_tweaks
...
Matthew/design tweaks
2016-04-15 18:48:30 +01:00
c606912a8d
fix topic font size
2016-04-15 18:45:52 +01:00
7cd24e7dbd
commented out fading for RoomDirectory
2016-04-15 18:29:57 +01:00
c7d717f0a4
fix RightPanel
2016-04-15 18:29:49 +01:00
cf3cdaccf3
fix up UserSettings a bit
2016-04-15 18:23:47 +01:00
d0d4760ddc
align highlight with droptarget RHS
2016-04-15 18:09:10 +01:00
51bc18aef0
prettier icon
2016-04-15 18:05:57 +01:00
26d12bebe4
wire up searchbox filtering, and some minor overall tweaks
2016-04-15 17:54:48 +01:00
90ae024a4e
tidy up rightpanel and searchbox
2016-04-15 15:53:27 +01:00
eab206c3bd
Improve handling of notification rules we can't parse
...
* An absent rule is the same as a rule with 'enabled == false', and is not
necessarily 'OFF' (particularly in the case of the bot rule, which is
inverted).
* If we don't understand the rule, then don't tick any of the radio buttons,
and instead show it in the 'external' section.
2016-04-15 12:42:03 +01:00
72745b05dc
forgotten CSS
2016-04-15 10:49:25 +01:00
f8d5101dbc
add lost SVGs and implement SearchBox skeleton
2016-04-15 02:23:12 +01:00
cc1e30c963
dinkier topic
2016-04-15 01:42:44 +01:00
121fe34180
Improve parsing of keyword notification rules
...
For notification rules, the absence of a value on a 'highlight' tweak means
that the highlight should happen; this was previously confusing us.
Use the action parser from NotificationUtils to simplify the code.
Fixes https://github.com/vector-im/vector-web/issues/1330
2016-04-14 22:45:00 +01:00
5450223cc7
More notifications fixes
...
Fix another thing I broke during the refactor
2016-04-14 22:31:40 +01:00
25b5c14527
fix new bottomleft menu
2016-04-14 22:26:48 +01:00
6bc4c87ce4
update to new bottomleftmenu. update header and composer heights
2016-04-14 21:43:49 +01:00
0f0c3d0ca1
Merge branch 'rav/more_refactor_notifications' into develop
2016-04-14 21:27:34 +01:00
96c4a24d3d
skin RoomSubList chevrons, horizontal rules and selected room
2016-04-14 21:10:55 +01:00
c6b501811f
Move more stuff out of Notifications.js
2016-04-14 19:54:03 +01:00
0996a0b140
Fixes to refactored notifications
...
A few things I managed to break in the recent refactor
2016-04-14 19:54:03 +01:00
8557a3b70e
fix vertical alignment within status bar
2016-04-14 19:15:35 +01:00
8b6cf1fc41
change badge look & feel; change status bar sizing
2016-04-14 19:11:58 +01:00
4eb762d52b
spell out that images are clickable
2016-04-14 18:16:03 +01:00
4d221c6099
spell out that images are clickable
2016-04-14 18:15:51 +01:00
b6d5849bec
Merge pull request #1386 from vector-im/rav/refactor_notifications
...
Start Notifications component refactor
2016-04-14 14:29:11 +01:00
035b15f330
Moar debug for ff session restore issue
2016-04-13 22:18:26 +01:00
77355cbeb4
Add some debug to help with FF restore bug
...
(https://github.com/vector-im/vector-web/issues/1354 )
2016-04-13 21:01:24 +01:00
ff5dff45f5
Start Notifications component refactor
...
Factor some things out of the mega Notifications component, and add a dummy
unit test to show willing
2016-04-13 18:44:41 +01:00
50f94eb040
stop guests rom trying to blunder into non-guest rooms
2016-04-13 13:33:23 +01:00
5794c30def
Devices should be below 'advanced'
2016-04-13 11:35:53 +01:00
b5248c06a7
fix https://github.com/vector-im/vector-web/issues/987 for once and for all
2016-04-13 00:34:32 +01:00
18bd1058d3
Merge pull request #1376 from vector-im/matthew/fadable
...
make the UI fadable to help with decluttering
2016-04-12 18:04:47 +01:00
b18fcf7f9e
spinner on saving room settings
2016-04-12 18:02:31 +01:00
05e963d1e2
make the UI fadable to help with decluttering
2016-04-12 17:17:08 +01:00
5d9c8f3726
Support config for email notifs
...
Add support to notif settings for adding an email pusher, only for the first email address for now.
2016-04-12 16:19:20 +01:00
be55882f46
Merge pull request #1374 from vector-im/dbkr/get_pushers
...
Get and display a user's pushers in settings
2016-04-12 14:41:45 +01:00
356a4a4392
Typo and use CSS rather than <i>
2016-04-12 14:10:17 +01:00
34bdd40953
timestamps are permalinks
2016-04-12 13:34:10 +01:00
c5524851f3
Comment future possibility for deleting pushers
2016-04-12 13:22:58 +01:00
cff1c3010b
Get & display pushers in settings
...
Really this is so (in a subsequent PR) we can show whether a user has an email pusher, but we can basically display the list of pushers for free, so adding this too.
2016-04-12 13:18:57 +01:00
46572ae793
click on group call thumbnail should return you to the group call, not the 1:1
2016-04-12 02:27:35 +01:00
b1ba69fd00
fix lightbox overscroll
2016-04-12 00:35:00 +01:00
8c619fedeb
Merge pull request #1343 from vector-im/matthew/preview_urls
...
URL previewing support
2016-04-11 23:55:18 +01:00
efd01d6929
move localstorage crap entirely to TextualBody
2016-04-11 23:54:00 +01:00
a1b78f93fe
Fix wrap on view source
2016-04-10 14:18:57 +01:00
cdc89c0623
add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback
2016-04-08 21:42:42 +01:00
d107151f8a
rename `size` prop as `fileSize`, add comments, and honour explicit properties rather than mxEvent fields
2016-04-07 18:10:15 +01:00
41373f30f7
oops, name LinkPreviewWidget correctly
2016-04-04 00:33:15 +01:00
ad9d032f82
fix typo introduced in #1340
2016-04-04 00:17:50 +01:00
d7eb23db53
specify sizes and hyperlinks for non-event images
2016-04-04 00:16:52 +01:00
333f1e46ca
document properties and remove spurious 'view full screen' button
2016-04-03 23:57:44 +01:00
d414127f80
track whether widget should be hidden on the event, as well as persisting it in localStorage
2016-04-03 23:31:42 +01:00
ff2885087d
support cancelling and uncancelling previews
2016-04-03 02:50:51 +01:00
a5258978d6
Merge branch 'develop' into matthew/preview_urls
2016-04-03 02:07:03 +01:00
8c0a23dd8b
fix widget layout
2016-04-03 02:06:24 +01:00
d434ea55a8
Merge pull request #1332 from aviraldg/feature-emoji
...
😄 Emoji autocomplete and unicode emoji to image conversion using emojione.
2016-04-02 23:21:31 +01:00
cf17ea6254
Show full-size avatar on MemberInfo avatar click
...
fixes vector-im/vector-web#65
2016-04-03 00:53:17 +05:30
8247bb4a76
match style for markdown quotes
2016-04-02 00:36:53 +01:00
08a41bf093
improve layout for LinkPreviewWidget
2016-04-01 02:16:29 +01:00
d7157696f4
styling for emojione emojis 😄
2016-04-01 06:22:13 +05:30
512a9125bf
fix zalgos in SenderProfile again, whilst maintaining limited-width name via inline-block. and without doubling emote vertical space...
2016-03-30 19:47:06 +01:00
bdf8f655fb
tweak animation and comment it out for now as it maxes out a whole core on my top-of-the-line MBP...
2016-03-30 01:36:44 +01:00
8603dd4bb4
Merge pull request #1292 from aviraldg/feature-pretty-placeholder
...
Prettier, animated placeholder :D
2016-03-30 01:28:34 +01:00
e15358f77e
Merge pull request #1307 from vector-im/rav/SimpleRoomHeader
...
RoomDirectory: use SimpleRoomHeader instead of RoomHeader
2016-03-29 23:26:09 +01:00
851b601d2c
Pass SimpleRoomHeader topic in as a named prop
2016-03-29 23:25:26 +01:00
0ddb2cf183
fix action vertical spacing
2016-03-29 17:10:11 +01:00
cf0340c1c7
RoomDirectory: use SimpleRoomHeader instead of RoomHeader
...
SimpleRoomHeader and RoomHeader are now separate things
(https://github.com/matrix-org/matrix-react-sdk/pull/252 ), so update Vector
accordingly.
2016-03-29 16:45:24 +01:00
6c5b4a298b
Prettier, animated placeholder :D
2016-03-28 19:32:04 +05:30
b6e4c59877
Merge pull request #1249 from vector-im/dbkr/disable_composer_if_no_permission
...
CSS for https://github.com/matrix-org/matrix-react-sdk/pull/247
2016-03-24 11:44:16 +00:00
0bc1624d4e
make senderprofile smaller
2016-03-24 01:19:55 +00:00
f81f7db6cd
fix layout problems exposed by #cats
2016-03-24 01:12:27 +00:00
9e95d2e4ac
make image event bodies display as blocks to avoid auto sizing, so we can measure their width to explicitly set their height
2016-03-24 00:13:03 +00:00
090db5490b
URI-decode the hash-fragment
...
It looks like % characters in the hash-fragment are meant to be interpreted as
a URI-encoding, so we should decode them.
2016-03-23 15:58:00 +00:00
cfcb050822
Add composer controls wrapper to set correct width on the composer controls wrapper div
2016-03-23 15:21:37 +00:00
66e36e9d40
CSS for https://github.com/matrix-org/matrix-react-sdk/pull/247
2016-03-23 15:15:38 +00:00
a3a4ff569e
stop scrollbars overlaying on the count
2016-03-23 13:51:38 +00:00
27ab79fd38
handle unaliased room naming more sanely
2016-03-23 11:50:38 +00:00
8cbc8db1cb
oops
2016-03-23 11:38:17 +00:00
e32299a50c
fix enable notifs text
2016-03-23 11:32:47 +00:00
c843ee3157
handle canonical aliases correctly; search on names; support rooms with no aliases
2016-03-23 11:26:18 +00:00
490cbbd05f
fix horiz pre scrollbars https://github.com/vector-im/vector-web/issues/754
2016-03-22 15:13:36 +00:00
e4aa43944f
crude lipstick for warnings
2016-03-22 12:11:19 +00:00
827f891ae7
warning prompt for roomsettings
2016-03-22 00:56:38 +00:00
54c34ab8d5
improve previewbar look & feel
2016-03-21 22:06:06 +00:00
d4a36f5081
permalink button
2016-03-19 23:26:04 +00:00
19cb06d040
prop fix
2016-03-18 20:08:31 +00:00
a1e3cf76e1
top-align search results
2016-03-18 16:24:48 +00:00
866bd55bc3
give notif bar a pointer cursor
2016-03-18 16:16:13 +00:00
a6257a1148
show right panel if needed when viewing users
2016-03-18 16:09:00 +00:00
92e187da64
fix ugly spinner on MemberList
2016-03-17 18:44:53 +00:00
f950b675bd
workaround to avoid accidental click-throughs on narrow vertical scrollbars
2016-03-17 18:26:00 +00:00
aca4457a89
apparently we don't need a default onClick
2016-03-17 17:00:58 +00:00
d7a851a353
make senderprofiles clickable
2016-03-17 16:28:49 +00:00
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
4164688c24
add pointer to EventTile
2016-03-17 13:09:28 +00:00
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
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
f8fb3a7fe1
fix aspect ratio of roomavatar preview
2016-03-16 20:00:50 +00:00
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
05e479a76c
Use then() chaining rather than manual callbacks
2016-03-16 10:59:40 +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
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
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
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
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
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
55c7c08ac2
Sender can be null, so null check.
2016-02-23 17:59:13 +00:00
72393bf75f
Merge branch 'rav/read_marker' into develop
2016-02-23 17:57:50 +00:00
a063efe250
Remove no-longer accurate comment.
2016-02-23 10:57:50 +00:00
45c8500f28
Pass through params for other URLs (in this case, for keypair invite signing urls)
2016-02-23 10:22:22 +00:00
f2fc4a88ae
gemini up roomdirectory
2016-02-22 09:35:11 +00:00
77b45e7231
oooooooops - remember opensans v13
2016-02-22 09:18:56 +00:00
2ca5529faa
support hyperlinked topics
2016-02-20 23:54:47 +00:00
a35ab6bcef
tart up room directory
2016-02-20 13:36:48 +00:00
e33e9b5d4a
upgrade OpenSans and add semibold
2016-02-20 13:36:33 +00:00
3910877f8f
ensure local activity bumps rooms up the roomlist
2016-02-19 02:09:04 +00:00
f538a0d5de
scale local video feed to fit on the page properly
2016-02-19 01:16:55 +00:00
4e5b971d3a
accomodate 800px wide thumbs
2016-02-18 19:09:32 +00:00
ffb1584e10
horizontally scale images properly
2016-02-18 18:59:45 +00:00
Aviral Dasgupta