| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-06-24 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-06-24 | Add tests for remote_unfollows_controller (#7879) | Shuhei Kitagawa | |
| 2018-06-21 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields | |||
| 2018-06-21 | Add missing tests for confirmations controller (#7866) | Shuhei Kitagawa | |
| 2018-06-18 | Add tests for shares_controller (#7835) | Shuhei Kitagawa | |
| 2018-06-17 | Change language opt-out to language opt-in (#7823) | Eugen Rochko | |
| * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations | |||
| 2018-06-14 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-06-14 | Add tests for following accounts controller (#7800) | Shuhei Kitagawa | |
| 2018-06-13 | Add tests for followers_accounts_controller (#7794) | Shuhei Kitagawa | |
| 2018-06-12 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-06-12 | Add missing tests for admin/accounts_controller (#7791) | Shuhei Kitagawa | |
| 2018-06-09 | Add tests for intents_controller (#7763) | Shuhei Kitagawa | |
| 2018-06-07 | Merge remote-tracking branch 'tootsuite/master' into merge-upstream | David Yip | |
| Conflicts: app/models/status.rb The conflict in the Status model was due to https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3. It was resolved by accepting tootsuite's changes. | |||
| 2018-06-06 | Add missing tests for sessions controller (#7744) | Shuhei Kitagawa | |
| 2018-06-04 | Add tests for embeds controller (#7719) | Shuhei Kitagawa | |
| * Small refactoring of status_finder_spec * Add tests for embeds_controller | |||
| 2018-06-02 | Merge remote-tracking branch 'origin/master' into gs-master | David Yip | |
| Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours. | |||
| 2018-06-02 | Add tests for migrations_controller (#7707) | Shuhei Kitagawa | |
| 2018-05-29 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-05-28 | Add a test for emojis_controller (#7652) | Shuhei Kitagawa | |
| 2018-05-23 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-05-23 | Fix tests for invites controller (regression from ↵ | Yamagishi Kazutoshi | |
| 4d81809f36fcbfe787e23d490f2cb0ad943ab32c) (#7597) | |||
| 2018-05-22 | Add tests for report notes controller (#7589) | Shuhei Kitagawa | |
| 2018-05-19 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: config/locales/simple_form.ja.yml | |||
| 2018-05-19 | Ensure push subscription is immediately removed when application is revoked ↵ | Eugen Rochko | |
| (#7548) * Ensure push subscription is immediately removed when application is revoked * When token is revoked from app, unsubscribe too | |||
| 2018-05-17 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-05-17 | Add tests for account_moderation_notes_controller (#7524) | Shuhei Kitagawa | |
| 2018-05-11 | Merge branch 'master' into glitch-soc/merge | Thibaut Girka | |
| Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml | |||
| 2018-05-11 | Add tests for invites controller (#7441) | Shuhei Kitagawa | |
| * Add tests for invites controller * Small refactoring and fix for invites controller | |||
| 2018-05-11 | Add REST API for Web Push Notifications subscriptions (#7445) | Eugen Rochko | |
| - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods) | |||
| 2018-05-10 | Merge branch 'master' into glitch-soc/master | Thibaut Girka | |
| Conflicts: app/models/account.rb app/views/accounts/_header.html.haml | |||
| 2018-05-09 | Add tests for admin/roles_controller (#7421) | Shuhei Kitagawa | |
| 2018-05-09 | Add tests for admin/invites_controller (#7412) | Shuhei Kitagawa | |
| 2018-05-06 | Add resend confirmation for admin (#7378) | Shuhei Kitagawa | |
| * Add confirmations_controller#resend * Add tests for confirmations_controller#resend * Add translations | |||
| 2018-05-05 | Improve admin UI for accounts (#7360) | Eugen Rochko | |
| * Improve design of account statuses admin UI (consistent with reports) * Make account moderation notes look consistent with report notes * i18n-tasks remove-unused * Fix code style issues * Fix tests | |||
| 2018-05-05 | Add tests for admin/custom_emojis_controller (#7350) | Shuhei Kitagawa | |
| 2018-05-03 | Merge remote-tracking branch 'origin/master' into gs-master | David Yip | |
| 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-02 | Serialize webfinger XML with Ox instead of Nokogiri (#7319) | Eugen Rochko | |
| 25ms -> 0.5ms | |||
| 2018-04-23 | Paginate descendant statuses in public page (#7148) | Akihiko Odaki | |
| 2018-04-22 | Fix randomly fail (similar #7219) (#7225) | Yamagishi Kazutoshi | |
| 2018-04-21 | Reset locale on registration tests (#7219) | Yamagishi Kazutoshi | |
| 2018-04-21 | Use raw status code on have_http_status (#7214) | Yamagishi Kazutoshi | |
| 2018-04-20 | Improve report layout (#7188) | Eugen Rochko | |
| * Use table for statuses in report * Display reported account and reporter in the same table * Split accounts and general report info into two tables again * Redesign report statuses table, notes, merge notes and action log * Remove unused translations * Fix code style issue * Fix code style issue * Fix code style issue | |||
| 2018-04-18 | Merge remote-tracking branch 'origin/master' into gs-master | David Yip | |
| Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json | |||
| 2018-04-16 | Redirect to account status page for page of status stream entry (#7104) | Akihiko Odaki | |
| Commit 519119f657cf97ec187008a28dba00c1125a9292 missed a change for stream entry page. Instead of duplicating the change, redirect to account status page. It would also help crawlers (of search engines, for example) to understand a stream entry URL and its corresponding status URL points to the same page. | |||
| 2018-04-13 | Merge pull request #419 from ThibG/glitch-soc/features/bookmarks | David Yip | |
| Bookmarks | |||
| 2018-04-12 | Merge remote-tracking branch 'tootsuite/master' | David Yip | |
| Conflicts: app/controllers/statuses_controller.rb | |||
| 2018-04-11 | update gem, test pam authentication (#7028) | Alexander | |
| * update gem, test pam authentication * add description for test parameters * fix inclusion of optional group | |||
| 2018-04-11 | Add spec for bookmark endpoints | Thibaut Girka | |
| 2018-04-11 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-04-10 | Feature: Allow staff to change user emails (#7074) | Emelia Smith | |
| * Admin: Show unconfirmed email address on account page * Admin: Allow staff to change user email addresses * ActionLog: On change_email, log current email address and new unconfirmed email address | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |