Mark Haines
6c21391ff5
Merge branch 'develop' into markjh/attachment_iframe_css
2016-11-28 15:10:49 +00:00
David Baker
c786980454
Move getDefaultDeviceName into the Platforms
...
So we can have a sensible device name on Electron
2016-11-24 16:46:15 +00:00
Richard van der Hoff
8b0390f354
Fix a race which took us to the directory on load sometimes ( #2602 )
...
Sometimes window.onload would run before loadApp had finished (specifically, if
the browser had to wait for config.json to load). Avoid the race by moving all
of the onload logic into loadApp.
2016-11-18 17:32:01 +00:00
Richard van der Hoff
646608bf8b
Add a cachebuster to /version
2016-11-17 17:31:31 +00:00
Mark Haines
be90badc8d
Add css for the iframes for e2e attachments
2016-11-17 11:36:46 +00:00
Richard van der Hoff
7577d2eb05
s/var/const/
2016-11-17 10:51:09 +00:00
Richard van der Hoff
81d70a921d
Add a 'View decrypted source' button
2016-11-16 23:10:51 +00:00
David Baker
70d383fb1b
Fix changelog dialog to read new version format
...
Remove the 'vector' from the start of the version (otherwise the
tarballs are called vector-vector-[...].tar.gz). The jenkins
script already creates these files, so update accordingly.
2016-11-13 23:06:57 +00:00
David Baker
8356ad7bfa
Merge pull request #2553 from vector-im/dbkr/get_app_version
...
Support for get_app_version
2016-11-11 17:33:41 +00:00
Richard van der Hoff
69eee7ca0a
Merge pull request #2565 from vector-im/luke/fix-add-css-for-mlist-truncation
...
Add CSS for mlist truncation
2016-11-11 11:01:31 +00:00
Luke Barnard
4f944cf01c
Add CSS for mlist truncation
...
matrix-org/matrix-react-sdk#544
2016-11-10 17:15:30 +00:00
Will Hunt
15c730a22a
Add rel="noopener" to context menu links.
2016-11-08 17:08:50 +00:00
Will Hunt
cf33ed58c1
Add menu option for `external_url` if present
2016-11-08 16:57:56 +00:00
Luke Barnard
b30df2115c
Add some CSS for an error popup that appears next to the `Manage Integrations` button if there was a problem contacting Scalar
2016-11-08 10:54:03 +00:00
David Baker
8d46077ac2
Support for get_app_version
2016-11-08 10:47:01 +00:00
David Baker
9a00ec128c
many semicolons
2016-11-04 10:46:51 +00:00
David Baker
ed9c29d365
Use require so we can import conditionally
2016-11-03 15:45:12 +00:00
David Baker
6869c679ef
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-03 14:58:12 +00:00
David Baker
cfe63fa274
Better support no-config when loading from file
...
We should still error if given a 5xx with an empty body.
2016-11-03 14:43:10 +00:00
David Baker
3601b44429
Fix loading with no config from HTTP
2016-11-03 14:17:23 +00:00
David Baker
fb3ca441ba
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-03 13:32:01 +00:00
David Baker
f1b72dfa09
Fix copyright
2016-11-03 11:51:41 +00:00
David Baker
4d0b492ba0
Merge remote-tracking branch 'origin/develop' into dbkr/platform_version
2016-11-03 11:51:23 +00:00
David Baker
3bcb447e03
Fix copyright
2016-11-03 11:48:49 +00:00
David Baker
108af83ae8
Just bind the right function to the button
...
rather than deciding in onChangelogClicked
2016-11-03 11:43:50 +00:00
David Baker
275a55266b
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-02 19:46:02 +00:00
David Baker
18504ca14e
Merge pull request #2533 from vector-im/dbkr/platform_notification
...
Add Notification support to the Web Platform
2016-11-02 19:43:17 +00:00
David Baker
6aba9f8eda
Don't always claim we have notif support
...
Only if the browser has the Notification API
2016-11-02 19:26:07 +00:00
David Baker
e8494c3dc7
Split NewVersionBar release notes / changelog
...
and change the class to use React createClass syntax while I'm at
it, rather than a completely different third style we use nowhere
else in the project.
2016-11-02 19:20:11 +00:00
David Baker
caa3cb7d89
Electron support
...
From https://github.com/vector-im/vector-web/pull/2511 but with
just the actual electron changes
2016-11-02 18:49:28 +00:00
David Baker
19238b9326
Use the defaults if given a blank config file
...
This allows Vector to load from file:// URIs without breaking if
there is no config file (because we explicitly look for 404s, and
file:// URIs don't return 404s).
2016-11-02 17:57:27 +00:00
David Baker
8c3fed7559
CSS for changelogs
2016-11-02 17:48:47 +00:00
David Baker
17bb47676e
Make VectorBasePlatform
...
For template methods that are only used from within vector (ie. new version
support)
2016-11-02 17:45:35 +00:00
David Baker
757604fd60
Add Notification support to the Web Platform
...
Except display notification which was already accidentally included in a
previous PR
2016-11-02 17:36:48 +00:00
David Baker
64fdb290eb
Move 'new version' support into Platform
2016-11-02 16:02:55 +00:00
David Baker
a714edbf2b
Implement Platforms
...
Provide WebPlatform for functionality specific to the web version of vector.
2016-11-02 15:12:51 +00:00
Richard van der Hoff
6396c60645
Put a cachebuster in the names of CSS and JS files
...
This means that clients can do better caching of assets, as it will mean we are
no longer reliant on etags to ensure that clients get a fresh version.
We inhibit the cachebuster for `npm start`, so that we don't get millions of
copies of the bundles on dev boxes.
2016-10-26 15:20:59 +01:00
Richard van der Hoff
8fe05fdff3
Correct path to components.css
...
Fix failure to find components.css which was introduced in e1919c5
(https://github.com/vector-im/vector-web/pull/2513 )
2016-10-26 15:02:34 +01:00
Richard van der Hoff
e1919c5ea3
Don't include two copies of the CSS in the tarball
...
Aggregate our CSS into build/components.css instead of vector/components.css, so
that it isn't included in the tarball.
2016-10-26 14:43:42 +01:00
Richard van der Hoff
e564d34ca8
Merge pull request #2512 from vector-im/dbkr/firefox_roomdir_align
...
Correct text alignment on room directory search
2016-10-26 10:49:59 +01:00
David Baker
61d7db6eb6
Correct text alignment on room directory search
...
Seemed to only be broken on firefox
2016-10-26 10:35:46 +01:00
David Baker
df94dd7487
Update ChangelogDialog.js
2016-10-25 14:41:02 +01:00
David Baker
d04201d069
Replace stage & es2017 with specific plugins
...
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-17 16:28:14 +01:00
David Baker
82de2ca4ec
Remove transform-runtime
...
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-17 16:28:14 +01:00
David Baker
5608e97719
Remove babel-polyfill
...
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-17 16:28:13 +01:00
Aviral Dasgupta
d6f27add66
Upgrade to babel6 and enable some presets.
2016-10-17 16:28:13 +01:00
David Baker
ea09a25563
Revert "Switch to babel 6"
2016-10-14 18:50:22 +01:00
David Baker
40ac80a3e9
Replace stage & es2017 with specific plugins
...
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-14 18:03:22 +01:00
David Baker
5f747e1a90
Remove transform-runtime
...
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-13 10:57:10 +01:00
David Baker
64815b1b0b
Remove babel-polyfill
...
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-12 17:23:01 +01:00
David Baker
59120d3019
Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc
2016-10-12 17:17:10 +01:00
Richard van der Hoff
97cedfc712
Centre images in dialog buttons
...
Some dialogs put a spinner in the button... need to line them up.
2016-10-11 17:50:49 +01:00
Aviral Dasgupta
42993a78ed
Only show quote option if RTE is enabled
2016-10-11 19:07:15 +05:30
David Baker
323bd79d0e
Fix join button for 'matrix' networks
...
Fixes https://github.com/vector-im/vector-web/issues/2435
2016-10-10 11:21:20 +01:00
Matthew Hodgson
60adbffacf
try to fix the create room label
2016-10-10 02:38:38 +01:00
David Baker
5e293c0f45
Don't stop paginating if no rooms match
...
Always show the scrollpanel otherwise we stop paginating if there
are no matching rooms in the first request (as per comment).
Fixes no freenode rooms being shown.
2016-10-05 18:06:43 +01:00
David Baker
ea38968be9
Merge pull request #2379 from vector-im/dbkr/join_3p_location
...
Add native joining of 3p networks to room dir
2016-10-05 14:00:21 +01:00
David Baker
c0a4574069
For single instance, allow domain present & match
2016-10-04 15:30:46 +01:00
David Baker
de9bf4bb47
Actually use variable
2016-10-04 15:18:07 +01:00
David Baker
b80b08f04f
Specify width on icons & comment
2016-10-04 11:14:36 +01:00
David Baker
304e5b997a
PR Freedback
2016-10-04 11:04:01 +01:00
David Baker
6b4dbfbd62
Change default brand to Riot
...
& update sample config
2016-10-04 10:23:38 +01:00
David Baker
000ca35727
Don't pop up errors when this API fails for guests
2016-10-03 16:30:57 +01:00
David Baker
776fe2ad70
Different way of getting fields for 3p location
...
Try to match protocol insance from 'domain' field and use its
fields for all but the last field. Assume the last takes the user
input.
2016-10-03 13:42:55 +01:00
Aviral Dasgupta
9174b32ef1
Upgrade to babel6 and enable some presets.
2016-10-02 17:28:24 +05:30
Richard van der Hoff
602727b7ad
Merge pull request #2383 from vector-im/dbkr/sign_in_not_log_in
...
Use 'Sign In' / 'Sign Out' universally
2016-09-30 11:31:15 +01:00
Richard van der Hoff
56deea9f10
Merge pull request #2382 from vector-im/dbkr/networkdropdown_size_jump
...
Prevent network dropdown resizing slightly
2016-09-30 10:59:15 +01:00
Richard van der Hoff
8e0be29c13
Merge pull request #2380 from vector-im/dbkr/roomdir_no_results
...
Room directory: indicate when there are no results
2016-09-30 10:23:23 +01:00
David Baker
b71b1b5535
Use more variables
2016-09-30 09:39:30 +01:00
Matthew Hodgson
5b3524f174
better wordwrap on RightPanels
2016-09-29 17:41:34 +01:00
David Baker
f9a70a8b04
Use 'Sign In' / 'Sign Out' universally
...
Rather than a mix of 'sign in/out' and 'log in/out'
2016-09-29 17:40:19 +01:00
David Baker
b652ea5024
Prevent network dropdown resizing slightly
...
Dropdown resized by 2px when opened
2016-09-29 16:49:44 +01:00
David Baker
2a37a0cb19
Room directory: indicate when there are no results
...
Fixes https://github.com/vector-im/vector-web/issues/2250
2016-09-29 15:45:45 +01:00
David Baker
761600f325
Add native joining of 3p networks to room dir
...
Use the 3rd party location lookup API to accept third-party locations
in their native form and look up the corresponding portal room for
that location.
Also give the network dropdown some placeholder text.
Fixes https://github.com/vector-im/vector-web/issues/2374
2016-09-29 15:30:54 +01:00
David Baker
65f14c7d21
Stop random rooms appearing when switching network
...
in the public room directory
2016-09-28 14:18:40 +01:00
David Baker
864ba52bc5
Relative img paths please
2016-09-28 12:03:35 +01:00
David Baker
fdb5020c0c
Oops, fix undefined variable
2016-09-28 11:56:07 +01:00
David Baker
0db12fcd22
Move method & don't wastefullt create elements
...
Put did update with the other react interface methods & don't
bother creating the 'current_value' if we throw it away later.
2016-09-28 11:05:14 +01:00
David Baker
5ca391f914
Replace double truth test with something sane
...
Also typo
2016-09-28 11:04:13 +01:00
David Baker
a32abae5a3
Don't use _matrix as default if there isn't one
2016-09-28 10:58:01 +01:00
David Baker
6ff1c30a4b
Fix spurious fill requests when switching networks
...
Ignore responses for old servers too, don't trigger a backfill request
when we re-render before refresh. Also a few more comments.
2016-09-28 10:08:03 +01:00
David Baker
85ea45a64a
Room dir: New filtering & 3rd party networks
...
Changes filtering on 3rd party networks to divide into portal / non portal rooms and not show portal rooms by default. Adds a special '_matrix' network for all rooms that aren't portal rooms.
Also adds ability to query 3rd party directory servers.
2016-09-27 19:39:20 +01:00
David Baker
bf58c340bc
Oops, missed the ref
2016-09-26 15:30:42 +01:00
David Baker
dc0b15bdfa
Remove unused variable / function
2016-09-26 14:17:36 +01:00
David Baker
51a5542446
Make tests pass
2016-09-23 18:20:31 +01:00
David Baker
3938abc5dd
add webkit vendor prefixed properties
...
for mavericks safari
2016-09-23 17:18:52 +01:00
David Baker
4961a97ed4
More css:
...
* Make join button more buttony
* Fix size of dropdown, allow search box to expand
* Use flexbox within search box to input can fill the rest of the space
2016-09-23 16:33:28 +01:00
David Baker
fb477fad1e
Less hardcoded CSS
2016-09-23 15:58:28 +01:00
David Baker
a070bccffb
Hacky hardcoded css for join button
2016-09-23 15:26:08 +01:00
David Baker
8e1105b12a
Oops, wrong function
2016-09-23 15:25:13 +01:00
David Baker
2e77b0a3c7
Use directory search box component
2016-09-23 13:48:44 +01:00
David Baker
d9c51832ab
Use 2x res logo to work with hidpi displays
2016-09-21 11:09:00 +01:00
David Baker
5011d3b158
Only show version bar if on develop
...
Or rather, if the version string is in the right format it to work.
2016-09-20 14:33:25 +01:00
David Baker
a5ee48d857
Swap out unknown user icons
2016-09-19 16:42:07 +01:00
David Baker
940eaf2b7d
The times, they are a changin'
2016-09-19 15:32:39 +01:00
David Baker
855ecbe11d
Update twitter / blog
2016-09-19 15:18:49 +01:00
David Baker
1c76870dcf
Remove failed commenting
2016-09-19 13:36:04 +01:00
David Baker
a99c9f4db2
Keep order of blog / twitter the same
2016-09-19 13:35:31 +01:00
David Baker
7e5373e194
Stick with VectorCo twitter for now
2016-09-19 13:34:49 +01:00
David Baker
560174b99f
Keep width on logo
2016-09-19 13:34:01 +01:00