izaliamae/glitch-soc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6694 commits 50 branches 0 tags 240 MiB
Commit graph

819 commits

Author SHA1 Message Date
Thibaut Girka
659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes
 2018-05-27 13:20:15 +02:00
Eugen Rochko
ebf2fef029
Catch ActionController::UnknownFormat and return HTTP 406 (#7621) 
An error like that should not appear in production error log.
 2018-05-26 01:09:30 +02:00
Thibaut Girka
e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream 2018-05-23 16:05:19 +02:00
Eugen Rochko
4d81809f36
Yeah, it was supposed to be #create? 2018-05-22 20:05:24 +02:00
Eugen Rochko
36e47a31e3
Enforce order on authorized applications page (#7587) 
Fix #7586
 2018-05-22 14:44:53 +02:00
Thibaut Girka
a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/locales/en.yml
	config/locales/fr.yml
	config/locales/simple_form.pl.yml
	config/themes.yml

Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.
 2018-05-21 16:40:02 +02:00
Eugen Rochko
05f8c375a2
Remove small pagination limit from context API (#7564) 
Fix #7557
 2018-05-21 12:43:05 +02:00
Thibaut Girka
b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	config/locales/simple_form.ja.yml
 2018-05-19 22:41:10 +02:00
Eugen Rochko
8378b72eba
Ensure push subscription is immediately removed when application is revoked (#7548) 
* Ensure push subscription is immediately removed when application is revoked

* When token is revoked from app, unsubscribe too
 2018-05-19 21:05:08 +02:00
David Yip
e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream 
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 08:47:10 -05:00
Eugen Rochko
1e02dc8715
Add preference to hide following/followers lists (#7532) 
* 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-05-18 02:26:51 +02:00
Jenkins
2636a23092 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-17 11:17:21 +00:00
Eugen Rochko
7293b9fc61
Ensure unfilled fields are shown when errors are shown (#7523) 
Fix #7486
 2018-05-17 13:00:56 +02:00
Eugen Rochko
dfb6907e08
HTTP signatures spec no longer requires algorithms field (#7525) 
Fix #7520
 2018-05-17 04:03:28 +02:00
Thibaut Girka
78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
 2018-05-16 21:52:38 +02:00
Akihiko Odaki
77cd6b5096 Do not use permitted_for scope when querying pinned statuses (#7510) 
permitted_for scope is slow when combined with pinned status scope.
Fortunately permitted_for scope can safely be removed because a pinned
status is always public.
 2018-05-16 12:30:14 +02:00
Akihiko Odaki
55fd55714a Raise Mastodon::RaceConditionError if Redis lock failed (#7511) 
An explicit error allows user agents to know the error and Sidekiq to
retry.
 2018-05-16 12:29:45 +02:00
Thibaut Girka
ba7ee67498 Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +02:00
Eugen Rochko
416f644505
Fix 404 for GET /api/v1/push/subscription (#7472) 
My bad...
 2018-05-13 21:45:18 +02:00
Eugen Rochko
97e43ec5f0
Add GET /api/v1/push/subscription REST API (#7471) 
* Add Api::V1::Push::SubscriptionsController#show

* Add to routes
 2018-05-13 21:07:31 +02:00
Thibaut Girka
45fce0e496 Merge branch 'master' into glitch-soc/merge 
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
 2018-05-11 18:12:42 +02:00
ThibG
352bae8c3e Update session activation time (fixes #5605) (#7408) 2018-05-11 13:20:58 +02:00
Shuhei Kitagawa
50491e0d92 Add tests for invites controller (#7441) 
* Add tests for invites controller

* Small refactoring and fix for invites controller
 2018-05-11 13:14:33 +02:00
Eugen Rochko
b4fb766b23
Add REST API for Web Push Notifications subscriptions (#7445) 
- 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-11 11:49:12 +02:00
Thibaut Girka
1c9c0167b7 Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
 2018-05-10 00:03:28 +02:00
Eugen Rochko
42cd363542
Bot nameplates (#7391) 
* Store actor type in database

* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365

* Fix code style issues
 2018-05-07 09:31:07 +02:00
abcang
db012b57c2 Fix distribute_add_activity and distribute_remove_activity (#7393) 2018-05-07 09:30:18 +02:00
Shuhei Kitagawa
bd10a7e480 Add resend confirmation for admin (#7378) 
* Add confirmations_controller#resend

* Add tests for confirmations_controller#resend

* Add translations
 2018-05-06 10:59:03 +02:00
Eugen Rochko
c7d1a2e400
Improve admin UI for accounts (#7360) 
* 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 23:06:29 +02:00
David Yip
7600067a30
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
    	db/schema.rb
 2018-05-04 14:16:30 -05:00
Jenkins
cb62935c0b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-04 18:17:32 +00:00
ThibG
d1aef17f9a Do not render first page of following and followers collections unless explicitly asked to (#7357) 2018-05-04 20:17:01 +02:00
Eugen Rochko
2c1f7b2ece
Better pagination for ActivityPub outbox (#7356) 2018-05-04 19:19:11 +02:00
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
Eugen Rochko
cb5b5cb5f7
Slightly reduce RAM usage (#7301) 
* No need to re-require sidekiq plugins, they are required via Gemfile

* Add derailed_benchmarks tool, no need to require TTY gems in Gemfile

* Replace ruby-oembed with FetchOEmbedService

Reduce startup by 45382 allocated objects

* Remove preloaded JSON-LD in favour of caching HTTP responses

Reduce boot RAM by about 6 MiB

* Fix tests

* Fix test suite by stubbing out JSON-LD contexts
 2018-05-02 18:58:48 +02:00
Eugen Rochko
cae933510c
Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288) 
Add raw bio fields to the source attribute on GET /api/v1/accounts/verify_credentials
 2018-05-02 15:57:37 +02:00
Eugen Rochko
f62ee1ddb0
Disable API access when login is disabled (#7289) 2018-04-30 09:13:14 +02:00
Eugen Rochko
54f34d3f2a
Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287) 
Fix #7243
 2018-04-30 09:12:36 +02:00
Eugen Rochko
da61352fab
Fix "Show more" URL on paginated threads for remote statuses (#7285) 
* Fix URL of "Show more" link in paginated threads (ancestors side)

Increase item limits in threads

Fix #7268

* Fix "Show more" link in paginated threads (descendants side)
 2018-04-30 01:59:42 +02:00
Eugen Rochko
9d4710ed00
Add RSS feeds for end-users (#7259) 
* Add RSS feed for accounts

* Add RSS feeds for hashtags

* Fix code style issues

* Fix code style issues
 2018-04-25 02:10:02 +02:00
Akihiko Odaki
1258efa882 Paginate descendant statuses in public page (#7148) 2018-04-23 19:27:35 +02:00
Yamagishi Kazutoshi
87e3f0a41d Fix spec for sr-Latn (#7203) 2018-04-20 18:14:31 +02:00
Eugen Rochko
a9c440637c
Improve report layout (#7188) 
* 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-20 02:28:48 +02:00
David Yip
16d5217502
Merge remote-tracking branch 'origin/master' into gs-master 
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-18 18:48:12 -05:00
Kaito Sinclaire
156b916caf Direct messages column (#4514) 
* Added a timeline for Direct statuses
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL

* Changes to match other timelines in 2.0
 2018-04-18 13:09:06 +02:00
abcang
897199910f Improve web api protect (#6343) 2018-04-17 15:23:46 +02:00
Eugen Rochko
aab5581c43
Set Referrer-Policy to origin in web UI and public pages of private toots (#7162) 
Fix #7115
 2018-04-17 13:51:01 +02:00
Akihiko Odaki
a1049e9380 Redirect to account status page for page of status stream entry (#7104) 
Commit 519119f657 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-16 10:04:31 +02:00
David Yip
813da6788e
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	db/schema.rb
 2018-04-14 09:12:50 -05:00
Eugen Rochko
78ed4ab75f
Add bio fields (#6645) 
* Add bio fields

- Fix #3211
- Fix #232
- Fix #121

* Display bio fields in web UI

* Fix output of links and missing fields

* Federate bio fields over ActivityPub as PropertyValue

* Improve how the fields are stored, add to Edit profile form

* Add rel=me to links in fields

Fix #121
 2018-04-14 12:41:08 +02:00