Compare commits

...

430 Commits

Author SHA1 Message Date
David Baker 86bce146e8 v0.9.10 2017-05-22 11:41:10 +01:00
David Baker 734a28e0f3 Prepare changelog for v0.9.10 2017-05-22 11:41:09 +01:00
David Baker 5c4e3cec08 v0.9.10 2017-05-22 11:40:10 +01:00
David Baker c03d12238a Released js-sdk & react-sdk 2017-05-22 11:39:25 +01:00
David Baker da14d7eb8c v0.9.10-rc.1 2017-05-19 10:43:11 +01:00
David Baker 3a44cb65b7 Prepare changelog for v0.9.10-rc.1 2017-05-19 10:43:10 +01:00
David Baker 029dfe5ed0 v0.9.10-rc.1 2017-05-19 10:41:22 +01:00
David Baker c0c1972d56 Released js-sdk & react-sdk 2017-05-19 10:40:44 +01:00
Luke Barnard 53f0a6b360 Merge pull request #3959 from vector-im/luke/improve-country-dd-4
CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
2017-05-18 14:38:47 +01:00
Luke Barnard d0adfb6469 CSS for left_aligned Dropdowns, and adjustments for Country dd in Login 2017-05-18 14:03:27 +01:00
Luke Barnard 1460eae280 Change background colour of login country dd to white 2017-05-18 13:43:21 +01:00
Luke Barnard 01a15b2b7e Merge pull request #3953 from vector-im/luke/improve-country-dd-3-square-flags
Add square flag pngs /w genflags.sh script
2017-05-18 13:37:17 +01:00
David Baker 5526525b6b Merge pull request #3954 from vector-im/dbkr/riot_bot_for_desktop
Add config for riot-bot on desktop app build
2017-05-18 13:18:19 +01:00
David Baker c9e821ffc5 Add config for riot-bot on desktop app build
Also remove unused room dir stuff
2017-05-18 12:00:02 +01:00
Luke Barnard b290a28123 Merge pull request #3952 from vector-im/dbkr/electron_copy_link_location
Desktop: 'copy link address'
2017-05-18 11:49:41 +01:00
David Baker 16899d3b1f Bump electron version to 1.6.8 2017-05-18 11:38:03 +01:00
Luke Barnard 7d81ade563 genflags.sh should be run from root dir 2017-05-18 11:38:01 +01:00
Luke Barnard bc5ad3c761 Move genflags.sh to scripts 2017-05-18 11:36:24 +01:00
Luke Barnard 7c764b7365 Add copyright 2017-05-18 11:34:26 +01:00
David Baker dfb30e91de Desktop: 'copy link address'
Add 'copy link address' to link context menu in electron app
2017-05-18 11:32:10 +01:00
Luke Barnard ea03140cbd Add ellipsis overflow to long dd options 2017-05-18 11:30:22 +01:00
Luke Barnard 98215b4767 Adjust for 27x27 flag png size 2017-05-18 11:29:57 +01:00
Luke Barnard e879fb0eef Add square flag pngs /w genflags.sh script
This uses the github.com:googlei18n/region-flags and imagemagick to generate 27x27 flag pngs. The flags have a 1px #e0e0e0 border and transparent padding such that each flag is of the same height (17px including the border).
2017-05-18 11:25:42 +01:00
Richard van der Hoff ca3921f3a0 Merge pull request #3943 from vector-im/rav/reduce_rageshake_size
Reduce rageshake log size to 1MB
2017-05-17 15:59:10 +01:00
Richard van der Hoff 15ab1732a2 Reduce rageshake log size to 1MB
... 50MB turned out to be quite a lot.
2017-05-17 14:46:06 +01:00
Luke Barnard 338ab4d046 Merge pull request #3942 from vector-im/luke/improve-country-dd-2
CSS for putting country dd on same line as phone input
2017-05-17 14:29:48 +01:00
Luke Barnard 089740a840 CSS for putting country dd on same line as phone input
(For login and registration)
2017-05-17 14:25:43 +01:00
David Baker 7ea0ecd125 Merge branch 'new_release_process_stable' into develop
This reverts PRs on riot-web marked as notready, turning the develop
branch into a more stable version.
2017-05-17 10:43:02 +01:00
David Baker 9fc9de3af5 Revert "Merge pull request #3654 from vector-im/matthew/quick-search"
This reverts commit 8f20fcfa6b, reversing
changes made to 751f715e77.
2017-05-16 17:21:49 +01:00
David Baker 844ea390c8 Revert "clear the searchbox after quick-search"
This reverts commit ddd12edc06.
2017-05-16 17:13:55 +01:00
David Baker fdf326c9f0 Revert "Cancel quick-search on Escape, clearing it and returning focus to composer."
This reverts commit 52a119244b.
2017-05-16 17:13:39 +01:00
David Baker 9399b7ddf0 Revert "fix incoming call box"
This reverts commit b3431bb750.
2017-05-16 16:35:17 +01:00
David Baker 03476705b1 Revert "better solution to incomingcallbox weirdness"
This reverts commit be52787473.
2017-05-16 16:35:06 +01:00
David Baker 3cead032c2 Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2"
This reverts commit e6133820a2, reversing
changes made to d1db602b3a.
2017-05-16 16:27:58 +01:00
Matthew Hodgson c8ac60768d Merge pull request #3919 from vector-im/t3chguy/patch-1
fix #3894
2017-05-15 21:15:03 +01:00
Michael Telatynski cef26a5b20 fix #3894 2017-05-15 21:14:01 +01:00
Matthew Hodgson fe61a7eefd fix off-by-one pixel errors in login field heights - fixes https://github.com/vector-im/riot-web/issues/3738 2017-05-15 02:32:25 +01:00
Matthew Hodgson 582a34c937 cursor pointer for avatar upload in user settings 2017-05-15 02:24:34 +01:00
Matthew Hodgson 5181eb3ea5 Merge pull request #3894 from vector-im/t3chguy/change_release_vector2riot
change vector->riot on the surface
2017-05-15 01:43:57 +01:00
Matthew Hodgson c3477a30a7 oops, rebuild modernizr to pull in new tests 2017-05-15 01:22:32 +01:00
Matthew Hodgson 8e2e6cee35 require indexeddb & webworkers in modernizr 2017-05-15 01:07:25 +01:00
Matthew Hodgson 25a727b8d8 use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874 2017-05-15 00:26:02 +01:00
Michael Telatynski ea0b166da7 change wording to not confuse users building repo
change default repos to match their current naming

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:49:31 +01:00
Michael Telatynski f248477f82 stage 0.5 rebrand (rename dist release)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:46:08 +01:00
Luke Barnard 0e0918d07c Merge pull request #3888 from vector-im/pr/3799
move manifest.json outward so it is scoped properly
2017-05-11 13:20:33 +01:00
Michael Telatynski 3c5594e034 move manifest.json outward so it is scoped properly
this will matter more when we add a service worker

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 13:12:26 +01:00
Luke Barnard 15db686f33 Merge pull request #3799 from t3chguy/manifest
add to manifest
2017-05-11 13:05:00 +01:00
Michael Telatynski ffa53ca205 Update manifest.json 2017-05-11 11:17:55 +01:00
Luke Barnard 4c0e8cd372 Merge pull request #3886 from vector-im/luke/auto-reskindex
Automatically update component-index
2017-05-11 10:47:06 +01:00
Luke Barnard 6d94f35c33 Automatically update component-index
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.

