me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9335 commits 2 branches 0 tags 429 MiB
Commit graph

1757 commits

Author SHA1 Message Date
Thibaut Girka
422dd06806 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
Neil Moore
59f6637559 Adds click-able div that expands status (#10733) (#10766) 
The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.
 2019-05-15 06:53:23 +02:00
ThibG
cfb69164ad Fix incorrect reference to raw_content (it is raw_text instead) (#10753) 2019-05-11 23:56:07 +02:00
Thibaut Girka
5262820fae Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
ThibG
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
 2019-05-11 06:46:43 +02:00
Alix Rossi
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
 2019-05-10 18:09:46 +02:00
Alix Rossi
1959e4e5ec i18n: Update Corsican translations (#10746) 
* i18n: Update Corsican translations

* Update co.yml

* Fix a translation in co.yml
 2019-05-10 18:09:34 +02:00
ThibG
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
 2019-05-10 17:59:57 +02:00
Thibaut Girka
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
 2019-05-10 17:09:12 +02:00
Aurélien Reeves
d225a952a8 Add confirm modal for unboosting toots (#10287) 
[#3815]

Display the boost modal also when unboosting toots.
 2019-05-09 22:39:26 +02:00
ThibG
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
 2019-05-09 22:10:27 +02:00
Jeong Arm
3288f4a571 Bring back crossed eye icon on gallery (#10715) 2019-05-08 18:01:33 +02:00
spla
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
 2019-05-07 00:55:37 +09:00
ThibG
139ef769f7 Add description on hover in media gallery (#10713) 2019-05-06 05:33:56 +02:00
mayaeh
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.
 2019-05-06 04:34:32 +09:00
jeroenpraat
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
 2019-05-06 04:33:24 +09:00
Thibaut Girka
23829e09f5 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-05 12:28:10 +02:00
Aditoo17
71fd62835e I18n: Update Czech translation 🇨🇿 (#10704) 
* I18n: Update Czech translation

* Tiny fix
 2019-05-05 15:33:33 +09:00
Thibaut Girka
5d6f4ef070 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 19:15:50 +02:00
ThibG
d5357fcbf2 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
Thibaut Girka
73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
Eugen Rochko
4aabc452d0 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
ThibG
d8418c07c9 When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
Eugen Rochko
cc39785d45 Make the "mark media as sensitive" button more obvious in web UI (#10673) 
* Make the "mark media as sensitive" button more obvious in web UI

* Use eye-slash icon instead of eye icon to mean "hide"
 2019-05-03 04:34:55 +02:00
Eugen Rochko
78f5b96bf6 Fix alignment of items in the account gallery in web UI and load more per page (#10674) 2019-05-03 04:02:55 +02:00
Eugen Rochko
db73f8e585 Change account gallery in web UI (#10667) 
- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab
 2019-05-02 08:34:32 +02:00
partev
f843bdbd73 Update hy.json (#10644) 2019-04-28 12:51:20 +09:00
Eugen Rochko
a6d2fe7165 Add blurhash (#10630) 
* Add blurhash

* Use fallback color for spoiler when blurhash missing

* Federate the blurhash and accept it as long as it's at most 5x5

* Display unknown media attachments as blurhash placeholders

* Improve style of embed actions and spoiler button

* Change blurhash resolution from 3x3 to 4x4

* Improve dependency definitions

* Fix code style issues
 2019-04-27 03:24:09 +02:00
ThibG
23e87a4742 Fix upload progressbar when image resizing is involved (#10632) 2019-04-25 02:48:54 +02:00
Thibaut Girka
6f85bb754b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
 2019-04-22 20:40:04 +02:00
ThibG
eb80c3924f Allow switching between singe-option and multiple-option polls (#10603) 2019-04-22 14:56:14 +02:00
kedama
92ced1e94b Fix modal items cannot scroll on touch devices (#10605) 2019-04-22 14:55:50 +02:00
ThibG
3c6f8de45a Minor code cleanup (#10613) 2019-04-22 14:55:24 +02:00
Yamagishi Kazutoshi
47c0af88f1 Add hi.json (#10573) 2019-04-21 04:52:20 +02:00
partev
fe19e9d7b1 Update hy.json (#10591) 2019-04-21 04:48:47 +02:00
jeroenpraat
f7cc05db80 Update NL (Dutch) translation (#10601) 
* Update NL language strings

Have to do it this way, cause this file is locked on Weblate

* fix

* Update simple_form.nl.yml

* Update nl.yml
 2019-04-21 04:46:08 +02:00
Sho Kusano
1af37e09f3 Configrationable repository url (#10600) 
* config: Add GITHUB_REPOSITORY for repository name

* config: Add SOURCE_BASE_URL for repository url

* Show source_url and repository name on getting started
 2019-04-21 04:41:34 +02:00
Thibaut Girka
3673665b46 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-19 10:44:10 +02:00
Renato "Lond" Cerqueira
83420b9d41 Add new pt-br translations (#10564) 2019-04-13 21:23:41 +09:00
Thibaut Girka
5a24934449 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 21:19:21 +02:00
Evgeny Petrov
4c19204392 i18n: Russian localization update (#10515) 
* i18n: Updated ru.json for Russian language

* i18n: Updated ru.yml

* Normalize ru.yml

* i18n: Updated simple_form.ru.yml

* i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings

* Added new strings to ru.json

* Deleted unused (?) string

* i18n: Added recent strings (Settings refactor)
 2019-04-10 20:43:08 +02:00
Eugen Rochko
a0000b9a94 Weblate translations (2019-04-10) (#10545) 
* Translated using Weblate (Occitan)

Currently translated at 95.7% (780 of 815 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Greek)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (French)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Arabic)

Currently translated at 97.4% (372 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (French)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Thai)

Currently translated at 75.4% (288 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/

* Translated using Weblate (German)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/

* Translated using Weblate (Slovak)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/

* Translated using Weblate (Kazakh)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/

* Translated using Weblate (Persian)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Kazakh)

Currently translated at 99.0% (378 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/

* i18n-tasks normalize

* yarn manage:translations

* Fix empty string in Occitan
 2019-04-10 18:17:24 +02:00
Aditoo17
db70d35c3f I18n: Final Czech translation 🇨🇿 (#10542) 
* I18n: Update Czech translation

* I18n: Why do you want to join translation

* I18n: Translating a bunch of more stuff
 2019-04-10 14:52:08 +02:00
Marek Ľach
aced669796 Updates the grammar of the SK translation (#10541) 2019-04-10 14:50:39 +02:00
Thibaut Girka
cde0ac1aa7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
 2019-04-10 09:16:08 +02:00
Yağızhan
6286ace752 Fixed terrible grammar and translated the most (#10527) 
The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon.

I'll come back and finish the translation.
 2019-04-09 20:42:01 +02:00
Eugen Rochko
403338108e Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
Quentí
5c9f6740c6 [i18n] Update and correction (#10511) 
* [i18n] Update and correction

* Update oc.json

* Update oc.json
 2019-04-09 07:39:50 +09:00
Thibaut Girka
5c8f9a3220 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
 2019-04-08 15:57:56 +02:00
koyu
c66a043591 Updated German locales (#10505) 
* Updated German locales

* Added account approval locales (German)

* Updated JSON locales (German)
 2019-04-08 21:14:08 +09:00