61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
30a28a2eb7
Fix not showing if emoji has a local counterpart in admin UI ( #12135 )
...
Fix #12132
2019-10-10 02:21:52 +02:00
538db85d3c
Remove `lang` attribute from individual statuses ( #12124 )
...
Fix #10930
2019-10-09 03:45:05 +02:00
c8bcf5cbfd
Add admin setting to auto-approve hashtags ( #12122 )
...
Change inaccurate labels on other admin settings
2019-10-09 00:30:15 +02:00
19cdc62765
Remove fallback to long description on sidebar and meta description ( #12119 )
...
Fix #12114
2019-10-08 22:08:55 +02:00
1bbba0016a
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
740c9cb3ee
Remove invite comments from UI ( #12068 )
...
Due to UX confusion and insufficient time to fix it
2019-10-03 22:37:13 +02:00
a84aedb7a7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
c35376132b
Fix long domain block descriptions breaking table layout ( #12029 )
2019-10-01 04:54:29 +02:00
b258583d2b
Fix hashtag link to directory in AdminUI ( #12005 )
...
* Fixed not to generate link if no user used hashtag in directory
* Added missing translation for AdminUI custom emojis
* run yarn manage:translations en
2019-10-01 01:20:22 +02:00
16ff7c5627
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
3babf8464b
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
bd9685f798
Fix public list of domain blocks being too verbose on about page ( #11967 )
2019-09-29 16:23:01 +02:00
163ed91af3
Add (back) option to set redirect notice on account without moving followers ( #11994 )
...
Fix #11913
2019-09-29 05:03:19 +02:00
7a39671d46
Fix hashtag batch actions not redirecting back with right filters ( #11962 )
...
Regression from #11829
2019-09-27 02:13:51 +02:00
b359974d9b
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
4fe5f8f3c7
Add full numeric notation to the dashboard title attribute ( #11911 )
2019-09-22 02:37:15 +02:00
33b2e0f189
Fix "reason" prefix being shown with no reason for public blocks ( #11908 )
2019-09-21 20:01:02 +02:00
450639a406
Fix hashtag batch actions being unavailable on pending review page ( #11897 )
...
Regression from #11829
2019-09-20 21:22:16 +02:00
b9a8b38844
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
3ed94dcc1a
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
d930eb88b6
Add table of contents to about page ( #11885 )
...
Move public domain blocks information to about page
2019-09-19 11:09:05 +02:00
5cadb47238
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
e1066cd431
Add password challenge to 2FA settings, e-mail notifications ( #11878 )
...
Fix #3961
2019-09-18 16:37:27 +02:00
a4b60e9ba4
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
75c6ad500d
Fixed not being able to display review pending hashtags in the admin UI. ( #11875 )
2019-09-17 16:59:16 +02:00
ef0d22f232
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
b7420b8643
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
c707ef49d9
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
1511638975
Change the hashtag link from WebUI to public page ( #11845 )
2019-09-15 15:48:00 +02:00
5477726f50
Fix upstream changes breaking because of glitch-soc's theming engine
2019-09-13 20:28:22 +02:00
74c5b2bd08
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
3a3b40e0c3
Fix nil error in warning e-mail template ( #11812 )
2019-09-12 01:51:01 +02:00
4fe127664b
add admin setting for default search engine indexing ( fix #11750 ) ( #11804 )
2019-09-11 08:44:58 +02:00
17389c63c8
Change /admin/custom_emoji to honor the auto_play_gif setting ( #11801 )
...
Fixes #9535
2019-09-10 20:56:07 +02:00
2b2b03a7da
Fix duplicate HTML ids in /about ( #11803 )
...
Fixes #11329
2019-09-10 20:55:23 +02:00
1110ea1a91
Add batch actions and categories to admin UI for custom emojis ( #11793 )
2019-09-09 22:44:17 +02:00
14d4a783cd
Fix display of instance actor in reports UI ( #11798 )
2019-09-09 20:42:43 +02:00
ec2a439a22
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
261e52268c
Add batch approve/reject for pending hashtags in admin UI ( #11791 )
2019-09-09 12:50:09 +02:00
5088eb8388
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
e265b8887d
Fix NotificationMailer failing when receiving mention with media from remote instance ( #11765 )
2019-09-05 06:14:30 +02:00
43f56f1291
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
c1e238a77b
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
ec1dd865fb
Fix error in admin UI for hashtag usage breakdown ( #11743 )
2019-09-03 07:59:52 +02:00
92a6fa6c90
Fix error in user warning template ( #11741 )
2019-09-03 05:57:30 +02:00
16c1abdb2d
Fix user preference to show trends not working on public pages ( #11740 )
...
Fix #11738
2019-09-03 04:57:07 +02:00
3221f998dd
Change OpenGraph description on sign-up page to reflect invite ( #11744 )
2019-09-03 04:56:54 +02:00
1f22b8197c
Integrate translation strings for the Profile Directory. ( #11722 )
...
Run `yarn manage:translations en`
2019-09-02 18:12:27 +02:00
47584180d8
Fix wrong percentages in admin UI for hashtag usage breakdown ( #11714 )
2019-09-01 19:44:05 +02:00
Thibaut Girka
Eugen Rochko
mayaeh
Takeshi Umeda
Tao Bror Bojlén