a96375d2ef
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
bf3c777751
Add kn, mr, ur to available locales ( #12379 )
2019-11-13 23:36:41 +01:00
f73c977caa
Fix broken admin audit log in whitelist mode ( #12303 )
2019-11-11 00:05:15 +02:00
e76f4056e5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
1dc1d01f95
Split AccountsHelper from StatusesHelper ( #12078 )
2019-10-24 22:50:09 +02:00
c2d6ef1b64
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
27dff3317c
Add br, es-AR, et, mk, nn to available locales ( #12062 )
2019-10-03 03:59:43 +02:00
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
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
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
722d8cdc36
New Crowdin translations ( #11799 )
...
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Kazakh)
[ci skip]
* New translations simple_form.en.yml (Asturian)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations activerecord.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations devise.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations doorkeeper.en.yml (Breton)
[ci skip]
* New translations devise.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations activerecord.en.yml (Breton)
[ci skip]
* New translations devise.en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations activerecord.en.yml (Asturian)
[ci skip]
* New translations devise.en.yml (Russian)
[ci skip]
* New translations activerecord.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Norwegian)
[ci skip]
* New translations activerecord.en.yml (Norwegian)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations devise.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Ukrainian)
[ci skip]
* New translations activerecord.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Slovak)
[ci skip]
* New translations activerecord.en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Georgian)
[ci skip]
* New translations activerecord.en.yml (Georgian)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations devise.en.yml (Croatian)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Bulgarian)
[ci skip]
* New translations activerecord.en.yml (Bulgarian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations devise.en.yml (Indonesian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations devise.en.yml (Ido)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations devise.en.yml (Hebrew)
[ci skip]
* New translations activerecord.en.yml (Hebrew)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2019-09-16 15:11:01 +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
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
c8b25aa7fc
Fix name of Portuguese language not including Portugal ( #11820 )
...
Fix #11602
2019-09-13 16:00:19 +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
eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
feeecba886
Change OpenGraph description on sign-up page to reflect invite ( #11744 )
2019-09-03 04:56:54 +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
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
a8d983934e
Fix blurhash and autoplay not working on public pages ( #11585 )
2019-08-16 19:15:05 +02:00
7a55d93244
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-06 13:16:53 +02:00
05e9cd13eb
Change admin UI for hashtags and add back whitelisted trends ( #11490 )
...
Fix #271
Add back the `GET /api/v1/trends` API with the caveat that it does
not return tags that have not been allowed to trend by the staff.
When a hashtag begins to trend (internally) and that hashtag has
not been previously reviewed by the staff, the staff is notified.
The new admin UI for hashtags allows filtering hashtags by where
they are used (e.g. in the profile directory), whether they have
been reviewed or are pending reviewal, they show by how many people
the hashtag is used in the directory, how many people used it
today, how many statuses with it have been created today, and it
allows fixing the name of the hashtag to make it more readable.
The disallowed hashtags feature has been reworked. It is now
controlled from the admin UI for hashtags instead of from
the file `config/settings.yml`
2019-08-05 19:54:29 +02:00
4973ba2d1f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
825dc3ca22
Add whitelist mode ( #11291 )
2019-07-30 11:10:46 +02:00
6c7a3268c9
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
1cf7bdede4
Bump json-ld-preloaded from 3.0.2 to 3.0.3 ( #11316 )
...
* Bump json-ld-preloaded from 3.0.2 to 3.0.3
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.2...3.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* use json-ld edge
2019-07-28 13:48:43 +02:00
eecce7e59b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
317b79d673
Add HTTP signatures to all outgoing ActivityPub GET requests ( #11284 )
2019-07-11 14:49:55 +02:00
6baf5099a6
Refactor fetching of remote resources ( #11251 )
2019-07-10 18:59:28 +02:00
d0b0b63b1a
Refactor domain block checks ( #11268 )
2019-07-09 03:27:35 +02:00
fbbcbd940d
Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` ( #11247 )
2019-07-07 16:16:51 +02:00
5a158899bc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
73e610790e
Change full logo to use primary text color of the given theme ( #10994 )
...
* Change full logo to use primary text color of the given theme
* Fix colors of public layout header in light theme
2019-06-08 15:30:06 +02:00
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-28 17:45:06 +02:00
c5234ac2aa
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
2019-05-27 03:33:39 +02:00
cde0ac1aa7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
No real conflict, upstream changes too close to glitch-specific
theming system changes.
- config/navigation.rb
Upstream redesigned the settings navigation, took those changes
and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
6d5b05e3d5
Add invite request to pending account notification e-mail ( #10528 )
...
Fix sorting of the pending accounts page
2019-04-10 00:36:01 +02:00
5c8f9a3220
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
c84c30c542
Improve blocked view of profiles ( #10491 )
...
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )"
This reverts commit 0317f37c6f#10442 )"
This reverts commit 4cd944d364
2019-04-07 04:59:13 +02:00
0117de0a01
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +01:00
364e49ae1f
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status ( #10401 )
...
Also, fix some n+1 queries
Resolve #10365
2019-03-28 04:44:59 +01:00
7aeb50cc89
Add order options to relationship manager UI ( #10404 )
2019-03-28 02:16:01 +01:00
1f70b51fff
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
88a85f2574
Change icons of features on admin dashboard to remove bias ( #10366 )
...
Red crosses implied that it was bad/unexpected that certain features
were not enabled. In reality, they are options, so showing a green
or grey power-off icon is more appropriate.
Add status of timeline preview as well
Fix sample accounts changing too frequently due to wrong query
Sample accounts are intended to be sorted by popularity
2019-03-26 01:24:19 +01:00
c37bc0b268
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/en.yml
Conflict caused by the glitch-soc-specific “flavour” string being too close
to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
0653375622
Add missing locales (bn, ga, hi) ( #10295 )
2019-03-18 21:55:21 +01:00
365de06816
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb
All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
b1e0164848
Add dormant filter to relationship manager, rename other filters ( #10308 )
...
Rename "abandoned" to "moved", and "active" to "primary"
2019-03-18 03:53:17 +01:00
eed61a37ec
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
Upstream removed the “Authorized followers” page and associated
translations. This is too close in the file to our glitch-soc-specific
“flavour” string. No actual conflict.
- config/locales/ja.yml
Same as above.
- config/locales/pl.yml
Same as above.
- config/navigation.rb
No real conflict. New route added too close to the glitch-soc-specific
“flavours” one.
- config/webpack/configuration.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- config/webpack/loaders/babel.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
The contents of this file have been moved to package.json.
- config/webpack/shared.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- config/webpacker.yml
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- jest.config.js
The contents of this file have been moved to package.json.
- package.json
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- yarn.lock
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
2019-03-16 14:14:20 +01:00
Thibaut Girka