68629f2773
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
6 years ago
d4d4e84324
Fix media description confirmation modal
...
Fixes #1040
6 years ago
780d99c204
Update simple_form.fr.yml ( #10726 )
...
* Minor modif and add
Modified '' by ’ and added invite_request
* Update simple_form.fr.yml
Modifications suggérées par ThibG
* Update simple_form.fr.yml
Remplacement des ' par des ’.
* Update simple_form.fr.yml
Ajout de deux petits espaces devant sessions:
6 years ago
9962174a1f
Add strings for Slovak ( #10734 )
...
* Add strings for Slovak
* Update sk.yml
6 years ago
9d4e9015a7
Update fr.yml ( #10727 )
...
* Update fr.yml
Added missing lines
* Update fr.yml
Application des modifications de ThibG
* Update fr.yml
Modifications proposées par ThibG
6 years ago
a3c7dd92f3
Add ES_PREFIX in .env.production.sample ( #10087 )
6 years ago
fe8a8f779e
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
6 years ago
f2be71c293
Add emoji suggestions to CW and poll option fields ( #10555 )
...
* Refactor selectComposeSuggestion so that different paths can be updated
* Add suggestions in CW field
* Add emoji suggestion to poll options
* Attempt to fix CSS
* Hide suggestions by default
They will be enabled if the input has focus
6 years ago
62f5235b6f
Prevent silenced local users from notifying remote users not following them ( #10575 )
...
* Prevent silenced local users from notifying remote users not following them
This is an attempt to extend the local restrictions of silenced users to the
federation.
* Add tests
* Add tests for making sure private status don't get sent over OStatus
6 years ago
26fc21c188
Add some caching for HTML versions of statuses pages ( #10701 )
6 years ago
0402c52f28
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
6 years ago
03801fcaa5
Remove custom emojis on "tootctl domains purge" ( #10721 )
...
* Remove custom emojis on domains purge
* Change message "Removing" to "Removed"
6 years ago
ce8635605c
Record deleted(by mod) status to prevent re-appear ( #10732 )
...
* Record deleted(by mod) status to prevent re-appear
* Move to Tombstone
* Add missing migration script
6 years ago
09eea46631
Bring back crossed eye icon on gallery ( #10715 )
6 years ago
3191c3b349
Fix tabs bar on mobile
...
Fixes #1037
6 years ago
5c82d660d1
Fix some colors of high contrast theme ( #10711 )
...
* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast
6 years ago
2c767f44bf
Fix front-end crash when a video has a blurhash and is hidden behind a CW
6 years ago
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>
6 years ago
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
6 years ago
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>
6 years ago
b2f5b1045f
Add description on hover in media gallery ( #10713 )
6 years ago
89d2859296
Fix content warning button displaying a link icon when no status card is set
6 years ago
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.
6 years ago
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
6 years ago
8383222026
fix pinned columns ’s Media-only button
...
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
6 years ago
e4ca5414a3
Merge pull request #1032 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
2508370f44
Bump version to 2.8.2 ( #10703 )
6 years ago
eef8802325
[Glitch] Make sure the instance banner is never cropped
...
Port 21209c2b52
6 years ago
832cf92c74
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
fc192b882f
Minor Slovak locale update ( #10705 )
6 years ago
b7741ed732
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
6 years ago
21209c2b52
Make sure the instance banner is never cropped ( #10702 )
6 years ago
f2cf8144b4
Minor style fixes
6 years ago
f0865171fe
Bump blurhash from 0.1.2 to 0.1.3 ( #10700 )
6 years ago
9b1ef58c95
[Glitch] Change font weight of sensitive button to 500
...
Port 63b1388fef
6 years ago
f59973cc85
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port 05ef3462ba
6 years ago
b1ab4d5ebe
Add visibility icon back in media gallery
6 years ago
cbda1b8b66
Add back description on hover
6 years ago
8e221cd22b
[Glitch] Fix transition: all
...
Port 7aa749ab46
6 years ago
b7f69beebe
[Glitch] Make the cursor icon consistant across media types in account media gallery
6 years ago
52a4284fe5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
bc97fd641f
[Glitch] Add button to view context to media modal
...
Port eb63217210
6 years ago
209c080280
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
...
Port 967e419f8f
6 years ago
a5da59f140
[Glitch] Change account gallery in web UI
...
Port 3f143606fa
6 years ago
373dd1fdf1
Minor CSS fixes
6 years ago
ccf4f3240a
[Glitch] Add blurhash
...
Port front-end changes from fba96c808d
6 years ago
7aa749ab46
Fix transition: all ( #10699 )
6 years ago
56880fa76a
Add SOURCE_TAG to show source repository's tag ( #10698 )
6 years ago
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
6 years ago
1149ddd3da
Fix glitch SCSS for links in error messages in admin interface
...
Port SCSS changes from 011b032300
6 years ago
Thibaut Girka