Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest develop #1

Merged
merged 391 commits into from
May 19, 2017
Merged

Update to latest develop #1

merged 391 commits into from
May 19, 2017

Conversation

turt2live
Copy link

In theory Github will make this more magic for the actual riot PR, and not so weird looking on this end.

dbkr and others added 30 commits April 10, 2017 17:40
…tton_electron

Make the clear cache button work on desktop
- in preparation for factoring out the sending of the rageshake
... in preparation for factoring out sending the report
This will mean we can load it asyncronously in future, if we want.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
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>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
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*
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Luke Barnard and others added 29 commits May 18, 2017 11:30
Add 'copy link address' to link context menu in electron app
…link_location

Desktop: 'copy link address'
Also remove unused room dir stuff
Just copy-and-paste the updated version from js-sdk in here.
…esktop

Add config for riot-bot on desktop app build
…y-dd-3-square-flags

Add square flag pngs /w genflags.sh script
attempt to make the logging a bit more comprehensible
give the client a bit longer to get started.
Give the RoomDirectory and unmounted guard, and use it to avoid some setState
warnings. Also, cancel the filterTimeout (no point in leaving it around).

There are still plenty of other opportunities to setState after unmount, but
the filterTimeout was causing noise in the test.
…y-dd-4

CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
…nmounting

Fix some setState-after-unmount in roomdirectory
Without this, SVG renderers may not pick up the CSS in the SVGs at all, as is the case with librsvg.
…style-type

Add type="text/css" to SVG logos
Update README instructions and add checks to release script to
prevent us forgetting to bump the versions of dependencies
(because the check in the main release script will only catch
references to #develop left in, which will no longer be the
failure mode).
Script to fetch corresponding branches of dependent projects
Two changes:

1. wait longer for /sync to arrive in the loading tests, via an
   `expectAndAwaitSync` method.

2. matrix-org/matrix-react-sdk#773 made it possible for
   MatrixChat to not show its syncing spinner despite `loading` being
   false. Update `awaitSyncingSpinner` accordingly, so that it doesn't fail
   when it happens to check MatrixChat at just taht moment.
…ation

More riot-web test deflakification
Re-add accidenally removed variable initialiser
@Half-Shot Half-Shot merged commit ddbfd9a into Half-Shot:location-events May 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants