djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-29 03:20:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,337 Commits 69 Branches 20 Tags 380 MiB
f34a402a94
Commit Graph

9337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka
2c767f44bf Fix front-end crash when a video has a blurhash and is hidden behind a CW 2019-05-07 22:33:37 +02:00
dependabot[bot]
fbff73eccb Bump redis from 4.1.0 to 4.1.1 (#10722) 
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-07 14:47:46 +09:00
spla
7562602df8 i18n Update Catalan translation (#10719) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translation

* i18n Update Catalan translation
 2019-05-07 00:55:37 +09:00
dependabot[bot]
7e73a8b8bf Bump parallel_tests from 2.28.0 to 2.29.0 (#10716) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.28.0 to 2.29.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 15:12:55 +09:00
ThibG
b2f5b1045f Add description on hover in media gallery (#10713) 2019-05-06 05:33:56 +02:00
Thibaut Girka
89d2859296 Fix content warning button displaying a link icon when no status card is set 2019-05-05 21:47:05 +02:00
mayaeh
1eb14ef774 i18n: Update Japanese translations (#10706) 
* Update Japanese translations.

run yarn manage:translations

This commit includes translations by some users that were done at the transifex.

* Reduce translation text because it becomes two lines.
 2019-05-06 04:34:32 +09:00
jeroenpraat
e742bff19b 1 NL string update (#10709) 
* 1 NL string update

No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language

* Update nl.json
 2019-05-06 04:33:24 +09:00
Kirishima21
8383222026 fix pinned columns ’s Media-only button 
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
 2019-05-05 20:54:21 +02:00
ThibG
e4ca5414a3
Merge pull request #1032 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-05 20:53:07 +02:00
Eugen Rochko
2508370f44
Bump version to 2.8.2 (#10703) 2019-05-05 17:14:15 +02:00
Baptiste Gelez
eef8802325 [Glitch] Make sure the instance banner is never cropped 
Port 21209c2b52 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-05 12:29:06 +02:00
Thibaut Girka
832cf92c74 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-05 12:28:10 +02:00
Marek Ľach
fc192b882f Minor Slovak locale update (#10705) 2019-05-05 17:25:35 +09:00
Aditoo17
b7741ed732 I18n: Update Czech translation 🇨🇿 (#10704) 
* I18n: Update Czech translation

* Tiny fix
 2019-05-05 15:33:33 +09:00
Baptiste Gelez
21209c2b52 Make sure the instance banner is never cropped (#10702) 2019-05-05 01:07:15 +02:00
Thibaut Girka
f2cf8144b4 Minor style fixes 2019-05-04 23:05:43 +02:00
Eugen Rochko
f0865171fe
Bump blurhash from 0.1.2 to 0.1.3 (#10700) 2019-05-04 22:52:54 +02:00
Eugen Rochko
9b1ef58c95 [Glitch] Change font weight of sensitive button to 500 
Port 63b1388fef to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 20:41:21 +02:00
Eugen Rochko
f59973cc85 [Glitch] Make the "mark media as sensitive" button more obvious in web UI 
Port 05ef3462ba to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 20:41:21 +02:00
Thibaut Girka
b1ab4d5ebe Add visibility icon back in media gallery 2019-05-04 20:06:17 +02:00
Thibaut Girka
cbda1b8b66 Add back description on hover 2019-05-04 20:03:37 +02:00
ThibG
8e221cd22b [Glitch] Fix transition: all 
Port 7aa749ab46 to glitch-soc
 2019-05-04 19:53:09 +02:00
ThibG
b7f69beebe [Glitch] Make the cursor icon consistant across media types in account media gallery 2019-05-04 19:16:51 +02:00
Thibaut Girka
52a4284fe5 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 19:15:50 +02:00
Eugen Rochko
bc97fd641f [Glitch] Add button to view context to media modal 
Port eb63217210 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 19:10:24 +02:00
Eugen Rochko
209c080280 [Glitch] Fix alignment of items in the account gallery in web UI and load more per page 
Port 967e419f8f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:59:11 +02:00
Eugen Rochko
a5da59f140 [Glitch] Change account gallery in web UI 
Port 3f143606fa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:54:57 +02:00
Thibaut Girka
373dd1fdf1 Minor CSS fixes 2019-05-04 18:18:15 +02:00
Eugen Rochko
ccf4f3240a [Glitch] Add blurhash 
Port front-end changes from fba96c808d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:07:44 +02:00
ThibG
7aa749ab46 Fix transition: all (#10699) 2019-05-04 17:39:53 +02:00
Ushitora Anqou
56880fa76a Add SOURCE_TAG to show source repository's tag (#10698) 2019-05-04 17:39:17 +02:00
ThibG
4f73cde4e1 Minor account media gallery fixes (#10695) 
* Make the cursor icon consistant across media types in account media gallery

* Fix the video player modal causing scroll position to reset
 2019-05-04 17:36:43 +02:00
ThibG
1149ddd3da Fix glitch SCSS for links in error messages in admin interface 
Port SCSS changes from 011b032300
 2019-05-04 16:43:08 +02:00
Thibaut Girka
33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
Alix Rossi
c88d9e524b i18n: Update Corsican translation (#10692) 2019-05-04 20:09:25 +09:00
Thibaut Girka
2c2f649200 Fix CSP when PAPERCLIP_ROOT_URL is set to a different host 2019-05-04 10:55:56 +02:00
Eugen Rochko
8025a41a1f
Add tootctl cache clear (#10689) 2019-05-04 01:02:57 +02:00
Thibaut Girka
58720aa2bd Fix CSP when dealing with S3 hosts 2019-05-04 00:47:51 +02:00
Eugen Rochko
5f9f610a23
Bump version to 2.8.1 (#10687) 2019-05-04 00:31:06 +02:00
ThibG
b85f216cbc Do not retry processing ActivityPub jobs raising validation errors (#10614) 
* Do not retry processing ActivityPub jobs raising validation errors

Jobs yielding validation errors most probably won't ever be accepted,
so it makes sense not to clutter the queues with retries.

* Lower RecordInvalid error reporting to debug log level

* Remove trailing whitespace
 2019-05-03 23:45:37 +02:00
Eugen Rochko
7cb369d4c6
Change e-mail whitelist/blacklist to not be checked when invited (#10683) 
* Change e-mail whitelist/blacklist to not be checked when invited

And only when creating an account, not when updating it later

Fix #10648

* Fix test
 2019-05-03 23:44:44 +02:00
Thibaut Girka
9f25ab9792 Fix polls icon not showing in CW button in detailed statuses 2019-05-03 21:55:50 +02:00
Eugen Rochko
d77ee3f276
Fix accounts created through tootctl not being always pre-approved (#10684) 
Add `--approve` option to `tootctl accounts modify`
 2019-05-03 20:49:27 +02:00
Eugen Rochko
63b1388fef
Change font weight of sensitive button to 500 (#10682) 2019-05-03 20:44:20 +02:00
ThibG
91634947f8 Explicitly disable storage of REST API results (#10655) 
Fixes #10652
 2019-05-03 20:39:19 +02:00
ThibG
011b032300 Provide a link to existing domain block when trying to block an already-blocked domain (#10663) 
* When trying to block an already-blocked domain, provide a link to the block

* Fix styling for links in flash messages

* Allow blocks to be upgraded but not downgraded
 2019-05-03 20:36:36 +02:00
Thibaut Girka
7617f78359 Fix crash in onboarding modal 
Fixes #1027
 2019-05-03 19:24:54 +02:00
Eugen Rochko
eb63217210
Add button to view context to media modal (#10676) 
* Add "view context" button to media modal when opened from gallery

* Add "view context" button to video modal

Allow closing the video modal by navigating back in the browser,
just like the media modal
 2019-05-03 16:16:30 +02:00
dependabot[bot]
ecbea2e3c6 Bump rack-attack from 5.4.2 to 6.0.0 (#10599) 
* Bump rack-attack from 5.4.2 to 6.0.0

Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.2 to 6.0.0.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.2...v6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* fix payload[:request]
 2019-05-03 16:16:11 +02:00