luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-18 16:10:57 +00:00
Code Issues Projects Releases Wiki Activity
10763 commits 1 branch 0 tags 248 MiB
Commit graph

7505 commits

Author SHA1 Message Date
Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's
 2019-11-07 13:43:56 +01:00
ThibG 514e427bd2 Fix relationship caches being broken as result of a follow request (#12299) 2019-11-07 09:08:00 +02:00
ThibG 66684c489c Fix WebUI allowing to upload more items than the limit (#12300) 
Until this patch, drag'n'drop and copy-paste allowed to start uploading as
long as the number of *finished* uploads was below the limit.
 2019-11-07 09:07:03 +02:00
ThibG 7cdb8c10e9 Minor improvements to poll composing UI (#12319) 
- Disable the “add option” button instead of hiding it
- Allow poll option inputs to scale to full width
 2019-11-07 09:06:06 +02:00
ThibG 66c1fe0495 Fix various issues with account migration (#12301) 
* Fix being able to follow oneself by moving to an account that was following the old one

* Add specs

* Add spec to catch MoveWorker issue with local followers following both accounts

* Fix move worker breaking when a local account follows both source and target accounts

* Fix migration from remote to local account not sending Undo Follow

* Fix show_reblogs not being preserved for moved account's followers
 2019-11-07 09:05:07 +02:00
Thibaut Girka 84a27a08df [Glitch] Fix notification message for own poll 
Port a4301b5202 and be93318c05 to glitch-soc
 2019-11-06 15:06:53 +01:00
Nolan Lawson ec567337dc [Glitch] fix: support KaiOS arrow navigation on public pages 
Port 1e232e455c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:59:57 +01:00
ThibG 734181c3bf [Glitch] Fix filtered out items being counted as pending items 
Port 3db3c10762 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:55:12 +01:00
Gabriel Rubens d76ab55608 [Glitch] Use inert polyfill 
Port 3cc9ff872f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:52:22 +01:00
ThibG ea55f70f97 [Glitch] Add support for submitting media description with ctrl+enter 
Port 7488a9e154 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:50:54 +01:00
Hinaloe f940c5a1fb [Glitch] dont crash with null-ref 
Port 8568018935 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:50:27 +01:00
Takeshi Umeda f2fc7246e1 [Glitch] Fix an issue where polls with 'expires_at' not set expired 
Port 5b46467474 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:49:43 +01:00
Thibaut Girka 0ae7d84273 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`
 2019-11-06 14:38:28 +01:00
Gabriel Rubens 3cc9ff872f Use inert polyfill (#12209) 
* Inserting wicg-inert in project

* Import wicg-inert in moda_root component

* Update yarn.lock

* Solving code style problems

* Removing package-lock
 2019-11-04 13:03:44 +01:00
mayaeh be93318c05 Integrate own poll's translation into own_poll. (#12231) 
run `yarn manage:translations en`
 2019-11-04 13:03:29 +01:00
Nolan Lawson 1e232e455c fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
ThibG e37358b3bc Fix code referencing wrong class (#12263) 
For some reason, I have seen this only triggered here:
https://circleci.com/gh/tootsuite/mastodon/98324?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-checks-link

But Follow.find_by referenced the ActivityPub::Activity::Follow class
instead of the model class.
 2019-11-04 13:02:27 +01:00
ThibG 3db3c10762 Fix filtered out items being counted as pending items (#12266) 2019-11-04 13:02:16 +01:00
ThibG 65e13cfacf Add abilityto add oneself to lists (#12271) 
* Add ability to add oneself to lists

* Change search results to include oneself when searching through followers

* Mark follow relation as optional in ListAccount
 2019-11-04 13:02:01 +01:00
ThibG 1a12943924 Fix notification filters not applying to poll options (#12269) 2019-11-04 13:01:50 +01:00
ThibG 650820d62d Fix remote media descriptions being cut off at 420 chars (#12262) 
* Fix remote media descriptions being cut off at 420 chars

Fixes #12258

* Fix tests
 2019-11-04 13:00:16 +01:00
ThibG 7488a9e154 Add support for submitting media description with ctrl+enter (#12272) 2019-11-04 12:59:17 +01:00
Hinaloe 8568018935 dont crash with null-ref (#12274) 2019-11-04 12:58:19 +01:00
Thibaut Girka 046cd05a83 Fix download button icon color 2019-10-28 11:41:26 +01:00
ThibG 2ed48037ea [Glitch] Replace fav icon animation with CSS 
Port 3a929dbedd to glitch-soc

And extend that to collapse button

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 21:10:24 +01:00
Nima Boscarino bde35e7878 [Glitch] Add download button to audio and video players 
Port 9b36f62df6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 15:41:22 +01:00
Nima Boscarino ebe34ed529 [Glitch] Unliking a post updates like count on front end 
Port a9530e29a2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 14:44:27 +01:00
ThibG 957eb4241a [Glitch] Fix volume slider in chromium 🤷 
Port bcf694dce7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 14:42:44 +01:00
umonaca dd810a9405 [Glitch] Improve swipe experience 
Port f4be89e24d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 14:41:37 +01:00
Hinaloe 9840e1ad75 [Glitch] don't show outline of full-screen video 
Port 547a5bac9d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 14:38:49 +01:00
ThibG a4dc0d2c27 [Glitch] Fix batch actions being hidden from mobile view 
Port SCSS changes from aa884e0484 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 14:37:17 +01:00
BSKY 59946f9231 [Glitch] Add noopener and/or noreferrer 
Port fccf83e1f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 14:36:25 +01:00
Yamagishi Kazutoshi a4301b5202 Fix notification message for own poll (#12219) 2019-10-27 12:46:35 +01:00
Takeshi Umeda 5b46467474 Fix an issue where polls with 'expires_at' not set expired (#12222) 2019-10-27 12:45:55 +01:00
Yamagishi Kazutoshi 7512f3a3e0 Change message of public timeline for local only (#12224) 2019-10-27 12:45:33 +01:00
dependabot-preview[bot] 4a0281d8c4 [Glitch] Bump react-select from 2.4.4 to 3.0.5 
Port 183fc9d3cb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 12:25:15 +01:00
Thibaut Girka 41a98b6543 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
Thibaut Girka 18c07738a6 Fix media components being cropped 2019-10-26 17:51:22 +02:00
Thibaut Girka 318362758b Hide overflowing characters from reply indicator too 2019-10-26 17:51:22 +02:00
Thibaut Girka a24b954baa Avoid toot text bleeding out of the content div 2019-10-26 17:51:22 +02:00
Nima Boscarino 9b36f62df6 Add download button to audio and video players (#12179) 
* Add download button for audio player

* Add download button for video player

* fix padding for download button in Audio component
 2019-10-25 11:48:20 +02:00
Faye Duxovni 48f75b86ae Add setting for whether to crop images in unexpanded toots (#12126) 2019-10-24 22:51:41 +02:00
Takeshi Umeda a6269b2f83 Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
Nima Boscarino a9530e29a2 Unliking a post updates like count on front end (#12140) 
* return the new favourites_count
when unfavouriting a status

* Remove trailing whitespace

* revert changes to favourites_controller

* Decrease favourites_count through statuses reducer

* styling fix

* Fix missing trailing comma
 2019-10-24 22:49:45 +02:00
ThibG 15c192ce40 Add link to search for users connected from the same IP address (#12157) 
* Add link to search for users connected from the same IP address

Fixes #11949

* Fix missing cell in admin account view table
 2019-10-24 22:49:26 +02:00
ThibG bcf694dce7 Fix volume slider in chromium 🤷 (#12158) 
Fixes #12156
 2019-10-24 22:49:12 +02:00
umonaca f4be89e24d Improve swipe experience (#12168) 2019-10-24 22:48:11 +02:00
Hugo Gameiro 488dd0ff7a remove audio metadata (#12171) 2019-10-24 22:47:58 +02:00
ThibG 3a929dbedd Replace fav icon animation with CSS (#12175) 
Fixes #12151
 2019-10-24 22:47:48 +02:00
Hinaloe 547a5bac9d don't show outline of full-screen video (#12176) 2019-10-24 22:47:37 +02:00