-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
2017-05-11 10:37:13 +01:00
David Baker e67e891040 Merge pull request #3877 from vector-im/t3chguy/electron_install_fix
move electron -> electron_app because npm smart
2017-05-10 13:48:18 +01:00
Michael Telatynski c607b1bc89 npm is "smart" enough to try and install our electron wrapper as a module
instead of the actual electron package. With no way to ignore directories.
I'd like to think of this as temporary, until I get to rip apart riot-web
and riot-electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-10 13:36:27 +01:00
Richard van der Hoff 41738ec025 Merge pull request #3863 from vector-im/rav/bug_report_endpoint
Fix bug report endpoint in config.sample.json.
2017-05-09 12:34:40 +01:00
Richard van der Hoff f9ae456a64 Fix bug report endpoint in config.sample.json.
Not sure why this was like this - has vector.im/bugs *ever* worked?
2017-05-09 12:27:41 +01:00
David Baker 2983b36d4c Merge pull request #3851 from vector-im/dbkr/missed_icons
Update 2 missed icons to the new icon
2017-05-08 13:12:00 +01:00
David Baker 640aa98cf4 Update 2 missed icons to the new icon
Electron icons for windows & Linux. Also add them to the script
that makes all the icon versions.
2017-05-08 13:05:17 +01:00
David Baker e6133820a2 Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2
Make left panel better for new users (mk II)
2017-05-08 10:37:59 +01:00
Matthew Hodgson d1db602b3a Merge pull request #3839 from vector-im/t3chguy/patch-1
match primary package.json
2017-05-07 20:34:18 +01:00
Michael Telatynski ea72e9c7a0 match primary package.json
got mismatched after a release -> develop merge
2017-05-07 20:33:13 +01:00
Matthew Hodgson 8e94d5240f merge master into develop post 0.9.9 2017-05-07 19:58:42 +01:00
Matthew Hodgson 1e5908a31e speed up burndown generation by ~250x 2017-05-07 19:34:16 +01:00
David Baker 40c98fc84f Merge pull request #3829 from vector-im/t3chguy/productName-missing
Re-add productName
2017-05-06 12:20:30 +01:00
Michael Telatynski 9c6b3819a5 Re-add productName
so that electron-builder packages is as Riot rather than riot-web
2017-05-06 10:24:13 +01:00
David Baker 6013a3e71d Merge pull request #3683 from t3chguy/t3chguy/electron_version_inconsistency
Remove leading v in /version file, for SemVer and to match Electron ver
2017-05-05 18:28:16 +01:00
David Baker 0deed1b511 Merge pull request #3790 from t3chguy/patch-2
Fix scope of callback
2017-05-05 18:25:29 +01:00
David Baker 2c36506342 Merge pull request #3622 from t3chguy/t3chguy/electron-persist-window-layout
Remember and Recall window layout/position state
2017-05-05 18:23:15 +01:00
Michael Telatynski 309afdb813 no point installing deps here, builder will do it for us
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 17:08:50 +01:00
Michael Telatynski 1ed1080bf3 Update README with npm run electron
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 17:05:03 +01:00
Michael Telatynski a09f890619 Merge package.json, match version in electron/package.json
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 17:03:28 +01:00
Michael Telatynski 499b04c254 Only install electron deps when we're bundling/running electron
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 17:01:32 +01:00
Michael Telatynski 8a50207189 Change shebang to bash for string manipulations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 16:57:18 +01:00
Michael Telatynski f54708227e Proper two package.json format, release.sh bumps 2nd json ver too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 16:54:55 +01:00
David Baker c27f39714a Dedicated classes for the buttons 2017-05-05 14:26:13 +01:00
Luke Barnard e1cd046c1a Prevent zalgo-like text overflowing MELS summary 2017-05-05 09:54:00 +01:00
Luke Barnard ae76c76558 Fix #3450 - RM hidden by things 2017-05-04 21:27:33 +01:00
David Baker 1001c98a3c Align buttons better with the text 2017-05-04 18:23:04 +01:00
David Baker 23a141c5ad Remove slightly misleading commented code 2017-05-04 17:46:44 +01:00
Luke Barnard 8731e46900 Merge pull request #3808 from vector-im/dbkr/remove_babelcheck
Remove babelcheck
2017-05-04 17:45:59 +01:00
David Baker da960e776d Remove commented code 2017-05-04 17:45:11 +01:00
David Baker d419024da9 Merge pull request #3809 from vector-im/rav/include_mx_id_in_rageshake
Include MXID and device id in rageshakes
2017-05-04 17:30:51 +01:00
Richard van der Hoff 45efdbdd43 Include MXID and device id in rageshakes
- to make for easier triage
2017-05-04 17:21:16 +01:00
David Baker 7b320f8fbb Remove babelcheck
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
2017-05-04 16:51:36 +01:00
David Baker e6e2e6989a Merge pull request #3791 from t3chguy/patch-3
import Modal
2017-05-04 16:35:15 +01:00
David Baker 2bf0074953 Make bottom left menu buttons use RoleButton too 2017-05-04 15:38:53 +01:00
David Baker ff709ed8b1 Fix import 2017-05-04 14:53:13 +01:00
David Baker cbb32968f1 Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 14:04:33 +01:00
David Baker 095da68aac Add buttons to room sub list headers 2017-05-04 13:58:17 +01:00
Michael Telatynski c5d37ab2fb add to manifest for #334
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-03 22:56:39 +01:00
Michael Telatynski 9997cc9891 import Modal
class seems to be referring to Modal but does not import it
2017-05-02 22:27:30 +01:00
Michael Telatynski d5009962cd Fix scope of callback
This may have led to the room list not refreshing on error of deleting alias
2017-05-02 22:19:32 +01:00
Michael Telatynski 6367344181 tidy and fix flow notation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:32:34 +01:00
Michael Telatynski 61c338a233 remove leading v in /version file so its semver
and also then consistent with electron versioning

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:32:27 +01:00
Matthew Hodgson 9f3c1deae6 Merge pull request #3775 from t3chguy/patch-1
Pin filesize ver to fix break upstream
2017-04-30 13:11:33 +01:00
Michael Telatynski 4a8ad53bd9 Pin filesize ver to fix break upstream
https://travis-ci.org/vector-im/riot-web/builds/227340622
avoidwork/filesize.js#87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
2017-04-30 13:11:01 +01:00
Matthew Hodgson 67efb8bde2 Add date tooltip to timestamps 2017-04-29 00:00:37 +01:00
David Baker 96c867b34b Make left panel more friendly to new users
https://github.com/vector-im/riot-web/issues/3609
2017-04-28 11:23:13 +01:00
David Baker 4eb0ca63a9 Revert commits acciderntally put on develop 2017-04-28 11:22:05 +01:00
David Baker 73fb2c859e Remove now-redundant grey CSS 2017-04-28 11:20:55 +01:00
David Baker 431b8aaefa Make left panel more friendly to new users
https://github.com/vector-im/riot-web/issues/3609
2017-04-28 11:10:41 +01:00
David Baker b637ab33cc Merge pull request #3751 from vector-im/luke/room-directory-improve
Improve Room Directory Look & Feel
2017-04-27 18:28:25 +01:00
Luke Barnard afb4b79d81 Improve Room Directory Look & Feel
By adding an icon next to the title.
Requires https://github.com/matrix-org/matrix-react-sdk/pull/848
2017-04-27 18:04:41 +01:00
Luke Barnard 5defd0bb74 Merge branch 'develop' of github.com:vector-im/vector-web into develop 2017-04-27 16:46:21 +01:00
Luke Barnard e6f694307d add word-break to RoomDirectory 2017-04-27 16:46:14 +01:00
David Baker beefcfcb8c Merge pull request #3742 from vector-im/luke/fix-emotes-rrs
Fix emote RRs alignment
2017-04-26 18:25:27 +01:00
Luke Barnard 44d0e7dcba Fix emote RRs alignment 2017-04-26 18:00:51 +01:00
Luke Barnard 71685b5eab Merge pull request #3741 from vector-im/dbkr/remove_unused_droptarget_placeholder
Remove unused `placeholder` prop on RoomDropTarget
2017-04-26 16:46:47 +01:00
David Baker 7b3719bc3c Remove unused placeholder prop on RoomDropTarget 2017-04-26 16:27:25 +01:00
David Baker c070e86c1f Merge pull request #3732 from vector-im/luke/css-improve-country-dd
Modify CSS for matrix-org/matrix-react-sdk#833
2017-04-26 10:28:07 +01:00
Luke Barnard 78cabed0bf Modify CSS for matrix-org/matrix-react-sdk#833 2017-04-25 16:24:00 +01:00
David Baker bf88620581 Merge pull request #3727 from vector-im/dbkr/warn_when_single_instance_quit
Warn when exiting due to single-instance
2017-04-25 11:18:19 +01:00
David Baker 777087504a Merge branch 'release-v0.9.9' 2017-04-25 11:12:14 +01:00
David Baker aa482bae28 v0.9.9 2017-04-25 11:08:08 +01:00
David Baker 6fd64d19f0 Prepare changelog for v0.9.9 2017-04-25 11:08:07 +01:00
David Baker 2d311ddbf4 Released js-sdk & react-sdk 2017-04-25 11:04:03 +01:00
David Baker e24ef2bb5c Warn when exiting due to single-instance
This lost me a fair bit of time trying to figure out why Riot was
starting and then immediately quitting.
2017-04-25 10:18:17 +01:00
Matthew Hodgson 4dd6ee681d fix /config.json in .gitignore 2017-04-25 00:14:24 +01:00
Matthew Hodgson ef057e4693 Merge pull request #3709 from t3chguy/electron_notification_causes_weirdness_onclick
Electron forgets it was maximized when you click on a notification
2017-04-25 00:10:20 +01:00
Matthew Hodgson f53b238c24 Merge pull request #3719 from turt2live/travis/h1-h2-to-h3
CSS to make h1 and h2 the same size as h1.
2017-04-25 00:08:07 +01:00
Matthew Hodgson 7957eeba10 Merge pull request #3721 from vector-im/luke/css-fix-long-room-names
Prevent long room names/topics from pushing UI of the screen
2017-04-25 00:07:41 +01:00
Matthew Hodgson 95931918dc Merge pull request #3717 from vector-im/luke/css-disable-dd-highlight
Disable dropdown highlight on focus
2017-04-25 00:07:13 +01:00
David Baker 5326faa0b8 v0.9.9-rc.2 2017-04-24 18:26:20 +01:00
David Baker 7f2fa09d4c Prepare changelog for v0.9.9-rc.2 2017-04-24 18:26:19 +01:00
David Baker b6435502fc New version of react-sdk 2017-04-24 18:25:13 +01:00
David Baker 1701ea43a4 Remove spurious changelog entries 2017-04-24 18:22:23 +01:00
Luke Barnard 69f5833c9f Prevent long room names/topics from pushing UI of the screen
This was causing the "save" button in RoomSettings to be obscured when room names were set to long strings without spaces

Fixes https://github.com/vector-im/riot-web/issues/1729
2017-04-24 16:05:49 +01:00
turt2live 61bba6c31f CSS to make h1 and h2 the same size as h1.
Addresses #1772

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-24 08:44:53 -06:00
Luke Barnard c067800a4f Disable dropdown highlight on focus 2017-04-24 10:00:39 +01:00
Matthew Hodgson af105b1920 moar padding for _TopUnreadMessagesBar.scss 2017-04-24 01:17:17 +01:00
Matthew Hodgson a414352661 re-add img to _TopUnreadMessagesBar.scss 2017-04-24 01:13:24 +01:00
Matthew Hodgson 57f91086e6 add bullseye icon for 'Jump to first unread message' 2017-04-24 01:08:09 +01:00
Michael Telatynski 9e2324fb69 don't hook on postinstall, current dev cycle uses (abuses) npm i to build
so no point making it take longer than it has to for the devs only testing
webapp

build:electron - hook npm run install:electron
install:electron - run npm i for the electron deps
electron - start the app locally for testing

add to README

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 22:50:58 +01:00
Michael Telatynski b3c9229aee DRY code and change double quotes to single
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 09:59:00 +01:00
Michael Telatynski 2139fb74bb change show logic to same as that of the tray icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 09:56:43 +01:00
Matthew Hodgson 8b4ab4bcdd update room directory icon to something that looks like a room list 2017-04-23 03:14:41 +01:00
Matthew Hodgson 40eceaf9bc show err.message in errors if present 2017-04-23 02:22:31 +01:00
Matthew Hodgson ab5ec04507 oops 2017-04-23 01:01:38 +01:00
Matthew Hodgson b1ff0b9e65 hook up keyb shortcuts for roomdir 2017-04-23 01:00:25 +01:00
Matthew Hodgson be52787473 better solution to incomingcallbox weirdness 2017-04-22 17:37:16 +01:00
Matthew Hodgson b3431bb750 fix incoming call box 2017-04-22 17:28:09 +01:00
Matthew Hodgson 4864716abb Merge pull request #3564 from t3chguy/t3chguy/malformed-notifications-gnome-kde
Escape HTML Tags from Linux Notifications (electron)
2017-04-22 16:45:04 +01:00
Matthew Hodgson 8a6283fedf Merge pull request #3651 from t3chguy/t3chguy/show_access_token
styling for spoilerized access token view in Settings
2017-04-22 16:22:48 +01:00
Matthew Hodgson 634cf528b4 Merge pull request #3690 from t3chguy/fix_webpack_config
Fix Webpack conf
2017-04-22 16:14:19 +01:00
Michael Telatynski 0da6ca8aea add more comment to explain this weirdness
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 16:05:08 +01:00
Michael Telatynski 08fb20a0df use a character class for brevity
add a comment so this madness has meaning

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 14:02:18 +01:00
Michael Telatynski a8e4a2158a move styling to correct place
NOTE TO SELF
1:1 mapping between react component to scss file.
Makes sense...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 04:33:47 +01:00
Matthew Hodgson 2f3e389a68 Merge pull request #3599 from coletivoEITA/develop
Add config.json to .gitignore
2017-04-22 03:11:17 +01:00
Matthew Hodgson fb3ef89b50 Merge pull request #3641 from t3chguy/t3chguy/electron_launch_hidden
add command line arg (--hidden) for electron app
2017-04-22 03:02:48 +01:00
Matthew Hodgson 523b315985 Merge pull request #3640 from t3chguy/t3chguy/lightbox_download_button
fix ImageView Download functionality
2017-04-22 02:59:17 +01:00
Matthew Hodgson 36f08cf73c Merge pull request #3693 from t3chguy/cross-env
Add cross-env into the mix
2017-04-22 02:40:23 +01:00
Matthew Hodgson 5c00af7123 Merge pull request #3694 from turt2live/travis/remember-unsupported-browser
Remember acceptance for unsupported browsers.
2017-04-22 02:17:37 +01:00
Matthew Hodgson 38fa9f78f1 prefix localstorage key as per the convention 2017-04-22 02:17:22 +01:00
Matthew Hodgson 8a9b750b31 apply focus filter to normal buttons too 2017-04-22 01:55:57 +01:00
Matthew Hodgson 26ebd20956 improve logo cosmetics 2017-04-22 01:19:11 +01:00
turt2live e877ad2e63 Remember acceptance for unsupported browsers.
Addresses #3624.

