Commit Graph

62531 Commits

Author SHA1 Message Date
David Baker 8ea299bcea v0.8.1 2016-12-09 19:51:27 +00:00
David Baker 15f556406f One more try... 2016-12-09 19:50:02 +00:00
David Baker fb95b71f7b v0.8.1 2016-12-09 19:48:27 +00:00
David Baker 3ddeece619 Back to rc temporarily 2016-12-09 19:47:28 +00:00
David Baker 56d51687f9 v0.8.1 2016-12-09 19:34:21 +00:00
David Baker eb6492200d Prepare changelog for v0.8.1 2016-12-09 19:34:21 +00:00
David Baker d0850d67cd js-sdk 0.7.1 2016-12-09 19:32:27 +00:00
David Baker b4e362d700 Bump to electron 1.4.11 2016-12-09 19:14:59 +00:00
David Baker eabb91da1e Merge pull request #2732 from vector-im/dbkr/desktop_readme
Update README to say how to build the desktop app
2016-12-09 19:06:14 +00:00
David Baker fe574b008b Credit aviral & other options for native riot 2016-12-09 19:05:25 +00:00
David Baker b8fe8a4363 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2016-12-09 18:30:38 +00:00
David Baker 6acbdc442d Actually write latest version into latest 2016-12-09 18:29:54 +00:00
David Baker f7cd5cb76f Update README to say how to build the desktop app 2016-12-09 18:29:06 +00:00
Richard van der Hoff e2195de719 Merge pull request #2731 from vector-im/dbkr/signing_id
Add signing ID in release_config.yaml
2016-12-09 17:31:46 +00:00
David Baker 3921aa4e54 Merge pull request #2722 from vector-im/dbkr/icons
Makeover!
2016-12-09 17:18:27 +00:00
David Baker 48ca0254fe Add signing ID in release_config.yaml
Read by release script in js-sdk
2016-12-09 17:13:20 +00:00
David Baker 375a7605ae Merge remote-tracking branch 'origin/develop' into dbkr/icons 2016-12-09 15:45:21 +00:00
Richard van der Hoff 8097b150a0 Merge pull request #2730 from vector-im/dbkr/fix_test_breakage
Fix broken tests
2016-12-09 15:44:17 +00:00
David Baker 67cf4230ac Fix broken tests
Promises are now not being resolved within the same tick, so give
another tick for the UI to update after all the HTTP calls have
flushed through. This is fairly terrible, but I can't immediately
see a better way of doing this.
2016-12-09 14:27:41 +00:00
Kegsay 21e7b03e53 Merge pull request #586 from matrix-org/kegan/read-receipt-show-time-on-hover
Add read receipt times to the hovertip of read markers
2016-12-09 13:19:44 +00:00
Kegan Dougal 5d99d68a64 Show the full date and time if the receipt was sent days after the event 2016-12-09 11:43:23 +00:00
Kegan Dougal 49010c3e93 Refactor how 'readReceipts' are passed into EventTiles
Instead of passing a list of RoomMembers, pass a list of records with a
`roomMember` prop and a `ts` prop so we can display the timestamp on hover.
2016-12-09 11:24:10 +00:00
David Baker aed5a95c8f Merge pull request #589 from matrix-org/dbkr/dont_crash_if_no_dmroommap
Don't throw exception on stop if no DMRoomMap
2016-12-09 11:04:33 +00:00
David Baker 6a017ba763 Merge pull request #587 from matrix-org/dbkr/fix_test_fail
Fix failing test
2016-12-09 11:04:23 +00:00
David Baker e52907a462 Missed semicolon 2016-12-09 10:59:05 +00:00
Richard van der Hoff b06cff7928 Merge pull request #2727 from vector-im/dbkr/make_loading_tests_work_alone
Make the 'loading' tests work in isolation
2016-12-09 10:58:25 +00:00
David Baker 8d1095bc26 Don't throw exception on stop if no DMRoomMap
Prevents an exception when running the riot 'loading' tests in
isolation
2016-12-09 10:32:56 +00:00
David Baker d65374f7f9 Make the 'loading' tests work in isolation
The 'loading' tests only worked when run with the other tests and
failed if you just ran the file by itself, because the skin was
loading in the 'joining' tests, but not here.
2016-12-09 10:31:26 +00:00
David Baker 289f8ab439 Fix failing test
For some reason, update webpack causes the promise to no longer
complete by the next tick. Change the test to not depend on how
fast the promise goes through.
2016-12-08 18:44:38 +00:00
David Baker f0b0999f65 Numeracy 2016-12-08 18:04:44 +00:00
Kegan Dougal bd7553d1ea Add read receipt times to the hovertip of read markers
Fixes #2709. Surprisingly, this data was never passed down to
ReadReceiptMarker.
2016-12-08 16:23:20 +00:00
David Baker e55845ac52 Makeover!
Also add script for generating the PNGs and add pre-rendered PNGs
for the Linux electron build which means you don't need icns2png
to build it and the Linux icons are straight from the SVG rather
than resized bitmaps.
2016-12-08 16:22:34 +00:00
David Baker 229693dd71 gitignore .npmrc
(We now require a .npmrc in the riot-web dir to use the right
account when releasing)
2016-12-08 11:41:31 +00:00
David Baker 5e8e6f4c8b Add icon missed from #2708 2016-12-08 11:40:33 +00:00
David Baker 98f9e2f870 Merge remote-tracking branch 'origin/develop' into release-v0.9.1 2016-12-07 17:18:15 +00:00
Matthew Hodgson 2b51cda6da talk to jenkins via https for the /dev redeployer 2016-12-07 14:07:31 +00:00
Richard van der Hoff 65a31cc8a9 Merge pull request #2708 from vector-im/dbkr/png_icon_on_linux
Use a PNG for the icon on non-Windows
2016-12-07 11:23:10 +00:00
David Baker 737f912abb Use a PNG for the icon on non-Windows
MATE desktop env (and presumably other GNOMEs don't support ICOs,
so use a PNG.

Fixes https://github.com/vector-im/riot-web/issues/2705
2016-12-07 11:19:51 +00:00
Matthew Hodgson f6957aa367 Merge pull request #2703 from uhoreg/patch-1
Add missing brackets to call to toUpperCase
2016-12-07 09:24:11 +00:00
Hubert Chathi ad79f67ab6 Add missing brackets to call to toUpperCase 2016-12-06 22:36:42 -05:00
David Baker a9fcf106ab v0.9.1-rc.2 2016-12-06 16:06:15 +00:00
David Baker 0f47c9956c Prepare changelog for v0.9.1-rc.2 2016-12-06 16:06:14 +00:00
David Baker d4ac5f829f react-sdk rc.2 2016-12-06 16:04:46 +00:00
David Baker a297015d27 v0.8.1-rc.2 2016-12-06 16:04:05 +00:00
David Baker a8a07a01de Prepare changelog for v0.8.1-rc.2 2016-12-06 16:04:05 +00:00
David Baker d31a675ca8 Merge remote-tracking branch 'origin/develop' into release-v0.9.1 2016-12-06 16:02:26 +00:00
David Baker 1006d50a0d Merge remote-tracking branch 'origin/develop' into release-v0.8.1 2016-12-06 16:02:14 +00:00
Richard van der Hoff 587325b36c Merge pull request #585 from matrix-org/dbkr/fix_exception_roomdir
Fix exception when clearing room dir search
2016-12-06 15:58:07 +00:00
David Baker fe0dc85d66 Merge pull request #583 from matrix-org/luke/fix-post-message-api-origin-check
Allow integration UI URLs with paths
2016-12-06 15:00:26 +00:00
David Baker 9e3c94edf4 Fix exception when clearing room dir search
Needed more isMounted checks after promises return.
2016-12-06 14:59:10 +00:00