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

Merge redesign into develop #8321

Merged
merged 78 commits into from Jan 30, 2019

Conversation

@bwindels
Copy link
Contributor

bwindels commented Jan 30, 2019

No description provided.

dbkr and others added 30 commits Jun 6, 2017
Redesign: ignore setting and always show dharma theme for now
Redesign: apply changes from dharma theme to status theme
Looks like this was broken in the webpack 4 upgrade due to the
worker script setter and the bundle being re-ordered in index.html.

 * Remove the loop: we only use two scripts now, so import them
   explicitly
 * Remove outdated olm import code.
 * Stop generating a script import for each theme: we were pulling
   in 3 js files that did absolutely nothing.
 * Fix worker 'onmessage' scope (set it as a global rather than
   trying to make it an ES6 module which it isn't).
 * Fail hard if the indexeddb worker script isn't set to avoid
   this happening again.
Added new colour var to all themes
dbkr and others added 27 commits Jan 23, 2019
Try fetching more branches for PRs
These look necessary for #8225
to work - the build is failing on jenkins
Update electron builder
Add returns to fetch-develop-deps
Apparently I couldn't decide whether I was writing indexOf(...) > -1
or .includes()

Fixes #8230
Another instance of detecting the file: protocol

Fixes #8235
Fix registration nextLink on desktop
Fix literal &lt/&gt in notifications
Apparently I really had a bad day with includes / indexOf
Fix device names on desktop
Add target="_blank" to footer links
Remove support for team servers
Signed-off-by: Aaron Raimist <aaron@raim.ist>
Completely disable other themes for now (#8277)
In the same way as we now do images/fonts
Cache-bust olm.wasm
Clean up Custom Server Help dialog
Tweak auth overflow on Windows and Linux
See enclosed comments.
Disable room directory test because it doesn't work
@dbkr
dbkr approved these changes Jan 30, 2019
@bwindels bwindels merged commit 90140f6 into develop Jan 30, 2019
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.