David Yip
|
c816701550
|
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 |
|
Jenkins
|
0e10667fbe
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2018-01-24 19:17:11 +00:00 |
|
kibi!
|
60ff086960
|
Fixed improper mailer import
|
2018-01-15 21:23:26 -08:00 |
|
kibi!
|
cda845ae0e
|
Fix mailer to use webpack core
|
2018-01-15 21:17:03 -08:00 |
|
kibigo!
|
dabf66e676
|
Moved flavour UI into own prefs tab
|
2017-12-10 20:32:27 -08:00 |
|
kibigo!
|
5bed0f10ed
|
Various fixes
|
2017-12-04 21:58:10 -08:00 |
|
kibigo!
|
7c75702d05
|
Fixed image require
|
2017-12-03 23:52:13 -08:00 |
|
kibigo!
|
bc4fa6b198
|
Rename themes -> flavours ? ?
|
2017-12-03 23:26:40 -08:00 |
|
kibigo!
|
541fe9b110
|
Skins support
|
2017-11-30 19:29:47 -08:00 |
|
kibigo!
|
bdbbd06dad
|
Finalized theme loading and stuff
|
2017-11-20 22:13:37 -08:00 |
|
kibigo!
|
a9ed857171
|
WIP static themeing
|
2017-11-18 15:12:52 -08:00 |
|