This stores the flag in localStorage, after checking if localStorage is available. If localStorage is not available, the user will be prompted just like before this commit.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 16:08:49 -06:00
Michael Telatynski dd7f9e2d5f argh, fix eslint false positives
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 19:00:24 +01:00
David Baker 141aafd18e v0.9.9-rc.1 2017-04-21 18:40:25 +01:00
David Baker 8aed52ece9 Prepare changelog for v0.9.9-rc.1 2017-04-21 18:40:24 +01:00
David Baker ce5a7ba48a Rewind version to try again, again 2017-04-21 18:39:11 +01:00
David Baker 95647fb7a1 v0.9.9-rc.1 2017-04-21 18:35:15 +01:00
David Baker d0c0eeac0a Prepare changelog for v0.9.9-rc.1 2017-04-21 18:35:14 +01:00
David Baker f25612198e 0.9.8, not 0.9.9 2017-04-21 18:33:53 +01:00
David Baker ca6d9063fd Back up release version to try again 2017-04-21 18:32:55 +01:00
David Baker eec0c274d2 v0.9.9-rc.1 2017-04-21 18:26:29 +01:00
David Baker b5a5b472c4 Prepare changelog for v0.9.9-rc.1 2017-04-21 18:26:29 +01:00
David Baker 9747836a4d Update react-sdk and js-sdk dependencies 2017-04-21 18:24:29 +01:00
Luke Barnard 2afe9e6928 Merge pull request #3692 from vector-im/luke/login-ui
Cosmetics to go with matrix-org/matrix-react-sdk#811
2017-04-21 17:40:53 +01:00
Luke Barnard f010afe63f Add emojione PNGs to the COPY_LIST 2017-04-21 17:36:48 +01:00
Michael Telatynski 60b280f166 Add cross-env into the mix
this way `npm run build` will work on Windows too :D

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 17:16:53 +01:00
Luke Barnard a2b465e352 Remove old logo 2017-04-21 17:14:59 +01:00
Luke Barnard 1e139ef183 Cosmetics to go with matrix-org/matrix-react-sdk#811 2017-04-21 17:04:11 +01:00
Michael Telatynski 9b38a97110 Fix Webpack conf
+ conform to a bit more eslint (IDE makes my eyes hurt)
+ specify windows-specific copies of noParse regexes to stop the olm error

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 15:09:45 +01:00
Matthew Hodgson 9c27075175 Merge pull request #3680 from t3chguy/t3chguy/escape_cancel_search_focus_composer
Cancel quicksearch on ESC
2017-04-21 01:27:04 +01:00
Michael Telatynski 52a119244b Cancel quick-search on Escape, clearing it and returning focus to composer.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 01:21:25 +01:00
Matthew Hodgson ddd12edc06 clear the searchbox after quick-search 2017-04-20 14:21:36 +01:00
Matthew Hodgson 8f20fcfa6b Merge pull request #3654 from vector-im/matthew/quick-search
Optimise RoomList and implement quick-search functionality on it.
2017-04-20 11:26:08 +01:00
Matthew Hodgson c1d30664de pass through selectedRoom 2017-04-20 01:13:13 +01:00
Matthew Hodgson 1803a0df9e select any existing filter text on ctrl-k 2017-04-20 00:04:08 +01:00
Matthew Hodgson a5bd8bd034 bump react-gemini-scrollbar 2017-04-19 23:35:06 +01:00
Matthew Hodgson 751f715e77 fix focus highlight on bright theme 2017-04-19 02:29:10 +01:00
Matthew Hodgson a5bd8b36b8 fix focus highlight on bright theme 2017-04-19 02:28:16 +01:00
Matthew Hodgson e780fe4067 we don't need RoomTile specific focus in the end 2017-04-18 22:54:20 +01:00
Michael Telatynski 0480a880f3 styling for spoilerized access token view in Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-18 19:53:56 +01:00
Matthew Hodgson acbc3e9f9b move RoomSubList.refreshHeader to apply to the whole RoomSubList again 2017-04-18 19:27:57 +01:00
Matthew Hodgson a8daa53a5b always let tab/shift-tab select sublist headers 2017-04-18 17:49:50 +01:00
Matthew Hodgson 053beae035 move focus-via-up/down cursors to LeftPanel 2017-04-18 17:36:23 +01:00
Richard van der Hoff ccc33db9dd Compress uploaded rageshakes. (#3647) 2017-04-18 17:23:34 +01:00
Richard van der Hoff 66a473863a Merge pull request #3648 from vector-im/rav/rageshake_progress
Progress updates for rageshake uploads
2017-04-18 17:23:03 +01:00
Richard van der Hoff 25907301a3 More unmounted guards in BugReportDialog 2017-04-18 16:51:35 +01:00
Richard van der Hoff d8bf57edc5 Add progress reporting to rageshake submission 2017-04-18 16:51:35 +01:00
Richard van der Hoff 269f9a5ccc Load submit-rageshake asynchronously
... because it's 250K :/
2017-04-18 16:51:35 +01:00
Richard van der Hoff a34b5abc82 Use multipart-form encoding for rageshake uploads (#3646)
This is a more sensible encoding for uploading logfiles, and will allow us to
compress the logfiles in future.

browser-request doesn't give us enough flexibility to do this properly, so we
use XMLHttpRequest directly.
2017-04-18 16:47:50 +01:00
Richard van der Hoff 062cf47290 Merge pull request #3645 from vector-im/rav/refactor_rageshake
Factor out rageshake upload to a separate file
2017-04-18 15:54:07 +01:00
Richard van der Hoff fa132d3945 Merge pull request #3644 from vector-im/rav/fix_rageshake_race
rageshake: fix race when collecting logs
2017-04-18 15:53:41 +01:00
Richard van der Hoff 9fd379c97c Merge pull request #3649 from vector-im/rav/fix_test_fail
Fix a flaky test
2017-04-18 14:53:28 +01:00
Richard van der Hoff 593e101521 Fix a flaky test
Depending on timing, the first `httpBackend.flush()` could end up just flushing
a '/presence' call rather than the initial sync. The fix to that is simply to
not set the expectation on /presence.

While we're there, split out the flushes of /publicRooms and
/thirdparty/protocols, so that we can be sure that they happen.

There is probably still a bunch of flakiness there, but this should fix one
particular instance.
2017-04-18 13:45:31 +01:00
Richard van der Hoff 6fd6ea9b8e rageshake: fix race when collecting logs
*apparently* it's possible for your indexeddb transaction to complete in the
background, so that the `oncomplete` handler is never called. Make sure that
the oncomplete handler is set *before* doing the work.
2017-04-18 12:37:26 +01:00
Matthew Hodgson f8aa2c3487 fix bugs in RoomSubListHeader splitout 2017-04-18 02:43:06 +01:00
Michael Telatynski 44479f24dd add command line arg (--hidden) for electron app
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-17 22:10:56 +01:00
Matthew Hodgson 5ff49f4000 split out header from RoomSubList and let it update separately
By moving the header into its own RoomSubListHeader, we can refresh it explicitly
by poking it by the new constantTimeDispatcher without re-rendering the whole stack
of room tiles

*UNTESTED*
2017-04-17 20:53:52 +01:00
Michael Telatynski cc7a585126 make ImageView Download work, based on props.name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-17 15:07:21 +01:00
daniel tygel d3331f293b Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-04-16 23:27:38 -03:00
Matthew Hodgson c6ee221ae4 typos 2017-04-16 15:58:00 +01:00
Matthew Hodgson 8351ec9738 thread RoomTile focus events through RoomSubList up to RoomList 2017-04-15 13:23:11 +01:00
Matthew Hodgson 27de972bfb oops 2017-04-15 12:02:50 +01:00
Matthew Hodgson e5e259e1f8 put a ! on invite sublists 2017-04-15 12:02:16 +01:00
Matthew Hodgson a74bbb424c cmd-k shortcut to the searchbox 2017-04-15 11:37:09 +01:00
Matthew Hodgson 15accf33f5 get rid of the evil blue outlines 2017-04-15 00:30:31 +01:00
Michael Telatynski 3fb54029d7 Fix packaged functionality
Improve dependency management for Electron main process deps

Dependencies in /electron/package.json will be installed through a script in /package.json and will be bundled via electron-builder

Does not affect standard webapp whatsoever

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-13 13:39:15 +01:00
Michael Telatynski 76008e8abd Remember and Recall window layout so that position+size persist
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-12 18:13:25 +01:00
Richard van der Hoff 3f291aae5b Use an opts arg for submit-rageshake 2017-04-12 11:26:53 +01:00
David Baker 76f140c62c Back to develop js & react sdks 2017-04-12 10:14:58 +01:00
David Baker a12d7a2b66 Merge branch 'release-v0.9.8' 2017-04-12 10:14:00 +01:00
David Baker ba8745cb42 v0.9.8 2017-04-12 10:10:53 +01:00
David Baker 967ebb5f9f Prepare changelog for v0.9.8 2017-04-12 10:10:52 +01:00
David Baker 6a5d0dda2f Use release versions of js-sdk & react-sdk 2017-04-12 10:03:43 +01:00
Richard van der Hoff 6423f7ce03 rageshake: factor out submission to a separate file
This will mean we can load it asyncronously in future, if we want.
2017-04-11 18:59:22 +01:00
David Baker 4ead2f338d v0.9.8-rc.3 2017-04-11 18:50:21 +01:00
David Baker 55ec7dcebc Prepare changelog for v0.9.8-rc.3 2017-04-11 18:50:20 +01:00
David Baker 8587df1dd9 React SDK rc.4 2017-04-11 18:49:27 +01:00
David Baker d5b1db064f Merge remote-tracking branch 'origin/develop' into release-v0.9.8 2017-04-11 18:48:55 +01:00
Richard van der Hoff 4efb2b6750 Rageshake: Factor out getLogsForReport
... in preparation for factoring out sending the report
2017-04-11 18:47:55 +01:00
Richard van der Hoff cbfa4dd1ab Get rageshake endpoint from SdkConfig instead of storing in rageshake
- in preparation for factoring out the sending of the rageshake
2017-04-11 18:46:48 +01:00
Matthew Hodgson b26c460f13 shrink the redacted tear 2017-04-10 23:22:25 +01:00
daniel tygel dd9150cef1 Merge branch 'add_config_json_to_gitignore' into develop 2017-04-10 14:12:38 -03:00
daniel tygel ab1b377a1d add config.json to .gitignore 2017-04-10 14:11:26 -03:00
David Baker 3fa8460ed7 Merge pull request #3598 from vector-im/dbkr/clear_cache_button_electron
Make the clear cache button work on desktop
2017-04-10 17:56:49 +01:00
David Baker 7f6d9a625d Make the clear cache button work on desktop
Implement reload in Platforms to support
https://github.com/matrix-org/matrix-react-sdk/pull/798

Fixes https://github.com/vector-im/riot-web/issues/3597
2017-04-10 17:40:09 +01:00
David Baker 0b266d2e83 v0.9.8-rc.2 2017-04-10 16:56:41 +01:00
David Baker 7907d41ea8 Prepare changelog for v0.9.8-rc.2 2017-04-10 16:56:40 +01:00
David Baker 32c6482dcf Bump js-sdk & react-sdk versions 2017-04-10 16:55:27 +01:00
David Baker ea0c41a9f8 Merge remote-tracking branch 'origin/develop' into release-v0.9.8 2017-04-10 16:55:02 +01:00
David Baker a1cb566761 Bump electron version 2017-04-10 16:01:21 +01:00
Luke Barnard 01a96d92f4 Merge pull request #3596 from vector-im/luke/fix-redacted-bg
Redacted events bg: black lozenge -> torn paper
2017-04-10 15:59:41 +01:00
Luke Barnard 0b1745bceb Redacted events bg: black lozenge -> torn paper 2017-04-10 15:49:40 +01:00
David Baker 7d203f40cd Merge pull request #3594 from vector-im/rav/send_app_to_rageshake
Add 'app' parameter to rageshake report
2017-04-10 15:25:55 +01:00
Richard van der Hoff b8b74402c1 Add 'app' parameter to rageshake report 2017-04-10 15:07:43 +01:00
David Baker 08ee93a57b v0.9.8-rc.1 2017-04-07 17:29:12 +01:00
David Baker bced608c48 Roll back version number to try again 2017-04-07 17:28:32 +01:00
David Baker c576e07c85 v0.9.8-rc.1 2017-04-07 17:19:08 +01:00
David Baker cc87135b28 Prepare changelog for v0.9.8-rc.1 2017-04-07 17:19:08 +01:00
David Baker a63eb2621b Prerelease js-sdk & react-sdk 2017-04-07 17:12:48 +01:00
David Baker 42e317dab8 Merge pull request #3578 from vector-im/dbkr/indexeddb_webworker
Add support for indexeddb sync in webworker
2017-04-07 16:17:39 +01:00
David Baker ec870039bf Don't use endsWith as it'll break on old node
It's a lodash template though, so use lodash
2017-04-07 14:57:02 +01:00
David Baker b65466bc4f Use dedicated indexeddb worker import 2017-04-07 14:41:41 +01:00
David Baker 515b57ba12 Update for rename of worker 2017-04-07 11:23:14 +01:00
Luke Barnard 4d4da0d7ca Merge pull request #3574 from vector-im/luke/feature-clickable-emotes
Add CSS to make Emote sender cursor : pointer
2017-04-06 15:56:45 +01:00
Luke Barnard 778e7dcab0 Add CSS to make Emote sender cursor : pointer 2017-04-06 14:11:37 +01:00
David Baker fd5e94dfad Merge pull request #3565 from vector-im/rav/remove_rageshake
Remove rageshake server
2017-04-06 12:21:33 +01:00
David Baker f187a359e6 Add support for indexeddb sync in webworker 2017-04-06 11:15:14 +01:00
Luke Barnard 579e70e967 Merge pull request #3566 from vector-im/luke/clarify-unread-msg-top-banner
Adjust CSS for matrix-org/matrix-react-sdk#789
2017-04-04 16:45:38 +01:00
Luke Barnard 3407f66e82 Adjust CSS for matrix-org/matrix-react-sdk#789 2017-04-04 16:36:05 +01:00
Richard van der Hoff 8707cca7bc Remove rageshake server
This is now at https://github.com/matrix-org/rageshake
2017-04-04 16:29:12 +01:00
Michael Telatynski 99923b7b8f Escape HTML tags in Notifications (Linux)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-03 20:30:05 +01:00
Matthew Hodgson e40c6905dd more instructions 2017-04-01 13:33:24 +01:00
Matthew Hodgson 84a0ef9695 spell out that if you're on develop you need to keep your deps up-to-date 2017-04-01 13:25:16 +01:00
Matthew Hodgson 546e2ab30b bump emojione 2017-04-01 01:28:44 +01:00
Luke Barnard 6380f1a24a Merge pull request #3537 from vector-im/luke/fix-flaky-tests-maybe
Fix tests to reflect recent changes
2017-03-29 17:32:31 +02:00
Luke Barnard e40d3852ff Fix tests to reflect recent changes
This is an attempt to reduce flakiness (see https://github.com/matrix-org/matrix-react-sdk/pull/781 also)
2017-03-29 16:07:11 +01:00
David Baker e248a7f029 Merge pull request #3536 from vector-im/luke/fix-people-unstable-ordering
Do not assume getTs will return comparable integer
2017-03-29 14:40:50 +01:00
Luke Barnard 91892ec18b Do not assume getTs will return comparable integer
Fixes https://github.com/vector-im/riot-web/issues/3529. In the worst case, tsOfNewestEvent will return MAX_SAFE_INTEGER, instead of undefined, as may be the case of some events that were redacted and persisted in indexDB before changes were made to how events are redacted locally. (The important change is that events are now not stripped of their `origin_server_ts`).
2017-03-29 14:30:08 +01:00
Richard van der Hoff ff2a9f4b20 Merge pull request #3535 from vector-im/dbkr/rename_perf
Rename ReactPerf to Perf
2017-03-29 11:53:57 +02:00
David Baker a3040e22d3 Rename ReactPerf to Perf
As this makes it work out of the box with react-perf chrome
extension (which doesn't do a whole lot other than save you having
to remember the commands, but is still quite nice).
2017-03-29 10:38:46 +01:00
David Baker 2480831e2f Merge pull request #3530 from vector-im/dbkr/email_notifs_only_to_email_addresses
Don't show phone number as target for email notifs
2017-03-28 16:40:13 +01:00
David Baker c72a49d229 More equalses 2017-03-28 16:34:35 +01:00
David Baker 83b7f94609 Don't show phone number as target for email notifs
Fixes https://github.com/vector-im/riot-web/issues/3518
2017-03-28 16:24:54 +01:00
Luke Barnard 8b50ed8006 Merge pull request #3458 from vector-im/luke/fix-people-section2
Fix people section again
2017-03-27 15:52:15 +02:00
Matthew Hodgson d696196d72 fix https://github.com/vector-im/riot-web/issues/3348 2017-03-27 12:39:58 +01:00
Luke Barnard abc5b2d5f4 UI delay in UI 2017-03-27 09:44:33 +01:00
Matthew Hodgson f4134167a0 Merge pull request #3479 from t3chguy/t3chguy/dark-theme-invert-inconsistency-fix
dark theme invert inconsistent across browsers
2017-03-25 14:06:01 +00:00
David Baker bc67b1c87e Merge pull request #3451 from vector-im/dbkr/add_msisdn
CSS for adding phone number in UserSettings
2017-03-24 10:53:25 +00:00
David Baker 4326d7a182 Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn 2017-03-21 13:45:16 +00:00
David Baker 8e3a68dbdc Merge pull request #3426 from vector-im/dbkr/msisdn_signin_2
Support for phone number registration/signin, mk2
2017-03-21 13:43:49 +00:00
Michael Telatynski 05148b6e93 Add contributor to listing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-03-20 13:31:26 +00:00
Michael Telatynski 89447b7bfc Explicitly specify level of inversion to avoid inconsistent defaults with webkit-filter/filter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-03-20 13:31:00 +00:00
Matthew Hodgson af122172f1 Merge pull request #3470 from kfatehi/277-confirmredact
Confirm redactions with a dialog
2017-03-19 02:36:01 +00:00
Keyvan Fatehi a9ed2e20cb Confirm redactions with a dialog
Closes #277
Closes #1805

Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
2017-03-18 18:58:24 -07:00
Luke Barnard be02ac3bc6 Fix people section again
- Alter CSS due to removed mx_RoomDropTarget_avatar. The avatar was removed because it didn't particularly add anything and we needed space for "Drop here to tag as direct chat", which is quite long.
 - Use guessAndSetDMRoom as a convenience method for guessing the DM member and setting the state.
 - Do evil hacks to make DNDRoomTile do dragging of RoomTiles to and from the People section. Dragging a DM to and from Rooms/Favourites/Low Priority now works as one would expect. This is still not ideal however because edge cases exist where you have more than one tag set and then you drag a DM from "Favourites" to "Rooms" and the tile ends up in "People". This would require setting multiple tags, and breaks the 1-1 mapping between tags and sections even further. Ultimately the UI needs a rework.
2017-03-17 12:14:44 +00:00
David Baker e3e2e3a56c Merge pull request #3453 from vector-im/luke/display-redactions-better
Better CSS for redactions
2017-03-16 17:12:11 +00:00
Luke Barnard 49be954d31 Better CSS for redactions
See https://github.com/vector-im/riot-web/issues/3390

Also: The "Redact" option in the MessageContextMenu no longer appears for redacted events.
2017-03-16 17:03:16 +00:00
David Baker ad306dd999 CSS for add phone number in UserSettings 2017-03-16 14:59:13 +00:00
David Baker 2efcf7023f Merge pull request #3448 from vector-im/luke/fix-room-list-people
Fix the people section
2017-03-16 13:19:45 +00:00
Luke Barnard f8298b2482 Fix the people section
This does two things:
 - Fixes an incorrect import that was causing Direct Chat toggle to not be editable https://github.com/vector-im/riot-web/issues/3355
 - Use props.list in RoomSubList when calculating whether to show IncomingCallDialog. Fixes https://github.com/vector-im/riot-web/issues/2956
2017-03-16 11:36:57 +00:00
David Baker c4d3d66f31 Support for phone number registration/signin, mk2
Changes from https://github.com/vector-im/riot-web/pull/3381
2017-03-14 14:45:54 +00:00
Luke Barnard 1ade7a711c Merge pull request #3395 from vector-im/luke/merge-RoomTile-context-menus
Merge the two RoomTile context menus into one
2017-03-14 14:19:41 +00:00
Luke Barnard 32b9ee7f6f Copyright 2017-03-14 14:07:10 +00:00
Luke Barnard e4c155a881 Merge branch 'develop' into luke/merge-RoomTile-context-menus
Conflicts:
	src/components/views/context_menus/RoomTagContextMenu.js
2017-03-14 14:01:47 +00:00
David Baker 4e6541b404 Merge pull request #3385 from vector-im/luke/fix-screen-after-login
Refactor screen set after login
2017-03-14 13:47:55 +00:00
Matthew Hodgson df22c90016 fix kick dialog CSS 2017-03-13 00:47:20 +00:00
Matthew Hodgson ffba088192 fix CSS for ChatCreateOrReuseDialog 2017-03-13 00:03:53 +00:00
Matthew Hodgson d639eb1049 beautify all error msgs 2017-03-12 23:26:26 +00:00
Matthew Hodgson 0a0293d8fb fix focus on cancel button 2017-03-12 20:13:53 +00:00
Matthew Hodgson 4ad825e4fe fix up cancelbutton CSS 2017-03-12 20:04:07 +00:00
Matthew Hodgson 611bb3a857 beautiful error on roomdirectory fail 2017-03-12 20:04:02 +00:00
Richard van der Hoff e5b3ec83b3 Revert "Support for phone number registration / signin (#3381)"
This reverts commit 271fedd1e9.

This breaks against the current synapse release. We need to think more
carefully about backwards compatibility.
2017-03-09 20:41:11 +00:00
Luke Barnard 3dc45886f7 Merge the two RoomTile context menus into one 2017-03-09 17:05:51 +00:00
Tom Lant 927d305ed9 Fixing triage markdown as per #3382 2017-03-09 14:36:56 +00:00
Tom Lant c4bc38f0d7 Fixing triage markdown as per #3382 2017-03-09 12:00:54 +00:00
David Baker 271fedd1e9 Support for phone number registration / signin (#3381)
* WIP msisdn signin (css)

* Changed how highlights are done

to support keyboard based navigation

* Support for new InteractiveAuth registration

* CSS for msisdn auth entry component

* CSS tweaks for msisdn login

* Fix tests
2017-03-09 10:58:58 +00:00
David Baker 23422fdb86 Merge pull request #3379 from vector-im/luke/css-visible-redactions
CSS for redacted EventTiles
2017-03-09 10:09:31 +00:00
Luke Barnard 7ff2871ad5 const 2017-03-09 10:04:15 +00:00
Luke Barnard cbc31a6c41 Remove redundant thing 2017-03-09 10:03:23 +00:00
Luke Barnard 6a1118218b Merge pull request #3340 from vector-im/luke/css-rts-fix-welcome-pages-safari
Height:100% for welcome pages on Safari
2017-03-08 17:07:53 +00:00
Luke Barnard eddf33a689 Refactor screen set after login 2017-03-08 14:57:13 +00:00
Luke Barnard 08852c6174 Merge pull request #3376 from vector-im/luke/refactor-room-tile
`view_room` dispatch from `onClick` RoomTile
2017-03-07 16:20:31 +00:00
Luke Barnard 2bf96d4887 Merge pull request #3350 from vector-im/luke/css-statusbar-v-balance
Hide statusAreaBox_line entirely when inCall
2017-03-07 13:29:56 +00:00
Luke Barnard 9d96baa613 Alter comments on height: auto
Having tested Riot with the middlePanel having a height of 100%, it seems to be OK.
2017-03-07 10:22:45 +00:00
Luke Barnard a7db42d184 CSS for redacted EventTiles 2017-03-07 09:21:50 +00:00
Luke Barnard 3d67234372 view_room dispatch from onClick RoomTile
So that RoomTile does less, and if other things should happen onClick, they happen in the same place as the `view_room` for clarity.
2017-03-06 17:55:12 +00:00
Luke Barnard b1f14ba979 Merge pull request #3351 from vector-im/luke/css-spinner-height
Set padding-bottom: 0px for .mx_Dialog spinner
2017-03-03 18:01:08 +00:00
Luke Barnard a1462946cd padding: 0px 2017-03-03 13:54:26 +00:00
David Baker ae27667f48 Merge pull request #3333 from vector-im/dbkr/register_ui_auth
Support InteractiveAuth based registration
2017-03-03 13:37:46 +00:00
David Baker c6da4d93f1 Merge pull request #3334 from turt2live/travis/notifs
Expose notification option for username/MXID
2017-03-02 18:26:53 +00:00
Luke Barnard 024fea0687 Set padding-bottom: 0px for .mx_Dialog spinner
This was causing https://github.com/vector-im/riot-web/issues/3226
2017-03-02 17:39:02 +00:00
Luke Barnard cfbcffac5a Hide statusAreaBox_line entirely when inCall
This is to keep things vertically balanced.

Fixes https://github.com/vector-im/riot-web/issues/3269
2017-03-02 16:57:52 +00:00
Luke Barnard 640c486bde Merge pull request #3190 from vector-im/luke/mels-toggle-scss
Float the toggle in the top right of MELS
2017-03-02 15:19:57 +00:00
Luke Barnard 66e93c8a8c Fix for vector-im/riot-web#3298 - height:100% for welcome pages on Safari 2017-03-01 10:04:48 +00:00
Matthew Hodgson 8a7ec27dc7 fix whitespace in urlpreview title 2017-02-28 00:16:43 +00:00
turt2live 9afbe8e3fc Change wording in notification description 2017-02-27 15:47:21 -07:00
turt2live 9b42fbe42f Expose notification option for username/MXID
For those unfortunate people that get pinged constantly.
2017-02-27 15:32:58 -07:00
Matthew Hodgson ae145ff32e oops, fix #3270 properly 2017-02-27 22:25:22 +00:00
David Baker a8e99109b1 Support InteractiveAuth based registration
Passes in a function to make a register URL rather than just
passing in the URL base
2017-02-24 11:45:28 +00:00
Richard van der Hoff bb4d8ee3e8 Merge pull request #3311 from vector-im/rav/rageshake_culling
More aggressive rageshake log culling
2017-02-23 14:38:36 +00:00
Richard van der Hoff 038f5767f2 Add a comment 2017-02-23 14:37:46 +00:00
Richard van der Hoff e2cec7b69c More aggressive rageshake log culling
Also bump the client-side timeout on the upload from 3 mins to 5 mins, to see
if it helps people on slower connections.
2017-02-23 14:22:03 +00:00
Matthew Hodgson 6690df1203 Merge pull request #3282 from Half-Shot/develop
Don't overflow directory network options
2017-02-22 01:13:14 +00:00
Aviral Dasgupta c21cdf5b02 add .editorconfig
Signed-off-by: Aviral Dasgupta <me@aviraldg.com>
2017-02-21 23:38:03 +05:30
Will Hunt 37f320c4a4 Don't overflow directory network options 2017-02-21 12:25:29 +00:00
David Baker feb8115d24 Desktop instructions: npm run build, not dist
Clarify that you only need to run build rather than dist to run
the electron app.

Hopefully satisfies: https://github.com/vector-im/riot-web/pull/3237
2017-02-20 10:32:14 +00:00
Richard van der Hoff 5c87b8045a Merge remote-tracking branch 'origin/master' into develop 2017-02-20 09:14:22 +00:00
Richard van der Hoff d8c877fe6e Update ISSUE_TEMPLATE.md 2017-02-20 09:14:01 +00:00
Matthew Hodgson 67a7ed1e34 fix spacing of permalinks to info events 2017-02-20 01:49:11 +02:00
Matthew Hodgson eabe4f5c29 hopefully fix https://github.com/vector-im/riot-web/issues/3270 2017-02-20 01:48:10 +02:00
Matthew Hodgson f91f5cb65e fix RTE dark theme 2017-02-20 01:27:05 +02:00
Matthew Hodgson 5951e8fb27 don't try to darktheme scalar for now 2017-02-20 01:18:48 +02:00
Matthew Hodgson be79ccccf6 fix dark theme room join bar 2017-02-20 01:15:54 +02:00
Matthew Hodgson aba121aab0 fix cursor 2017-02-19 04:13:29 +02:00
Matthew Hodgson c146ddf29b turn on rageshake for desktop 2017-02-18 23:59:45 +02:00
Matthew Hodgson 5469270e41 spell out where the PGP key lives for releases 2017-02-18 23:48:58 +02:00
Matthew Hodgson 457b64037d renormalise ringtone to 66% amplitude 2017-02-18 23:04:38 +02:00
David Baker a0f572c26e Don't hardcode home dir in jenkins script 2017-02-17 19:18:58 +00:00
David Baker f51669664c Merge pull request #3250 from vector-im/dbkr/support_kick_ban_reasons
CSS for ban / kick reason prompt
2017-02-17 17:39:38 +00:00
David Baker 75f2ba6b19 CSS for ban / kick reason prompt
For https://github.com/matrix-org/matrix-react-sdk/pull/710
2017-02-17 17:29:57 +00:00
David Baker e8d5e8c8ab Merge pull request #3246 from vector-im/dbkr/allow_forget_ban
Allow forgetting rooms you're banned from
2017-02-17 16:36:19 +00:00
David Baker 6aa5266029 Merge remote-tracking branch 'origin/develop' into dbkr/allow_forget_ban 2017-02-17 16:19:15 +00:00
David Baker 03dd25624f Allow forgetting rooms you're banned from
From the room tag context menu.

Also fix the room tag context menu, which was missing sdk and
modal imports. Switch over the import while we're at it.
2017-02-17 15:52:07 +00:00
David Baker 0d1c53285b Merge pull request #3245 from vector-im/dbkr/fix_manifest_icon_paths
Fix icon paths in manifest
2017-02-17 15:41:49 +00:00
David Baker aad880b3b5 Fix icon paths in manifest
They are not at the root of the web server, they are at the same
path as the manifest
2017-02-17 15:31:28 +00:00
Kegsay 5c2049935a Merge pull request #3242 from vector-im/kegan/fix-tests-for-indexeddb
Fix broken tests caused by adding IndexedDB support
2017-02-17 14:54:56 +00:00
Kegan Dougal d876e4482b Fix broken tests caused by adding IndexedDB support
This test assumed that `/sync` would be called immediately after rendering
`<MatrixChat />` but this isn't true in an IndexedDB world: it bounces via
`store.startup()` first.

It looks like the tests resolve this by adding `q.delay(1)` so that's what
I've done: in the future it would be better to extend `HttpBackend` to have
a `waitFor(req) Promise` function so we can removing timing from the tests.
2017-02-17 14:32:08 +00:00
Richard van der Hoff 75097471b6 Merge pull request #3227 from vector-im/dbkr/add_unban_button
CSS for un-ban button in RoomSettings
2017-02-17 12:46:13 +00:00
David Baker 8224d7fc60 Oops - remove empty CSS selector 2017-02-16 15:14:53 +00:00
Luke Barnard f2654616eb Merge pull request #3239 from vector-im/luke/css-remove-avatar-initial-z-index
Remove z-index property on avatar initials
2017-02-16 13:45:45 +00:00
Luke Barnard fc0e460222 Remove z-index property on avatar initials
This seemingly doesn't do anything and upsets things when avatars overlap (i.e. for the new typing avatars).

See https://github.com/matrix-org/matrix-react-sdk/pull/699
2017-02-16 11:42:32 +00:00
Luke Barnard 827692b9b0 Merge pull request #3233 from vector-im/luke/css-status-bar-icon-positioning
Reposition certain icons in the status bar
2017-02-15 15:56:41 +00:00
Luke Barnard bfad7612c6 Re-position certain icons in the status bar
Also, make sure the typing avatars line up with the arrow to jump to the bottom of the timeline.
Also, get rid of any height jumps when a call starts. border 1px hidden does not add any height to an element, it is effectively the same as none.
2017-02-15 15:45:24 +00:00
David Baker f1f54c95ab Copyright 2017-02-14 18:11:36 +00:00
David Baker 5ecf560675 CSS for un-ban button in RoomSettings 2017-02-14 17:56:42 +00:00
David Baker b9dd419d04 Merge pull request #3224 from vector-im/dbkr/confirm_ban
CSS for kick/ban confirmation dialog
2017-02-14 17:31:44 +00:00
David Baker 324e596e28 CSS for kick/ban confirmation dialog 2017-02-14 13:42:06 +00:00
David Baker 1bc9ba46c7 Merge pull request #3217 from vector-im/dbkr/interactive_auth_nondialog
Style for split-out interactive auth
2017-02-14 10:55:01 +00:00
David Baker c6ccfa0616 Copyright 2017-02-13 16:15:27 +00:00
David Baker 9e2793dfed Style for split-out interactive auth
For https://github.com/matrix-org/matrix-react-sdk/pull/691
2017-02-13 16:10:43 +00:00
Matthew Hodgson 6a7daaf6c4 remove GA, given it's increasingly useless given Riot/Desktop doesn't use it, plus it obviously has privacy implications. It may get re-added as opt-in in future, so we're not sailing entirely blind on how folks use the app, or we may switch to Piwik etc instead. 2017-02-10 17:21:02 +00:00
David Baker b6741d9b10 Merge pull request #3196 from vector-im/luke/rts-thread-team-token
Use the teamToken threaded through from react sdk
2017-02-10 10:43:24 +00:00
Luke Barnard 78aaf6b47e Use the teamToken threaded through from react sdk
The bottom left menu now uses the same teamToken that the rest of the components use. This will require changes to react-sdk: https://github.com/matrix-org/matrix-react-sdk/pull/684
2017-02-10 09:56:15 +00:00
Luke Barnard 36b08fece7 Float the toggle in the top right of MELS
This is so that it stays put when the MELS is toggled.

Added style for a line that appears below "collapse" to indicate start of events.

Not possible to put "collapse" next to the expanded events because of read receipts.
2017-02-09 15:17:03 +00:00
Matthew Hodgson f2a6d2cc5a fix selector color 2017-02-09 12:01:00 +00:00
Matthew Hodgson 22b7b8efea tweak sending color some more 2017-02-09 11:02:42 +00:00
Matthew Hodgson e392d6c16b fix CSS for import/export buttons 2017-02-09 02:00:23 +00:00
Matthew Hodgson 2eec9b10ef fix dark skin event sending color 2017-02-09 01:42:36 +00:00
Matthew Hodgson 64f0beb1eb fix https://github.com/vector-im/riot-web/issues/3136 2017-02-09 01:33:26 +00:00
Matthew Hodgson f6b6673a41 fix selection text colour in dark theme 2017-02-09 01:20:30 +00:00
Matthew Hodgson d8042b193b be more specific on flex 2017-02-09 00:10:57 +00:00
Matthew Hodgson 5f745ff733 hopefully fix TopRight layout bug 2017-02-09 00:10:45 +00:00
Matthew Hodgson bac142ad26 fix tintability of home button 2017-02-08 23:28:30 +00:00
Matthew Hodgson caa30a742b fix table visuals in dark skin 2017-02-08 23:19:05 +00:00
Richard van der Hoff d7bc47c357 Merge pull request #3169 from vector-im/kegan/bugs-file-server
rageshake: Add file server with basic auth
2017-02-08 10:37:35 +00:00
Kegan Dougal 5f678eb838 Review comments: change realm name 2017-02-08 10:36:39 +00:00
Kegan Dougal 64eb1f08a9 rageshake: Add file server with basic auth
Set via environment variables on startup.
2017-02-08 09:59:41 +00:00
David Baker 85e6057598 Merge pull request #3162 from vector-im/luke/rts-fix-blm-team-token
Fix bug with home icon not appearing when logged in as team member
2017-02-08 09:54:33 +00:00
Richard van der Hoff b080e5797b Merge remote-tracking branch 'origin/master' into develop 2017-02-07 21:46:08 +00:00
Richard van der Hoff f629b2f631 CONTRIBUTING: s/vector/riot/ 2017-02-07 21:45:34 +00:00
Richard van der Hoff c4ee47aa15 Merge branch 'master' into develop 2017-02-07 21:40:18 +00:00
Richard van der Hoff 0c7c31e3bb Merge branch 'master' into rav/issue_template 2017-02-07 21:29:35 +00:00
Richard van der Hoff 0442258865 More issue_template tweaks
Encourage rageshaking

don't insist on version for the web app
2017-02-07 21:25:58 +00:00
Richard van der Hoff 95f529f9a4 Tweak ISSUE_TEMPLATE 2017-02-07 20:35:14 +00:00
David Baker be71da5657 Merge pull request #3150 from vector-im/kegan/dir-per-bug
Store bug reports in separate directories
2017-02-07 16:18:00 +00:00
Kegan Dougal f16bb85f9b Review comments 2017-02-07 16:04:06 +00:00
Luke Barnard 5b239adfb8 Fix bug with home icon not appearing when logged in as team member 2017-02-07 14:58:25 +00:00
David Baker 2f54034afe Merge pull request #3103 from vector-im/luke/rts-welcome-pages
RTS Welcome Pages
2017-02-07 11:52:59 +00:00
Luke Barnard fa552ad5af Merge branch 'develop' into luke/rts-welcome-pages 2017-02-07 12:41:52 +01:00
Luke Barnard 35bc384c51 Set team token in state on mount 2017-02-07 11:39:31 +00:00
Luke Barnard d490bd8638 Use home.html rather than welcome.html 2017-02-07 11:35:17 +00:00
Luke Barnard 8d4f81ff67 Remove redundant inline style 2017-02-07 11:34:49 +00:00
Luke Barnard 648204b6f9 Use import 2017-02-07 11:34:34 +00:00
Luke Barnard 3f49f020cf Copyright 2017-02-07 11:19:01 +00:00
Kegan Dougal 678eccf33d Store bug reports in separate directories 2017-02-06 16:18:08 +00:00
Kegsay 1f0b4853be Merge pull request #3149 from vector-im/kegan/go-stds
rageshake: Abide by Go standards
2017-02-06 15:40:58 +00:00
Kegan Dougal db31f0a087 Host API under /api. Use filepath.Join rather than string concatenation 2017-02-06 15:31:53 +00:00
Kegan Dougal d4247e0179 Dump to bugs subdirectory 2017-02-06 14:56:06 +00:00
Richard van der Hoff af765c7522 Merge branch 'master' into develop
(Keep react-sdk and js-sdk on develop)
2017-02-04 11:04:25 +00:00
Kegsay 18ac71e8c0 Merge pull request #3072 from vector-im/kegan/rageshake-server
Bug report server script
2017-02-03 17:33:51 +00:00
Richard van der Hoff 541eb45e1a Jenkins: use default olm
... to stop us making a release and realising we forgot to bump the olm version
in vector-web.
2017-02-03 15:06:03 +00:00
Richard van der Hoff 53e5c7eebe Unpin js-sdk & react-sdk 2017-02-03 14:39:11 +00:00
Richard van der Hoff 640beeedda Merge pull request #3125 from vector-im/dbkr/olm_version
Bump olm version
2017-02-03 13:52:37 +00:00
David Baker 5285d56a45 Bump olm version
Looks like this is causing pickle errors on packaged builds.
2017-02-03 13:51:02 +00:00
Luke Barnard e77709bc71 Merge branch 'develop' into luke/rts-welcome-pages
Conflicts:
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
2017-02-02 14:03:21 +00:00
Luke Barnard a2622a556c Remove SdkConfig dep 2017-02-02 14:01:12 +00:00
Luke Barnard 6a9e5deb7b Remove commented code 2017-02-02 14:00:21 +00:00
Luke Barnard 20a7e3adf9 Migrate existing pages over to RTS
See matrix-org/riot-team-server#14
2017-02-02 13:58:22 +00:00
Luke Barnard f2e62ff439 Use RTS URL passed through 2017-02-02 11:58:20 +00:00
Luke Barnard 4a34bee2dc Use localStorage mx_team_token to decide welcome page 2017-02-02 11:12:43 +00:00
Luke Barnard 40609d7da3 then->done 2017-02-01 11:39:23 +00:00
Luke Barnard 1f3ab4425a Merge branch 'develop' into matthew/homepages
Conflicts:
	src/component-index.js
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
2017-02-01 11:34:24 +00:00
Kegan Dougal 22bb0f9d30 UTC please 2017-01-26 12:17:47 +00:00
Kegan Dougal 6a40ad8a20 Fail the request if we clash files
Rather than make the file names incredibly long (by adding ms),
just 500 it and expect the user to resend.
2017-01-26 11:57:56 +00:00
Kegan Dougal aae62ff94e store logs 2017-01-26 11:44:07 +00:00
Kegan Dougal e8c51a0b54 gzip bug reports when storing on disk. Set max payload size 2017-01-26 11:28:38 +00:00
Kegan Dougal 646ace6e59 Merge branch 'develop' into kegan/rageshake-server 2017-01-26 10:48:40 +00:00
Kegan Dougal 9d034c77a5 Initial rageshake server 2017-01-25 17:27:07 +00:00
Kevin McDonald 650269d356 Add ISSUE_TEMPLATE 2016-12-26 21:33:27 -07:00
Matthew Hodgson 3155d79a7e chatbot summit stuff 2016-11-17 13:35:36 +02:00
Matthew Hodgson 1599f3a666 make logo scale 2016-11-14 01:46:42 +00:00
Matthew Hodgson f911f0cfca geektime verbiage tweaks 2016-11-13 20:18:19 +00:00
Matthew Hodgson 1fb14d5a40 plug mobile apps 2016-11-13 14:32:00 +00:00
Matthew Hodgson 616c20fc1e fix img path 2016-11-13 14:26:54 +00:00
Matthew Hodgson 6cf14e6a2a fix room alias 2016-11-13 14:19:55 +00:00
Matthew Hodgson 9f812b7069 fix img path 2016-11-13 14:18:31 +00:00
Matthew Hodgson efabf35613 make room previews more obvious 2016-11-13 14:13:32 +00:00
Matthew Hodgson 3f640139d2 quick and dirty support for custom welcome pages, with an example for geektime techfest 2016-11-13 14:10:33 +00:00
369 changed files with 2542 additions and 1293 deletions
+23
View File
@@ -0,0 +1,23 @@
# Copyright 2017 Aviral Dasgupta
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
root = true
[*]
charset=utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
+44
View File
@@ -0,0 +1,44 @@
<!-- This is a bug report template. By following the instructions below and
filling out the sections with your information, you will help the us to get all
the necessary data to fix your issue.
You can also preview your report before submitting it. You may remove sections
that aren't relevant to your particular case.
Text between <!-- and --> marks will be invisible in the report.
-->
### Description
Describe here the problem that you are experiencing, or the feature you are requesting.
### Steps to reproduce
- For bugs, list the steps
- that reproduce the bug
- using hyphens as bullet points
Describe how what happens differs from what you expected.
Log: sent/not sent? <!-- You can send us the app's logs via the 'Report bug'
link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
file a bug here too! -->
<!-- Include screenshots if possible: you can drag and drop images below. -->
### Version information
<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
- **Platform**: web (in-browser) or desktop?
For the web app:
- **Browser**: Chrome, Safari, Firefox? which version?
- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
For the desktop app:
- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
- **Version**: 0.x.y <!-- check the user settings panel if unsure -->
+3
View File
@@ -5,6 +5,7 @@
/key.pem
/lib
/node_modules
/electron/node_modules
/packages/
/webapp
/.npmrc
@@ -12,3 +13,5 @@
npm-debug.log
electron/dist
electron/pub
/config.json
/src/component-index.js
+4 -2
View File
@@ -9,6 +9,8 @@
"test/css/flexbox",
"test/es5/specification",
"test/css/objectfit",
"test/storage/localstorage"
"test/storage/localstorage",
"test/workers/webworkers",
"test/indexeddb"
]
}
}
+3
View File
@@ -10,3 +10,6 @@ include:
* Florent VIOLLEAU (https://github.com/floviolleau) <floviolleau at gmail dot com>
Improve README.md for a better understanding of installation instructions
* Michael Telatynski (https://github.com/t3chguy)
Improved consistency of inverted elements in dark theme across browsers
+248
View File
@@ -1,3 +1,251 @@
Changes in [0.9.10](https://github.com/vector-im/riot-web/releases/tag/v0.9.10) (2017-05-22)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.10-rc.1...v0.9.10)
* No changes
Changes in [0.9.10-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.10-rc.1) (2017-05-19)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.9...v0.9.10-rc.1)
* CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
[\#3959](https://github.com/vector-im/riot-web/pull/3959)
* Add square flag pngs /w genflags.sh script
[\#3953](https://github.com/vector-im/riot-web/pull/3953)
* Add config for riot-bot on desktop app build
[\#3954](https://github.com/vector-im/riot-web/pull/3954)
* Desktop: 'copy link address'
[\#3952](https://github.com/vector-im/riot-web/pull/3952)
* Reduce rageshake log size to 1MB
[\#3943](https://github.com/vector-im/riot-web/pull/3943)
* CSS for putting country dd on same line as phone input
[\#3942](https://github.com/vector-im/riot-web/pull/3942)
* fix #3894
[\#3919](https://github.com/vector-im/riot-web/pull/3919)
* change vector->riot on the surface
[\#3894](https://github.com/vector-im/riot-web/pull/3894)
* move manifest.json outward so it is scoped properly
[\#3888](https://github.com/vector-im/riot-web/pull/3888)
* add to manifest
[\#3799](https://github.com/vector-im/riot-web/pull/3799)
* Automatically update component-index
[\#3886](https://github.com/vector-im/riot-web/pull/3886)
* move electron -> electron_app because npm smart
[\#3877](https://github.com/vector-im/riot-web/pull/3877)
* Fix bug report endpoint in config.sample.json.
[\#3863](https://github.com/vector-im/riot-web/pull/3863)
* Update 2 missed icons to the new icon
[\#3851](https://github.com/vector-im/riot-web/pull/3851)
* Make left panel better for new users (mk II)
[\#3804](https://github.com/vector-im/riot-web/pull/3804)
* match primary package.json
[\#3839](https://github.com/vector-im/riot-web/pull/3839)
* Re-add productName
[\#3829](https://github.com/vector-im/riot-web/pull/3829)
* Remove leading v in /version file, for SemVer and to match Electron ver
[\#3683](https://github.com/vector-im/riot-web/pull/3683)
* Fix scope of callback
[\#3790](https://github.com/vector-im/riot-web/pull/3790)
* Remember and Recall window layout/position state
[\#3622](https://github.com/vector-im/riot-web/pull/3622)
* Remove babelcheck
[\#3808](https://github.com/vector-im/riot-web/pull/3808)
* Include MXID and device id in rageshakes
[\#3809](https://github.com/vector-im/riot-web/pull/3809)
* import Modal
[\#3791](https://github.com/vector-im/riot-web/pull/3791)
* Pin filesize ver to fix break upstream
[\#3775](https://github.com/vector-im/riot-web/pull/3775)
* Improve Room Directory Look & Feel
[\#3751](https://github.com/vector-im/riot-web/pull/3751)
* Fix emote RRs alignment
[\#3742](https://github.com/vector-im/riot-web/pull/3742)
* Remove unused `placeholder` prop on RoomDropTarget
[\#3741](https://github.com/vector-im/riot-web/pull/3741)
* Modify CSS for matrix-org/matrix-react-sdk#833
[\#3732](https://github.com/vector-im/riot-web/pull/3732)
* Warn when exiting due to single-instance
[\#3727](https://github.com/vector-im/riot-web/pull/3727)
* Electron forgets it was maximized when you click on a notification
[\#3709](https://github.com/vector-im/riot-web/pull/3709)
* CSS to make h1 and h2 the same size as h1.
[\#3719](https://github.com/vector-im/riot-web/pull/3719)
* Prevent long room names/topics from pushing UI of the screen
[\#3721](https://github.com/vector-im/riot-web/pull/3721)
* Disable dropdown highlight on focus
[\#3717](https://github.com/vector-im/riot-web/pull/3717)
* Escape HTML Tags from Linux Notifications (electron)
[\#3564](https://github.com/vector-im/riot-web/pull/3564)
* styling for spoilerized access token view in Settings
[\#3651](https://github.com/vector-im/riot-web/pull/3651)
* Fix Webpack conf
[\#3690](https://github.com/vector-im/riot-web/pull/3690)
* Add config.json to .gitignore
[\#3599](https://github.com/vector-im/riot-web/pull/3599)
* add command line arg (--hidden) for electron app
[\#3641](https://github.com/vector-im/riot-web/pull/3641)
* fix ImageView Download functionality
[\#3640](https://github.com/vector-im/riot-web/pull/3640)
* Add cross-env into the mix
[\#3693](https://github.com/vector-im/riot-web/pull/3693)
* Remember acceptance for unsupported browsers.
[\#3694](https://github.com/vector-im/riot-web/pull/3694)
* Cosmetics to go with matrix-org/matrix-react-sdk#811
[\#3692](https://github.com/vector-im/riot-web/pull/3692)
* Cancel quicksearch on ESC
[\#3680](https://github.com/vector-im/riot-web/pull/3680)
* Optimise RoomList and implement quick-search functionality on it.
[\#3654](https://github.com/vector-im/riot-web/pull/3654)
* Progress updates for rageshake uploads
[\#3648](https://github.com/vector-im/riot-web/pull/3648)
* Factor out rageshake upload to a separate file
[\#3645](https://github.com/vector-im/riot-web/pull/3645)
* rageshake: fix race when collecting logs
[\#3644](https://github.com/vector-im/riot-web/pull/3644)
* Fix a flaky test
[\#3649](https://github.com/vector-im/riot-web/pull/3649)
Changes in [0.9.9](https://github.com/vector-im/riot-web/releases/tag/v0.9.9) (2017-04-25)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.9-rc.2...v0.9.9)
* No changes
Changes in [0.9.9-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.9-rc.2) (2017-04-24)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.9-rc.1...v0.9.9-rc.2)
* Fix bug where links to Riot would fail to open.
Changes in [0.9.9-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.9-rc.1) (2017-04-21)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8...v0.9.9-rc.1)
* Update js-sdk and matrix-react-sdk to fix registration without a captcha (https://github.com/vector-im/riot-web/issues/3621)
Changes in [0.9.8](https://github.com/vector-im/riot-web/releases/tag/v0.9.8) (2017-04-12)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.3...v0.9.8)
* No changes
Changes in [0.9.8-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.3) (2017-04-11)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.2...v0.9.8-rc.3)
* Make the clear cache button work on desktop
[\#3598](https://github.com/vector-im/riot-web/pull/3598)
Changes in [0.9.8-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.2) (2017-04-10)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.1...v0.9.8-rc.2)
* Redacted events bg: black lozenge -> torn paper
[\#3596](https://github.com/vector-im/riot-web/pull/3596)
* Add 'app' parameter to rageshake report
[\#3594](https://github.com/vector-im/riot-web/pull/3594)
Changes in [0.9.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.1) (2017-04-07)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7...v0.9.8-rc.1)
* Add support for indexeddb sync in webworker
[\#3578](https://github.com/vector-im/riot-web/pull/3578)
* Add CSS to make Emote sender cursor : pointer
[\#3574](https://github.com/vector-im/riot-web/pull/3574)
* Remove rageshake server
[\#3565](https://github.com/vector-im/riot-web/pull/3565)
* Adjust CSS for matrix-org/matrix-react-sdk#789
[\#3566](https://github.com/vector-im/riot-web/pull/3566)
* Fix tests to reflect recent changes
[\#3537](https://github.com/vector-im/riot-web/pull/3537)
* Do not assume getTs will return comparable integer
[\#3536](https://github.com/vector-im/riot-web/pull/3536)
* Rename ReactPerf to Perf
[\#3535](https://github.com/vector-im/riot-web/pull/3535)
* Don't show phone number as target for email notifs
[\#3530](https://github.com/vector-im/riot-web/pull/3530)
* Fix people section again
[\#3458](https://github.com/vector-im/riot-web/pull/3458)
* dark theme invert inconsistent across browsers
[\#3479](https://github.com/vector-im/riot-web/pull/3479)
* CSS for adding phone number in UserSettings
[\#3451](https://github.com/vector-im/riot-web/pull/3451)
* Support for phone number registration/signin, mk2
[\#3426](https://github.com/vector-im/riot-web/pull/3426)
* Confirm redactions with a dialog
[\#3470](https://github.com/vector-im/riot-web/pull/3470)
* Better CSS for redactions
[\#3453](https://github.com/vector-im/riot-web/pull/3453)
* Fix the people section
[\#3448](https://github.com/vector-im/riot-web/pull/3448)
* Merge the two RoomTile context menus into one
[\#3395](https://github.com/vector-im/riot-web/pull/3395)
* Refactor screen set after login
[\#3385](https://github.com/vector-im/riot-web/pull/3385)
* CSS for redacted EventTiles
[\#3379](https://github.com/vector-im/riot-web/pull/3379)
* Height:100% for welcome pages on Safari
[\#3340](https://github.com/vector-im/riot-web/pull/3340)
* `view_room` dispatch from `onClick` RoomTile
[\#3376](https://github.com/vector-im/riot-web/pull/3376)
* Hide statusAreaBox_line entirely when inCall
[\#3350](https://github.com/vector-im/riot-web/pull/3350)
* Set padding-bottom: 0px for .mx_Dialog spinner
[\#3351](https://github.com/vector-im/riot-web/pull/3351)
* Support InteractiveAuth based registration
[\#3333](https://github.com/vector-im/riot-web/pull/3333)
* Expose notification option for username/MXID
[\#3334](https://github.com/vector-im/riot-web/pull/3334)
* Float the toggle in the top right of MELS
[\#3190](https://github.com/vector-im/riot-web/pull/3190)
* More aggressive rageshake log culling
[\#3311](https://github.com/vector-im/riot-web/pull/3311)
* Don't overflow directory network options
[\#3282](https://github.com/vector-im/riot-web/pull/3282)
* CSS for ban / kick reason prompt
[\#3250](https://github.com/vector-im/riot-web/pull/3250)
* Allow forgetting rooms you're banned from
[\#3246](https://github.com/vector-im/riot-web/pull/3246)
* Fix icon paths in manifest
[\#3245](https://github.com/vector-im/riot-web/pull/3245)
* Fix broken tests caused by adding IndexedDB support
[\#3242](https://github.com/vector-im/riot-web/pull/3242)
* CSS for un-ban button in RoomSettings
[\#3227](https://github.com/vector-im/riot-web/pull/3227)
* Remove z-index property on avatar initials
[\#3239](https://github.com/vector-im/riot-web/pull/3239)
* Reposition certain icons in the status bar
[\#3233](https://github.com/vector-im/riot-web/pull/3233)
* CSS for kick/ban confirmation dialog
[\#3224](https://github.com/vector-im/riot-web/pull/3224)
* Style for split-out interactive auth
[\#3217](https://github.com/vector-im/riot-web/pull/3217)
* Use the teamToken threaded through from react sdk
[\#3196](https://github.com/vector-im/riot-web/pull/3196)
* rageshake: Add file server with basic auth
[\#3169](https://github.com/vector-im/riot-web/pull/3169)
* Fix bug with home icon not appearing when logged in as team member
[\#3162](https://github.com/vector-im/riot-web/pull/3162)
* Add ISSUE_TEMPLATE
[\#2836](https://github.com/vector-im/riot-web/pull/2836)
* Store bug reports in separate directories
[\#3150](https://github.com/vector-im/riot-web/pull/3150)
* Quick and dirty support for custom welcome pages.
[\#2575](https://github.com/vector-im/riot-web/pull/2575)
* RTS Welcome Pages
[\#3103](https://github.com/vector-im/riot-web/pull/3103)
* rageshake: Abide by Go standards
[\#3149](https://github.com/vector-im/riot-web/pull/3149)
* Bug report server script
[\#3072](https://github.com/vector-im/riot-web/pull/3072)
* Bump olm version
[\#3125](https://github.com/vector-im/riot-web/pull/3125)
Changes in [0.9.7](https://github.com/vector-im/riot-web/releases/tag/v0.9.7) (2017-02-04)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.3...v0.9.7)
+3 -3
View File
@@ -1,4 +1,4 @@
Contributing code to Vector
===========================
Contributing code to Riot
=========================
Vector follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst
Riot follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst.
+38 -15
View File
@@ -21,6 +21,9 @@ released version of Riot:
as desired. See below for details.
1. Enter the URL into your browser and log into Riot!
Releases are signed by PGP, and can be checked against the public key
at https://riot.im/packages/keys/riot-master.asc
Note that Chrome does not allow microphone or webcam access for sites served
over http (except localhost), so for working VoIP you will need to serve Riot
over https.
@@ -64,6 +67,18 @@ to build.
(cd node_modules/matrix-js-sdk && npm install)
(cd node_modules/matrix-react-sdk && npm install)
```
Whenever you git pull on riot-web you will also probably need to force an update
to these dependencies - the easiest way is probably:
```
rm -rf node_modules/matrjx-{js,react}-sdk && npm i
(cd node_modules/matrix-js-sdk && npm install)
(cd node_modules/matrix-react-sdk && npm install)
```
However, we recommend setting up a proper development environment (see "Setting
up a development environment" below) if you want to run your own copy of the
`develop` branch, as it makes it much easier to keep these dependencies
up-to-date. Or just use https://riot.im/develop - the continuous integration
release of the develop branch.
1. Configure the app by copying `config.sample.json` to `config.json` and
modifying it (see below for details)
1. `npm run dist` to build a tarball to deploy. Untaring this file will give
@@ -114,12 +129,13 @@ built it yourself.
To run as a desktop app:
1. Follow the instructions in 'Building From Source' above
1. Follow the instructions in 'Building From Source' above, but run
`npm run build` instead of `npm run dist` (since we don't need the tarball).
2. Install electron and run it:
```
npm install electron
node_modules/.bin/electron .
npm run electron
```
To build packages, use electron-builder. This is configured to output:
@@ -263,21 +279,28 @@ Triaging issues
Issues will be triaged by the core team using the following primary set of tags:
priority:
P1: top priority; typically blocks releases.
P2: one below that
P3: non-urgent
P4/P5: bluesky some day, who knows.
* P1: top priority; typically blocks releases
* P2: still need to fix, but lower than P1
* P3: non-urgent
* P4: intereseting idea - bluesky some day
* P5: recorded for posterity/to avoid duplicates. No intention to resolves right now.
bug or feature:
bug severity:
* cosmetic - feature works functionally but UI/UX is broken.
* critical - whole app doesn't work
* major - entire feature doesn't work
* minor - partially broken feature (but still usable)
* release blocker
* bug
* feature
* ui/ux (think of this as cosmetic)
bug severity:
* cosmetic - feature works functionally but UI/UX is broken
* critical - whole app doesn't work
* major - entire feature doesn't work
* minor - partially broken feature (but still usable)
* network (specific to network conditions)
* platform (platform specific)
additional categories:
* release blocker
* ui/ux (think of this as cosmetic)
* network (specific to network conditions)
* platform (platform specific)
+1 -1
View File
@@ -4,7 +4,7 @@
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"bug_report_endpoint_url": "https://vector.im/bugs",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"enableLabs": true,
"roomDirectory": {
"servers": [
Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

-72
View File
@@ -1,72 +0,0 @@
{
"update_base_url": "https://riot.im/download/desktop/update/",
"default_hs_url": "https://matrix.org",
"default_is_url": "https://vector.im",
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"enableLabs": true,
"roomDirectory": {
"servers": [
"matrix.org"
],
"serverConfig": {
"matrix.org": {
"networks": [
"_matrix",
"gitter",
"irc:freenode",
"irc:mozilla",
"irc:snoonet",
"irc:oftc"
]
}
},
"networks": {
"gitter": {
"protocol": "gitter",
"portalRoomPattern": "#gitter_.*:matrix.org",
"name": "Gitter",
"icon": "https://gitter.im/favicon.ico",
"example": "org/community",
"nativePattern": "[^\\s]+/[^\\s]+$"
},
"irc:freenode": {
"protocol": "irc",
"domain": "chat.freenode.net",
"portalRoomPattern": "#freenode_.*:matrix.org",
"name": "Freenode",
"icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
"example": "#channel",
"nativePattern": "^#[^\\s]+$"
},
"irc:mozilla": {
"protocol": "irc",
"domain": "chat.freenode.net",
"portalRoomPattern": "#mozilla_.*:matrix.org",
"name": "Mozilla",
"icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
"example": "#channel",
"nativePattern": "^#[^\\s]+$"
},
"irc:snoonet": {
"protocol": "irc",
"domain": "ipv6-irc.snoonet.org",
"portalRoomPattern": "#_snoonet_.*:matrix.org",
"name": "Snoonet",
"icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
"example": "#channel",
"nativePattern": "^#[^\\s]+$"
},
"irc:oftc": {
"protocol": "irc",
"domain": "irc.oftc.net",
"portalRoomPattern": "#_oftc_.*:matrix.org",
"name": "OFTC",
"icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
"example": "#channel",
"nativePattern": "^#[^\\s]+$"
}
}
}
}

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Before

Width:  |  Height:  |  Size: 673 B

After

Width:  |  Height:  |  Size: 673 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

+11
View File
@@ -0,0 +1,11 @@
{
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "0.9.10",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
"electron-window-state": "^4.1.0"
}
}
+16
View File
@@ -0,0 +1,16 @@
{
"update_base_url": "https://riot.im/download/desktop/update/",
"default_hs_url": "https://matrix.org",
"default_is_url": "https://vector.im",
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"welcomeUserId": "@riot-bot:matrix.org",
"enableLabs": true,
"roomDirectory": {
"servers": [
"matrix.org"
]
}
}
@@ -30,6 +30,8 @@ const tray = require('./tray');
const VectorMenu = require('./vectormenu');
const windowStateKeeper = require('electron-window-state');
let vectorConfig = {};
try {
vectorConfig = require('../../webapp/config.json');
@@ -84,6 +86,12 @@ function onLinkContextMenu(ev, params) {
safeOpenURL(params.linkURL);
},
}));
popup_menu.append(new electron.MenuItem({
label: 'Copy Link Address',
click() {
electron.clipboard.writeText(params.linkURL);
},
}));
popup_menu.popup();
ev.preventDefault();
}
@@ -171,6 +179,7 @@ const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirector
});
if (shouldQuit) {
console.log("Other instance detected: exiting");
electron.app.quit()
}
@@ -186,11 +195,21 @@ electron.app.on('ready', () => {
process.platform == 'win32' ? 'ico' : 'png'
);
// Load the previous window state with fallback to defaults
let mainWindowState = windowStateKeeper({
defaultWidth: 1024,
defaultHeight: 768,
});
mainWindow = new electron.BrowserWindow({
icon: icon_path,
width: 1024, height: 768,
show: false,
autoHideMenuBar: true,
x: mainWindowState.x,
y: mainWindowState.y,
width: mainWindowState.width,
height: mainWindowState.height,
});
mainWindow.loadURL(`file://${__dirname}/../../webapp/index.html`);
electron.Menu.setApplicationMenu(VectorMenu);
@@ -201,9 +220,12 @@ electron.app.on('ready', () => {
brand: vectorConfig.brand || 'Riot'
});
mainWindow.once('ready-to-show', () => {
mainWindow.show();
});
if (!process.argv.includes('--hidden')) {
mainWindow.once('ready-to-show', () => {
mainWindow.show();
});
}
mainWindow.on('closed', () => {
mainWindow = null;
});
@@ -226,6 +248,8 @@ electron.app.on('ready', () => {
onLinkContextMenu(ev, params);
}
});
mainWindowState.manage(mainWindow);
});
electron.app.on('window-all-closed', () => {
+30 -22
View File
@@ -1,8 +1,8 @@
{
"name": "riot-web",
"productName": "Riot",
"main": "electron/src/electron-main.js",
"version": "0.9.7",
"main": "electron_app/src/electron-main.js",
"version": "0.9.10",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"repository": {
@@ -27,20 +27,23 @@
"matrix-react-parent": "matrix-react-sdk",
"scripts": {
"reskindex": "reskindex -h src/header",
"reskindex:watch": "reskindex -h src/header -w",
"build:res": "node scripts/copy-res.js",
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
"build:compile": "babel --source-maps -d lib src",
"build:bundle": "NODE_ENV=production webpack -p --progress",
"build:compile": "npm run reskindex && babel --source-maps -d lib src",
"build:bundle": "cross-env NODE_ENV=production webpack -p --progress",
"build:bundle:dev": "webpack --optimize-occurence-order --progress",
"build:electron": "npm run clean && npm run build && build -wml --ia32 --x64",
"build": "node scripts/babelcheck.js && npm run build:res && npm run build:bundle",
"build:dev": "node scripts/babelcheck.js && npm run build:res && npm run build:bundle:dev",
"build": "npm run reskindex && npm run build:res && npm run build:bundle",
"build:dev": "npm run reskindex && npm run build:res && npm run build:bundle:dev",
"dist": "scripts/package.sh",
"install:electron": "install-app-deps",
"electron": "npm run install:electron && electron .",
"start:res": "node scripts/copy-res.js -w",
"start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-file=bundles/_dev_/[name].js -w --progress",
"start:js:prod": "NODE_ENV=production webpack-dev-server -w --progress",
"start": "node scripts/babelcheck.js && parallelshell \"npm run start:res\" \"npm run start:js\"",
"start:prod": "parallelshell \"npm run start:res\" \"npm run start:js:prod\"",
"start:js:prod": "cross-env NODE_ENV=production webpack-dev-server -w --progress",
"start": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js\"",
"start:prod": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
"lint": "eslint src/",
"lintall": "eslint src/ test/",
"clean": "rimraf lib webapp electron/dist",
@@ -56,15 +59,16 @@
"draft-js": "^0.8.1",
"extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10",
"filesize": "^3.1.2",
"filesize": "3.5.6",
"flux": "~2.0.3",
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3",
"matrix-js-sdk": "0.7.5",
"matrix-react-sdk": "0.8.6",
"matrix-js-sdk": "0.7.8",
"matrix-react-sdk": "0.8.9",
"modernizr": "^3.1.0",
"pako": "^1.0.5",
"q": "^1.4.1",
"react": "^15.4.0",
"react-dnd": "^2.1.4",
@@ -93,10 +97,11 @@
"babel-preset-stage-2": "^6.17.0",
"chokidar": "^1.6.1",
"cpx": "^1.3.2",
"cross-env": "^4.0.0",
"css-raw-loader": "^0.1.1",
"electron-builder": "^11.2.4",
"electron-builder-squirrel-windows": "^11.2.1",
"emojione": "^2.2.3",
"emojione": "^2.2.7",
"eslint": "^3.14.0",
"eslint-config-google": "^0.7.1",
"eslint-plugin-flowtype": "^2.30.0",
@@ -138,16 +143,18 @@
"build": {
"appId": "im.riot.app",
"category": "Network",
"electronVersion": "1.4.14",
"electronVersion": "1.6.8",
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
"asar": false,
"dereference": true,
"//files": "We bundle everything, so we only need to include webapp/",
"files": [
"electron/src/**",
"electron/img/**",
"webapp/**",
"package.json"
"node_modules/**",
"src/**",
"img/**"
],
"extraResources": [
"webapp/**/*"
],
"linux": {
"target": "deb",
@@ -158,10 +165,11 @@
},
"win": {
"target": "squirrel"
},
"directories": {
"buildResources": "electron_app/build",
"output": "electron_app/dist",
"app": "electron_app"
}
},
"directories": {
"buildResources": "electron/build",
"output": "electron/dist"
}
}
+15 -2
View File
@@ -1,12 +1,25 @@
#!/bin/sh
#!/bin/bash
#
# Script to perform a release of vector-web.
#
# Requires github-changelog-generator; to install, do
# Requires github-changelog-generator; to install, do
# pip install git+https://github.com/matrix-org/github-changelog-generator.git
set -e
cd `dirname $0`
# bump Electron's package.json first
release="${1#v}"
tag="v${release}"
echo "electron npm version"
cd electron_app
npm version --no-git-tag-version "$release"
git commit package.json -m "$tag"
cd ..
exec ./node_modules/matrix-js-sdk/release.sh -z "$@"
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 841 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 744 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 955 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 701 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 938 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 900 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 978 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 689 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 954 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 737 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 842 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 777 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 692 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 726 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 866 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 950 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 800 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 692 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 964 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 908 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 726 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 734 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 970 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 734 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 797 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 723 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 914 B

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Some files were not shown because too many files have changed in this diff Show More