5262820fae
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
46b5085ced
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
6 years ago
0bb3ba2406
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
2a917031c9
Add toot source to delete result to ease Delete & Redraft ( #10669 )
...
* Return Status with raw text in raw_content when deleting a status
* Use raw content if available on delete & redraft
* Rename raw_content to text; do not serialize formatted content when source is requested
6 years ago
d35f558b37
Use local time in audit log ( #10751 )
6 years ago
e060819020
[Glitch] Improve poll link accessibility
...
Port fc40391743
6 years ago
f625501c05
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
22541e98e2
[Glitch] Add confirm modal for unboosting toots
...
Port d225a952a8
6 years ago
062684bcf8
i18n: Update French translations ( #10747 )
...
* Update French JSON
* i18n: Update fr.yml
* i18n: Update simple_form.fr.yml
* Update simple_form.fr.yml
* Update fr.yml
6 years ago
1959e4e5ec
i18n: Update Corsican translations ( #10746 )
...
* i18n: Update Corsican translations
* Update co.yml
* Fix a translation in co.yml
6 years ago
01ba6c5d83
Change icon and label depending on whether media is marked as sensitive ( #10748 )
...
* Change icon and label depending on whether media is marked as sensitive
* WiP use a checkbox
6 years ago
1bf48b01e3
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
e55cf0042f
Fix media description confirmation modal
...
Fixes #1040
6 years ago
f0b5e0c46d
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
5ba0684958
Add strings for Slovak ( #10734 )
...
* Add strings for Slovak
* Update sk.yml
6 years ago
221a6a0e6d
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
9767db2a6b
Add ES_PREFIX in .env.production.sample ( #10087 )
6 years ago
d225a952a8
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
6 years ago
5cf2f8c646
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
a571b07557
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
4870d7f122
Add some caching for HTML versions of statuses pages ( #10701 )
6 years ago
fc40391743
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
6 years ago
8d4c489681
Remove custom emojis on "tootctl domains purge" ( #10721 )
...
* Remove custom emojis on domains purge
* Change message "Removing" to "Removed"
6 years ago
5ad2a7b5dc
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
3288f4a571
Bring back crossed eye icon on gallery ( #10715 )
6 years ago
e9f0c31dc6
Fix tabs bar on mobile
...
Fixes #1037
6 years ago
6b71076391
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
40a480ea34
Fix front-end crash when a video has a blurhash and is hidden behind a CW
6 years ago
021c89c896
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
13244f7bb3
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
17394a9723
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
139ef769f7
Add description on hover in media gallery ( #10713 )
6 years ago
5052b8c29f
Fix content warning button displaying a link icon when no status card is set
6 years ago
683a5ae765
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
027f35c6a5
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
1592cab613
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
28758a3965
Merge pull request #1032 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
0979e7f2f5
Bump version to 2.8.2 ( #10703 )
6 years ago
83665f0357
[Glitch] Make sure the instance banner is never cropped
...
Port 05b2a77a6d
6 years ago
23829e09f5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
a20c26aba7
Minor Slovak locale update ( #10705 )
6 years ago
71fd62835e
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
6 years ago
05b2a77a6d
Make sure the instance banner is never cropped ( #10702 )
6 years ago
850f8195fd
Minor style fixes
6 years ago
715cb437f6
Bump blurhash from 0.1.2 to 0.1.3 ( #10700 )
6 years ago
5df7b98c2b
[Glitch] Change font weight of sensitive button to 500
...
Port f7879bbe08
6 years ago
8050f86d04
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port cc39785d45
6 years ago
167808363d
Add visibility icon back in media gallery
6 years ago
43dc5ad0e5
Add back description on hover
6 years ago
d0342a1a63
[Glitch] Fix transition: all
...
Port 9e044c9649
6 years ago
Thibaut Girka
nzws
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi
manuelviens
Marek Ľach
Stanislas
Jeong Arm
dependabot[bot]
spla
mayaeh
jeroenpraat
Kirishima21
Eugen Rochko
Baptiste Gelez
Marek Ľach
Aditoo17