27be4fa311
Avoid loading rails-ujs twice on vanilla flavour
2018-07-16 16:42:52 +02:00
4ec907e413
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Dockerfile
app/javascript/packs/common.js
config/webpack/loaders/sass.js
config/webpack/shared.js
db/schema.rb
package.json
yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +02:00
c87f1d99e4
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
2018-05-03 17:23:44 -05:00
3cd4a0804b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-24 19:17:11 +00:00
89e8f9549b
Fixed improper mailer import
2018-01-15 21:23:26 -08:00
be525dd4db
Fix mailer to use webpack core
2018-01-15 21:17:03 -08:00
901c08a999
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
fd7be49523
Various fixes
2017-12-04 21:58:10 -08:00
3760da1321
Fixed image require
2017-12-03 23:52:13 -08:00
882055afd0
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
36b9f4df56
Skins support
2017-11-30 19:29:47 -08:00
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
e56a32a46b
WIP static themeing
2017-11-18 15:12:52 -08:00
Thibaut Girka