luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-11 16:05:04 +00:00
Code Issues Projects Releases Wiki Activity
8167 commits 1 branch 0 tags 248 MiB
Commit graph

8167 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka 1e656c3632 [Glitch] Fix “load more” button when no data has been fetched 2018-12-13 15:00:36 +01:00
Thibaut Girka 2d097c10d0 [Glitch] Make account media gallery more consistent with account timeline 
Display “load more” more consistently, add a loading indicator on first load.
 2018-12-13 15:00:36 +01:00
Thibaut Girka 5f581d7c3c [Glitch] Fix LoadMore usage in account media gallery 
(Even though that codepath is probably never actually used…)
 2018-12-13 15:00:36 +01:00
Thibaut Girka 73ee38f485 [Glitch] Do not display empty message when the list is known to have more elements 2018-12-13 15:00:36 +01:00
Thibaut Girka 39696024ca Minor cleanup in ScrollableList component 2018-12-13 15:00:36 +01:00
Eugen Rochko 6d2080a74b
Add account hashtags to ActivityPub actor JSON (#9450) 2018-12-13 05:22:01 +01:00
Eugen Rochko 426d7191d9
Fix bootsnap cache directory being declared relatively (#9511) 
Resolve #9490
 2018-12-13 05:19:52 +01:00
ysksn 795bac44fd Add spec for Settings::ExportsController#create (#9512) 2018-12-13 02:53:52 +01:00
ThibG 55abff8af7 Various fixes to scrollable lists and media gallery (#9501) 
* Always use the scrollable class for the ScrollList component

Fixes #9499 as well as empty timelines' scrollbar “blinking”
between loading state and empty state.

* Do not display empty message when the list is known to have more elements

Fixes #9500

* Fix LoadMore usage in account media gallery

(Even though that codepath is probably never actually used…)

* Make account media gallery more consistent with account timeline

Fixes #9498

Display “load more” more consistently, add a loading indicator on first load.

* Fix “load more” button when no data has been fetched
 2018-12-12 22:32:44 +01:00
ysksn b048926e67 Create Settings::BaseController (#9507) 
Define `Settings::BaseController#set_body_classes` so that sub classes
inherit `Settings::BaseController` don't need to define
`#set_body_classes` agein.
 2018-12-12 22:32:13 +01:00
Marcin Mikołajczak 9983d21d35 i18n: Update Polish translation (#9509) 2018-12-13 02:13:20 +09:00
ysksn 83975a2394 Remove redundant (#9503) 2018-12-12 05:54:34 +01:00
ysksn 351ed12b2f Use find_or_initialize_by (#9504) 2018-12-12 05:54:09 +01:00
ThibG cf6ee4ff24 Add admin ability to remove an user's header image (#9495) 
* Fix markup in admin/accounts/:id table for avatar

* Add admin ability to remove an user's header image
 2018-12-11 19:28:03 +01:00
ThibG 720daa8143 Add instance-wide setting to disable profile directory (#9497) 
* Add instance-wide setting to disable profile directory

Fixes #9496

When the profile directory is disabled:
- The “discoverable” setting is hidden from users
- The “profile directory” link is not shown on public pages
- /explore returns 404

* Move Setting.profile_directory check to a before_action filter
 2018-12-11 19:18:29 +01:00
dependabot[bot] a48fe52375 Bump letter_opener from 1.6.0 to 1.7.0 (#9493) 
Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases)
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 14:34:02 +09:00
dependabot[bot] f1041637ff Bump json-ld-preloaded from 2.2.3 to 3.0.0 (#9416) 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 2.2.3 to 3.0.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/2.2.3...3.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 05:40:01 +01:00
Yamagishi Kazutoshi 9650bbc8b2 [i18n] Update Occitan (#9491) 
* Adds the Profil directory

* Adds the line about directory

* Harmonisation

* Update oc.yml

* i18n-tasks normalize && i18n-tasks remove-unused

* yarn manage:translations
 2018-12-11 05:38:57 +01:00
Adam Copp 7d00e4edbd Make custom emoji domains case insensitive #9351 (#9474) 
* Make custom emoji domains case sensitive #9351

* Fixup style in downcase_domain to comply with codeclimate.

* switch if! to unless

* Don't use transactions, operate in batches.

Also revert spurious schema change.
 2018-12-11 05:30:57 +01:00
Eugen Rochko dbb1ee269f
Improve e-mail MX validator and add tests (#9489) 2018-12-10 22:53:25 +01:00
ThibG 3f12c07ff5 Use same CORS policy for /@:username and /users/:username (#9485) 
Fixes #8189

rack-cors being called before the application router, it does not follow
the redirection, and we need a separate rule for /users/:username.
 2018-12-10 21:39:47 +01:00
ysksn ed24bb2c3e Add specs for activitypub collections controller (#9484) 
* Add specs for ActivityPub::CollectionsController#show

* Raise ActiveRecord::RecordNotFound

Raising ActiveRecord::NotFound raises NameError: uninitialized constant
ActiveRecord::NotFound.
 2018-12-10 21:39:25 +01:00
ysksn 6eae8f77af Add spec for Admin::SuspentionsController#new (#9483) 2018-12-10 21:38:21 +01:00
ysksn 189a6b17fb Remove RemoteAccountControllerConcern never used (#9482) 2018-12-10 21:38:01 +01:00
ysksn 361818e931 Fix Admin::TagsController#unhide (#9481) 2018-12-10 21:37:38 +01:00
ysksn ae3d2f446a Add specs for Admin::InvitesController (#9471) 2018-12-10 01:19:28 +09:00
ThibG c6b7b98489
Merge pull request #849 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-09 16:38:09 +01:00
Thibaut Girka 4f59d1efd7 Fix directory controller in glitch-soc 2018-12-09 16:08:10 +01:00
Thibaut Girka 480f938511 [Glitch] Fix various things in the directory 
Port ecd303c097 to glitch-soc
 2018-12-09 16:08:10 +01:00
Thibaut Girka 0b1bc66695 Port directory CSS changes from upstream 
Port 73be8f38c1 to glitch-soc
 2018-12-09 16:08:10 +01:00
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
 2018-12-09 16:08:04 +01:00
ThibG 81bda7d67c Add setting to not aggregate reblogs (#9248) 
* Add setting to not aggregate reblogs

Fixes #9222

* Handle cases where user is nil in add_to_home and add_to_list

* Add hint for setting_aggregate_reblogs option

* Reword setting_aggregate_reblogs label
 2018-12-09 13:03:01 +01:00
Eugen Rochko 6b78e5b5ab
Cache hashtag sample accounts, and exclude ineligible ones (#9465) 2018-12-08 01:32:26 +01:00
Eugen Rochko 4638b16822
Make notification time smaller and reduce contrast (#9464) 2018-12-08 00:40:11 +01:00
Marcin Mikołajczak 6cf12aa74c i18n: Update Polish translation (#9459) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-12-07 21:08:29 +01:00
ysksn dfd123d5b3 Remove pending spec (#9453) 2018-12-07 16:53:55 +01:00
dependabot[bot] 1c7061fb90 Bump rubocop from 0.61.0 to 0.61.1 (#9451) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.0 to 0.61.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.61.0...v0.61.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-07 16:42:50 +01:00
Paweł Ngei 5c7f641565 Escape HTML in profile name preview in profile settings (#9446) 
* fix non-escaped html in the profile settings

* provide a default profile text in case if there's no custom one

* update haml syntax

* simplify default profile name to username

* sanitize user-input html but display emojified icons
 2018-12-07 16:42:22 +01:00
ysksn d3547fa005 Add specs for ActivityPub::InboxesController (#9456) 2018-12-07 16:40:01 +01:00
ysksn 88b3eed16f Add specs for Admin::AccountModerationNotesHelper (#9455) 2018-12-07 16:39:20 +01:00
ysksn 57bb62d5cf Remove pending spec (#9454) 
Since dots are not allowed in username,
this spec is no longer needed.
 2018-12-07 16:38:50 +01:00
ysksn 51cbd045da Add specs for AccountTagStat model (#9452) 2018-12-07 16:37:56 +01:00
Eugen Rochko ecd303c097
Fix various things in the directory (#9449) 
* Fix missing variable in directory page title

* Order hashtags by number of people instead of alphabetically

* Add icon to OpenGraph preview of directory page

* Prevent line breaks in hashtags and ensure lowercase in the table
 2018-12-07 16:37:32 +01:00
Takeshi Umeda c1c0f7c516 Fix tag mb_chars comparison of profile directory (#9448) 2018-12-07 04:18:37 +01:00
ThibG e3682c9c17
Merge pull request #848 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-06 17:40:43 +01:00
Eugen Rochko 73be8f38c1
Add profile directory (#9427) 
Fix #5578
 2018-12-06 17:36:11 +01:00
Thibaut Girka 4167ed375b Fix mention links in detailed statuses not opening in the WebUI 2018-12-06 15:31:21 +01:00
Thibaut Girka 24822eca73 Revert "Add database statement timeout of 60s (#9382)" 
This reverts commit 58a29db99d.
 2018-12-06 14:39:04 +01:00
Thibaut Girka 1df392819d Merge branch 'master' into glitch-soc/merge-upstream 2018-12-06 12:44:38 +01:00
ysksn 155cf12680 Remove pending spec (#9442) 
`#from_account` isn't defined.
 2018-12-06 17:39:15 +09:00