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
7b7c50f124
Fix public list of domain blocks being too verbose on about page ( #11967 )
2019-09-29 16:23: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
c41cd0d8f6
Fix hashtag batch actions not redirecting back with right filters ( #11962 )
...
Regression from #11829
2019-09-27 02:13:51 +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
1f38dc65cd
Add full numeric notation to the dashboard title attribute ( #11911 )
2019-09-22 02:37:15 +02:00
84c3ceecb7
Fix "reason" prefix being shown with no reason for public blocks ( #11908 )
2019-09-21 20:01:02 +02:00
501b95fa4d
Fix hashtag batch actions being unavailable on pending review page ( #11897 )
...
Regression from #11829
2019-09-20 21:22:16 +02:00
53ceb703b3
Fix page body not being scrollable in admin layout ( #11893 )
...
Hide navigation behind hamburger icon on small screens in admin layout
2019-09-20 10:52:14 +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
16dbecf6e5
Fixed not being able to display review pending hashtags in the admin UI. ( #11875 )
2019-09-17 16:59:16 +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
7bdf741377
Change dashboard to short number notation ( #11847 )
...
* Add short numeric notation to the dashboard
* Fix i18n
* Fix to embed units in code
* Remove settings and always use short notation
* Remove misplaced test lines
* Fit to other pages
2019-09-16 14:26:16 +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
79927b1f55
Change the hashtag link from WebUI to public page ( #11845 )
2019-09-15 15:48:00 +02:00
129a2c1fc8
Fix upstream changes breaking because of glitch-soc's theming engine
2019-09-13 20:28:22 +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
a74b17635b
Fix nil error in warning e-mail template ( #11812 )
2019-09-12 01:51:01 +02:00
0430cbec29
add admin setting for default search engine indexing ( fix #11750 ) ( #11804 )
2019-09-11 08:44:58 +02:00
4ba49f14dc
Change /admin/custom_emoji to honor the auto_play_gif setting ( #11801 )
...
Fixes #9535
2019-09-10 20:56:07 +02:00
3c1c9f8a8e
Fix duplicate HTML ids in /about ( #11803 )
...
Fixes #11329
2019-09-10 20:55:23 +02:00
25fb124ee6
Add batch actions and categories to admin UI for custom emojis ( #11793 )
2019-09-09 22:44:17 +02:00
39e904f9c1
Fix display of instance actor in reports UI ( #11798 )
2019-09-09 20:42:43 +02:00
fef7f3b6d5
Add account bio to account admin view ( #11473 )
...
* Add account bio to account admin view
* Change styling to make bio fields / content more readable
2019-09-09 14:15:52 +02:00
7799c7c75f
Add batch approve/reject for pending hashtags in admin UI ( #11791 )
2019-09-09 12:50:09 +02:00
eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
f743f7a7bf
Fix NotificationMailer failing when receiving mention with media from remote instance ( #11765 )
2019-09-05 06:14:30 +02:00
7ef93513f7
Change account deletion page to have better explanations ( #11753 )
...
Fix deletion of unconfirmed account not freeing up the username
Add prefill of logged-in user's email in the reconfirmation form
2019-09-04 04:13:54 +02:00
ecd444dc99
Fix admin interface showing superfluous reject media/reports on suspended blocks ( #11749 )
...
* Fix admin interface showing superfluous reject media/reports on suspended domains
* Fix reject media/reports checkboxes being visible when editing domain block of suspend severity
2019-09-03 22:53:27 +02:00
ae3c1fbf40
Fix error in admin UI for hashtag usage breakdown ( #11743 )
2019-09-03 07:59:52 +02:00
97beb5d3de
Fix error in user warning template ( #11741 )
2019-09-03 05:57:30 +02:00
2807f39900
Fix user preference to show trends not working on public pages ( #11740 )
...
Fix #11738
2019-09-03 04:57:07 +02:00
feeecba886
Change OpenGraph description on sign-up page to reflect invite ( #11744 )
2019-09-03 04:56:54 +02:00
80fe7fa415
Integrate translation strings for the Profile Directory. ( #11722 )
...
Run `yarn manage:translations en`
2019-09-02 18:12:27 +02:00
76bdc01aee
Fix wrong percentages in admin UI for hashtag usage breakdown ( #11714 )
2019-09-01 19:44:05 +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
b47119eb61
Change layout of public profile directory to be the same as in web UI ( #11705 )
2019-08-30 07:41:16 +02:00
35242b7dc2
Fix error in warning e-mail template ( #11698 )
2019-08-30 01:34:59 +02:00
f21e27e914
Fix uncaught parameter missing exceptions and missing error templates ( #11702 )
2019-08-30 01:34:47 +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
c8df53b75f
Fix public page crash due to audio player, fix unpause in audio player ( #11652 )
2019-08-25 02:13:40 +02:00
f13761d84b
Add audio player ( #11644 )
2019-08-23 22:38:02 +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
Thibaut Girka