cc94c90bf1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
f088e090e4
Add voters count support ( #11917 )
...
* Add voters count to polls
* Add ActivityPub serialization and parsing of voters count
* Add support for voters count in WebUI
* Move incrementation of voters count out of redis lock
* Reword “voters” to “people”
2019-09-29 22:58:01 +02:00
f5c71a6cd2
Add (back) option to set redirect notice on account without moving followers ( #11994 )
...
Fix #11913
2019-09-29 05:03:19 +02:00
d8f09d5853
Fix unscoped being used in the wrong place ( #11987 )
...
Regression from #11982
2019-09-28 05:23:32 +02:00
386dc65671
Fix preview card image not being re-fetched even if link is re-posted ( #11981 )
...
Fix #11956
2019-09-28 01:33:16 +02:00
6baaceefcd
Fix index not being used in Status.reblogs_map ( #11982 )
...
Regression from #11623
2019-09-28 01:33:02 +02:00
66d3e13777
Add `exclude_unreviewed` param to `GET /api/v2/search` REST API ( #11977 )
...
Make it so normal search returns even unreviewed matches, but
autosuggestions do not.
Fix #11960
2019-09-28 01:02:21 +02:00
2c43d538dc
Validate Web::PushSubscription ( #11971 )
2019-09-27 15:24:13 +02:00
67796a267d
Fix relays UI being available in whitelist/secure mode ( #11963 )
...
Fix relays UI referencing relay that is not functional
2019-09-27 02:13:34 +02:00
3773115066
Fix authentication before 2FA challenge ( #11943 )
...
Regression from #11831
2019-09-24 04:35:36 +02:00
c596206f8c
Show user what options they have voted ( #11195 )
...
* Add own_votes field to poll results in REST API
Fixes #10679
* Display user votes in WebUI
* Update styling
* Add vote checkmark to public pages
2019-09-22 14:15:18 +02:00
9267e4310d
Accept acct starting with @ in account migration ( #11907 )
2019-09-21 09:11:38 +02:00
45fe523a18
Addition of update activity distribution by alias, minor correction ( #11905 )
...
* Addition of update activity distribution by alias, minor correction
* Distribute Update activity after adding alias
* Add uniqueness verification to alias uri
* accept acct starting with @
* fix double-quoted to single-quoted
2019-09-21 09:11:21 +02:00
a2d3728c36
Add account migration UI ( #11846 )
...
Fix #10736
- Change data export to be available for non-functional accounts
- Change non-functional accounts to include redirecting accounts
2019-09-19 20:58:19 +02:00
61442032a2
Add table of contents to about page ( #11885 )
...
Move public domain blocks information to about page
2019-09-19 11:09:05 +02:00
4837d6275a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
1781358bd9
Add password challenge to 2FA settings, e-mail notifications ( #11878 )
...
Fix #3961
2019-09-18 16:37:27 +02:00
8904a4eb36
Fix TOTP codes not being filtered from logs during enabling/disabling ( #11877 )
...
Not a serious issue because they are meaningless past single use
2019-09-18 02:48:40 +02:00
66241cfc7e
Fix audit log error when custom emoji is copied from remote server ( #11876 )
2019-09-17 23:20:48 +02:00
2d79552c3c
Fix the sample account icon of Profile directory to local only ( #11872 )
2019-09-17 10:06:43 +02:00
68ce208da3
Fix SSO login not using existing account when e-mail is verified ( #11862 )
...
Fix #11472
2019-09-16 20:42:29 +02:00
566e85716f
Add search and sort functions to hashtag admin UI ( #11829 )
...
* Add search and sort functions to hashtag admin UI
* Move scope processing from tags_controller to tag_filter
* Fix based on method naming conventions
* Fixed not to get 500 errors for invalid requests
2019-09-16 14:27:29 +02:00
8eb0d880cb
Fix 2FA challenge and password challenge for non-database users ( #11831 )
...
* Fix 2FA challenge not appearing for non-database users
Fix #11685
* Fix account deletion not working when using external login
Fix #11691
2019-09-15 21:08:39 +02:00
2e38d889a3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
45b759a2ca
Fix hashtags being split by ZWNJ character ( #11821 )
...
Fix #11761
2019-09-13 16:01:26 +02:00
ec20fd2112
Change unlisted custom emoji to not appear in autosuggestions ( #11818 )
...
Fix #11669
2019-09-13 16:01:09 +02:00
9301574423
Change max length of media descriptions from 420 to 1500 characters ( #11819 )
...
Fix #11658
2019-09-13 16:00:34 +02:00
4291b74031
Change deletes to preserve soft-deleted statuses in unresolved reports ( #11805 )
...
Change all account actions except "none" to resolve all unresolved reports
Refactor `SuspendAccountService` to be more readable
2019-09-11 16:32:44 +02:00
0430cbec29
add admin setting for default search engine indexing ( fix #11750 ) ( #11804 )
2019-09-11 08:44:58 +02:00
8eab4349b4
Add retry for failed media downloads and `tootctl media refresh` ( #11775 )
2019-09-10 15:29:12 +02:00
666c1a8a06
Change tootctl to use inline parallelization instead of Sidekiq ( #11776 )
...
- Remove --background option
- Add --concurrency(=5) option
- Add progress bars
2019-09-10 13:48:48 +02:00
25fb124ee6
Add batch actions and categories to admin UI for custom emojis ( #11793 )
2019-09-09 22:44:17 +02:00
7799c7c75f
Add batch approve/reject for pending hashtags in admin UI ( #11791 )
2019-09-09 12:50:09 +02:00
021a19deba
Change half-life of trend decay ( #11774 )
2019-09-08 19:17:57 +02:00
89989b6255
Add timeline read markers API ( #11762 )
...
Fix #4093
2019-09-06 13:55:51 +02:00
eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
436266ca27
Change trending hashtags to not disappear instantly after midnight ( #11712 )
2019-09-02 18:11:13 +02:00
741b53651e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/directories/index.html.haml
Upstream has redesigned the profile directory, and we
had a glitch-soc-specific change to hide follower counts.
Ported that change to the new design.
2019-08-30 13:38:41 +02:00
70e0c2f162
Add more media formats ( #11687 )
...
* Add more media formats
* Removed amr file type
2019-08-30 04:30:29 +02:00
c194c17cb7
Fix non-numbers being passed to Redis and causing an error ( #11697 )
2019-08-30 02:49:54 +02:00
ee9d0c0f38
Fix uncaught domain normalization error in remote follow ( #11703 )
2019-08-30 02:19:17 +02:00
79922ae20f
Add profile directory to web UI ( #11688 )
...
* Add profile directory to web UI
* Add a line of bio to the directory
2019-08-30 00:14:36 +02:00
449a0727a7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb
All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
9959cdc79f
Add option to include reported statuses in warning e-mail ( #11639 )
2019-08-23 22:37:23 +02:00
32c781ec6b
Add soft delete for statuses for instant deletes through API ( #11623 )
...
* Add soft delete for statuses to allow them to appear instant
* Allow reporting soft-deleted statuses and show them in the admin UI
* Change index for getting an account's statuses
2019-08-22 21:55:56 +02:00
e4605bbb4a
Fix remote and staff-removed statuses leaving media behind for a day ( #11638 )
...
The reason for unattaching media instead of removing it is to support
delete & redraft functionality, but remote or staff-removed statuses
will never be redrafted, so the media should be deleted immediately
2019-08-22 04:17:12 +02:00
f065048070
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/initializers/content_security_policy.rb
(took our version)
2019-08-20 10:33:24 +02:00
c060523dc2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
123ffd0a45
Fix ignoring whole status because of one invalid hashtag ( #11621 )
...
Fix #11618
2019-08-19 20:36:44 +02:00
f17b0ff712
Add invite comments ( #10465 )
2019-08-19 11:40:42 +02:00
Thibaut Girka