| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-08-01 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”. | |||
| 2018-07-28 | Redesign public profiles and toots (#8068) | Eugen Rochko | |
| 2018-05-31 | Hardcode default skin/theme in error layout (fixes #373) | Thibaut Girka | |
| This is a bit hackish. The best way would simply to somehow use Mastodon's ApplicationController with `use_pack 'error'` from the Rake task, but I'm not sure how to do that. | |||
| 2018-05-19 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: config/locales/simple_form.ja.yml | |||
| 2018-05-19 | In footer, replace text "Mastodon" with logo (#7545) | Eugen Rochko | |
| 2018-05-18 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml | |||
| 2018-05-18 | Add preference to hide following/followers lists (#7532) | Eugen Rochko | |
| * Add preference to hide following/followers lists - Public pages - ActivityPub collections (does not return pages but does give total) - REST API (unless it's your own) (does not federate) Fix #6901 * Add preference * Add delegation * Fix issue * Fix issue | |||
| 2018-03-11 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-03-10 | Fix #6717: Do not double html-encode page titles (#6720) | Eugen Rochko | |
| 2018-03-09 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-03-09 | Add missing meta description to profiles, some other SEO stuff (#6706) | Eugen Rochko | |
| - Add missing meta description to profiles - Add canonical rel link to landing page - Remove linebreaks from title tags - Add username to profile title - Add toots/following/followers to profile description tags - Add next/prev rel links to profiles - Do not index follower/following variants of profiles | |||
| 2018-02-23 | Merge branch 'master' of https://github.com/tootsuite/mastodon | imncls | |
| # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb | |||
| 2018-02-22 | Fix container regression (#6531) | Eugen Rochko | |
| * Update public.html.haml * Update auth.html.haml * Update modal.html.haml | |||
| 2018-01-28 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml | |||
| 2018-01-29 | Add direction tags to HTML e-mails for RTL languages (#6373) | Eugen Rochko | |
| 2018-01-20 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/javascript/styles/mastodon/components.scss | |||
| 2018-01-20 | Improve HTML e-mails based on Litmus tests (#6301) | Eugen Rochko | |
| * 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-19 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss | |||
| 2018-01-18 | Replace tutorial modal with welcome e-mail (#6273) | Eugen Rochko | |
| * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations | |||
| 2018-01-17 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-16 | Change image URL in mailer to full path (#6264) | Yamagishi Kazutoshi | |
| 2018-01-15 | Fix mailer to use webpack core | kibi! | |
| 2018-01-15 | Merge remote-tracking branch 'origin/master' into gs-master | David Yip | |
| Conflicts: Gemfile.lock | |||
| 2018-01-16 | HTML e-mails for UserMailer (#6256) | Eugen Rochko | |
| - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates | |||
| 2018-01-03 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-02 | delete X-UA-Compatible (#6068) | Otakan | |
| * delete X-UA-Compatible * undo * restore | |||
| 2018-01-02 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss | |||
| 2018-01-02 | Show mastodon on modal (#6129) | Akihiko Odaki | |
| 2017-12-24 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2017-12-24 | Reduce motion for boost animation (#5871) | Nolan Lawson | |
| * Reduce motion for boost animation Fixes #5833 * Fix ternary expression | |||
| 2017-12-10 | Only localize js when there's a theme | kibigo! | |
| 2017-12-10 | Javascript intl8n flavour support | kibigo! | |
| 2017-12-04 | Various fixes | kibigo! | |
| 2017-12-03 | Rename themes -> flavours ? ? | kibigo! | |
| 2017-11-30 | Skins support | kibigo! | |
| 2017-11-21 | Minor fixes | kibigo! | |
| 2017-11-20 | Finalized theme loading and stuff | kibigo! | |
| 2017-11-16 | Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5 | Surinna Curtis | |
| 2017-10-28 | Refactor initial state: reduce_motion and auto_play_gif (#5501) | Nolan Lawson | |
| 2017-10-16 | Merge pull request #184 from tootsuite/master | beatrix | |
| Fix reduced motion breaking public galleries (#5423) | |||
| 2017-10-16 | Fix reduced motion breaking public galleries (#5423) | Nolan Lawson | |
| 2017-10-11 | Merge remote-tracking branch 'upstream/master' | Ondřej Hruška | |
| 2017-10-11 | Merge upstream 2.0ish #165 | kibigo! | |
| 2017-10-11 | Only preload JS in /web pages (#5325) | Nolan Lawson | |
| 2017-10-09 | Fix dependency of error page generation on database (#5280) | Eugen Rochko | |
| 2017-09-29 | Remove dependency on db during assets:precompile (#5138) | Eugen Rochko | |
| 2017-09-28 | Fixed lingering upstream Theme code | kibigo! | |
| 2017-09-28 | Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream | Ondřej Hruška | |
| 2017-09-25 | New error page graphic. Other error page improvements (#5099) | Eugen Rochko | |
| - 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault | |||
| 2017-09-25 | Generate 500.html with assets:precompile, remove loading from Google Fonts ↵ | Eugen Rochko | |
| (#5067) | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |