me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6995 commits 2 branches 0 tags 429 MiB
Commit graph

86 commits

Author SHA1 Message Date
Jenkins
695674b2fa Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
Renato "Lond" Cerqueira
2e4a1d3109 Rename emoji sheet to avoid caching issue (#7777) 2018-06-10 16:12:47 +02:00
Thibaut Girka
c822ecfa01 Merge branch 'master' into glitch-soc/merge-upstream 2018-05-29 13:52:26 +02:00
Yamagishi Kazutoshi
7e042c97d1 Use URL polyfill (#7664) 2018-05-29 13:33:20 +02:00
Akihiko Odaki
0cb1524dc1 Cache attachments on external host with service worker (#7493) 2018-05-29 00:43:47 +02:00
Thibaut Girka
efd2441d1f Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +02:00
Akihiko Odaki
0205536ee7 Limit environment variables to expose to webpack (#7480) 2018-05-14 17:45:37 +02:00
David Yip
2567d0a704 Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
Akihiko Odaki
e829c21cc6 Cache media (#6902) 2018-03-27 12:32:30 +02:00
David Yip
87517e2dd8 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml
 2018-01-28 22:45:17 -06:00
Eugen Rochko
9c212f0f28 ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) 2018-01-29 01:06:39 +01:00
Jenkins
3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
Eugen Rochko
8f60c22ba4 Fix #6311: Replace relative URLs in CSS only for Premailer (#6335) 2018-01-24 02:57:14 +01:00
David Yip
a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb
 2018-01-21 13:36:10 -06:00
ThibG
55567d05b2 Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) 
Since 896cadceed, assets URL are absolute and
not relative. Unfortunately, the domain used to build such URLs is the wrong
one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.
 2018-01-21 13:22:31 +01:00
David Yip
03f157f6da Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/styles/mastodon/components.scss
 2018-01-20 10:45:43 -06:00
Eugen Rochko
896cadceed Improve HTML e-mails based on Litmus tests (#6301) 
* Use PNG images in HTML e-mails

* Make webpack use URLs with host so fonts load inside HTML e-mails

Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker

* Improve responsive design

* Add missing PNG icon
 2018-01-20 01:32:21 +01:00
Jenkins
86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-05 22:17:12 +00:00
Yamagishi Kazutoshi
0fa691d2a9 Fix RFC 5646 Regular Expression (#6190) 2018-01-05 04:43:50 +01:00
kibigo!
1d7b78817a Fixed index in webpack config 2017-12-11 10:45:21 -08:00
kibigo!
b27126f1d6 Linting fixes 2017-12-10 11:08:04 -08:00
kibigo!
99e8710095 Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
kibigo!
e614dc144e Fixed webpack skin folder globbing 2017-12-07 14:33:49 -08:00
kibigo!
882055afd0 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
kibigo!
36b9f4df56 Skins support 2017-11-30 19:29:47 -08:00
kibigo!
eadf1c38a5 Minor fixes 2017-11-21 18:17:38 -08:00
kibigo!
8aeda4f064 Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
kibigo!
5845057adb Themed prefetching 2017-11-16 21:37:08 -08:00
Surinna Curtis
02ae609d9a Merge tootsuite/master at ab48f2b239 2017-11-16 01:21:16 -06:00
Yamagishi Kazutoshi
f0d800d9a9 Update extract-text-webpack-plugin to version 3.0.2 (#5584) 2017-11-05 13:07:59 +01:00
Yamagishi Kazutoshi
395a88eb5d Upgrade compression-webpack-plugin to version 1.0.1 (#5581) 2017-11-01 14:42:19 +01:00
Nolan Lawson
ba22580c06 Add ServiceWorker caching for static assets (#5524) 2017-10-31 12:25:51 +01:00
Akihiko Odaki
38d5aa3073 Use contenthash for ExtractTextWebpackPlugin (#5462) 
[hash] is not documented.
 2017-10-27 23:54:20 +09:00
kibigo!
02827345ae Merge upstream 2.0ish #165 2017-10-11 10:43:10 -07:00
Nolan Lawson
82ff80dbad Remove prop types from external libraries (#5304) 2017-10-10 18:44:51 +02:00
Nolan Lawson
7bde8dcc08 Use ES module build of react-router-dom (#5264) 2017-10-08 02:55:58 +02:00
aschmitz
4f7aa88461 Configure webpack to poll for changes in development (#5040) 
* Configure webpack to poll for changes in development

Vagrant on Linux/macOS hosts shared files via NFS, which doens't
support inotify-based watching of files. This tweak makes webpack
check for changes every second, and rebuild if necessary. This
removes the need to restart Foreman every time a frontend file
changes. Note that rebuilding is still a relatively lengthy
process.

The polling frequency can be changed to taste.

* Only poll in Vagrant

This tests for the presence of the VAGRANT environment variable to
determine whether or not we're in Vagrant. It is set in .env.vagrant,
which is set up to be included in the Vagrantfile.
 2017-10-04 09:52:11 +02:00
kibigo!
cae9e7ab76 Fixed webpack config code 2017-09-25 19:35:54 -07:00
kibigo!
aac16a82d6 Better themeing support!! 2017-09-25 19:24:32 -07:00
Andrew
b4842ef0b9 Add support for multiple themes (#4959) 
* Add support for selecting a theme

* Fix codeclimate issues

* Look up site default style if current user is not available due to e.g. not being logged in

* Remove outdated comment in common.js

* Address requested changes in themes PR

* Fix codeclimate issues

* Explicitly check current_account in application controller and only check theme availability if non-nil

* codeclimate

* explicit precedence with &&

* Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml

* codeclimate: indentation + return
 2017-09-19 16:36:23 +02:00
David Yip
da3f22ee7d Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
 2017-09-09 14:27:47 -05:00
Yamagishi Kazutoshi
9d1019bded Disable babel-loader cache when development environment (#4684) 2017-08-24 19:27:52 +02:00
Ondřej Hruška
913dd13575 Merge remote-tracking branch 'upstream/master' 2017-08-07 22:43:52 +02:00
Yamagishi Kazutoshi
581f8b2909 Enable cache for babel-loader (#4505) 2017-08-03 17:46:49 +02:00
kibigo!
2cdee6ae8a Merge upstream (#111) 2017-08-01 13:20:29 -07:00
Gô Shoemake
58446d39d8 Multiple frontend support (#110) 
* Initial multiple frontend support

* Removed unnecessary require()

* Moved styles/images out of common
 2017-07-30 19:28:21 +02:00
Yamagishi Kazutoshi
f61858281c Remove hash from chunk filename when dev env (#4411) 2017-07-28 05:14:01 +02:00
Satoshi KOJIMA
c6344547a3 fix #4356 : place sw.js to assets/sw.js (#4357) 2017-07-28 01:55:52 +02:00
kibigo!
0b64d60988 Fix for stylesheet split 2017-07-18 11:28:52 -07:00
Surinna Curtis
6311bfb8ff Add sourceRoot/includePaths to loaders 
Use the settings modal as an example/testcase
 2017-07-18 11:27:48 -07:00