Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js

2018-09-19 21:46:01 +02:00

..

about

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

accounts

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

admin

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

admin_mailer

Show remote reports in admin UI as coming from domain rather than user (#7347)

2018-05-04 13:26:25 +02:00

application

Add separate setting for sidebar text (site_short_description) (#8107)

2018-07-31 18:59:34 +02:00

auth

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

authorize_interactions

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

errors

New error page graphic. Other error page improvements (#5099)

2017-09-25 23:05:54 +02:00

filters

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

follower_accounts

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

following_accounts

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

home

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

invites

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

kaminari

…

layouts

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-11 16:51:26 +02:00

media

Save video metadata and improve video OpenGraph tags (#6481)

2018-02-16 07:22:20 +01:00

notification_mailer

Display content warning in mail notification emails (#6832)

2018-03-19 20:12:20 +01:00

oauth

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

remote_follow

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

remote_interaction

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

remote_unfollows

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

settings

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

shared

Add separate setting for sidebar text (site_short_description) (#8107)

2018-07-31 18:59:34 +02:00

shares

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

stream_entries

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-01 17:23:46 +02:00

tags

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

user_mailer

Fix e-mail changed notification (fixes #6778) (#6835)

2018-03-19 20:07:47 +01:00

well_known

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00