| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-01-20 | Merge remote-tracking branch 'origin/master' into gs-master | David Yip | |
| 2018-01-20 | Change mailer avatar url (#6309) | Iijima Yasushi | |
| * Change mailer avatar url * Use full_asset_url method | |||
| 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-20 | Make text e-mails consistent with HTML ones in UserMailer (#6291) | Eugen Rochko | |
| * Make text e-mails consistent with HTML ones in UserMailer * Fix UserMailer specs | |||
| 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-17 | Change mailer image url (#6279) | mayaeh | |
| * Change image URL in mailer to full path * Add application_mailer.view_profile localization. | |||
| 2018-01-16 | HTML e-mails for NotificationMailer (#6263) | Eugen Rochko | |
| * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build | |||
| 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-12 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-12 | Handle sessions that can't be translated (#6245) | Jeong Arm | |
| * Handle sessions that can't be translated This commit fixes #6165. * Fix typo | |||
| 2018-01-09 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: db/schema.rb | |||
| 2018-01-09 | Fix #6204: Use content warning for page title when present (#6231) | Eugen Rochko | |
| 2018-01-08 | Don't show skins selector when there's only one (#256) | kibigo! | |
| 2018-01-08 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-08 | Revert #5772 (#6221) | Eugen Rochko | |
| 2018-01-07 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-07 | Update Simplified Chinese translations (#6215) | SerCom_KC | |
| * i18n: (zh-CN) Add translations of #6125 * i18n: (zh-CN) Add translations of #6132 * i18n: (zh-CN) Add translations of #6099 * i18n: (zh-CN) Add translations of #6071 * i18n: (zh-CN) Improve translations | |||
| 2018-01-05 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-05 | l10n Occitan language: mailer update (#6193) | Quenty31 | |
| * Create email_changed.oc.html.erb * Create email_changed.oc.text.erb * Update email_changed.oc.html.erb * Update email_changed.oc.html.erb * Create reconfirmation_instructions.oc.html.erb * Create reconfirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.text.erb * Update reconfirmation_instructions.oc.html.erb | |||
| 2018-01-03 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-03 | Allow to dereference Follow object for ActivityPub (#5772) | Akihiko Odaki | |
| * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity | |||
| 2018-01-03 | i18n: Update Polish translation (#6168) | Marcin Mikołajczak | |
| Signed-off-by: Marcin Mikołajczak <me@m4sk.in> | |||
| 2018-01-03 | Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 ↵ | Yamagishi Kazutoshi | |
| (#6167) * yarn manage:translations * Add Japanese translation for #5997 * Add Japanese translation for #6003 * Add Japanese translation for #6004 * Add Japanese translation for #6071 * Add Japanese translation for #6099 * Add Japanese translation for #6125 * Add Japanese translation for #6132 | |||
| 2018-01-03 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-02 | Add confirmation step for email changes (#6071) | Patrick Figel | |
| * Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes | |||
| 2018-01-02 | delete X-UA-Compatible (#6068) | Otakan | |
| * delete X-UA-Compatible * undo * restore | |||
| 2018-01-02 | Adding Serbian latin translations (#6146) | Branko Kokanovic | |
| Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation. | |||
| 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-31 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2017-12-31 | Adding Serbian translation (#6133) | Branko Kokanovic | |
| * Adding Serbian translation * i18n-tasks normalize | |||
| 2017-12-30 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/controllers/auth/confirmations_controller.rb | |||
| 2017-12-30 | keep the same filters and page when doing custom emojo stuff (fixes #6112) ↵ | beatrix | |
| (#6114) | |||
| 2017-12-29 | Add more instance stats APIs (#6125) | Eugen Rochko | |
| * Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps | |||
| 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-22 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2017-12-22 | Display deleted users' role as “Suspended” (#6080) | ThibG | |
| Deleted users are technically suspended, but the code displaying their status in the admin interface was broken and displayed a javascript object holding translations of the possible user roles instead. | |||
| 2017-12-13 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2017-12-13 | Add filters to admin UI for custom emojis (#6003) | Eugen Rochko | |
| 2017-12-13 | Clean up admin UI for accounts (#6004) | Eugen Rochko | |
| * Add staff filter to admin UI for accounts, remove obsolete columns * Only display OStatus section in admin UI for accounts when OStatus data | |||
| 2017-12-12 | Merge remote-tracking branch 'tootsuite/master' into merge-upstream | David Yip | |
| 2017-12-12 | Improve public status page title (#5985) | Eugen Rochko | |
| 2017-12-10 | Added styling | kibigo! | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |