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

7413 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
d937c65f2c Let the front-end know the current account is a moderator 2018-09-03 18:19:11 +02:00
Thibaut Girka
c50c4d4a8f [Glitch] Skip VS15 (Emoji textual presentation) 
Port f21c1c58ce to glitch-soc
 2018-09-03 18:18:50 +02:00
Thibaut Girka
c11159af5f [Glitch] Add aria-label to floatingActionButton 
Port e84ae0d8a2 to glitch-soc
 2018-09-03 18:18:39 +02:00
Thibaut Girka
ea2054e2f5 [Glitch] Inactive header in main profile to match column 
Port 2903971e04 to glitch-soc
 2018-09-03 18:18:24 +02:00
Thibaut Girka
725735af14 Fix CI badge, as we have switched from Travis to CircleCI 2018-09-03 17:41:28 +02:00
ThibG
b71e4161f4 Merge pull request #702 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-09-03 17:40:03 +02:00
Thibaut Girka
7134c1f522 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
 2018-09-03 14:33:06 +02:00
Thibaut Girka
7ed6f60a74 Fixes columns scrolling to top when opening media modal 
Fixes #700
 2018-09-03 14:24:10 +02:00
Eugen Rochko
b7ec70d486 Redirect from old authorize_follow path (#8584) 
To avoid error due to nginx proxy caching the webfinger response
 2018-09-03 00:10:28 +02:00
Eugen Rochko
e3fdf02943 Bump version to 2.5.0 2018-09-02 22:32:27 +02:00
Eugen Rochko
9768e9f6ab Enable ro and ta locales in Rails (#8583) 
* Enable ro and ta locales in Rails

* Add Tamil and Romanian to language dropdown
 2018-09-02 22:31:53 +02:00
Eugen Rochko
64f01b2e7d Weblate translations (2018-09-02) (#8582) 
* Translated using Weblate (Serbian)

Currently translated at 72.4% (499 of 689 strings)

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

* Translated using Weblate (Serbian)

Currently translated at 77.6% (535 of 689 strings)

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

* Translated using Weblate (Dutch)

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

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (689 of 689 strings)

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

* Translated using Weblate (Corsican)

Currently translated at 99.7% (687 of 689 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100.0% (689 of 689 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (83 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Serbian)

Currently translated at 72.3% (60 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (German)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Serbian)

Currently translated at 92.8% (77 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Serbian)

Currently translated at 100.0% (83 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

 Језик писања? Нисам сигуран

* Translated using Weblate (Corsican)

Currently translated at 99.9% (688 of 689 strings)

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

* Translated using Weblate (Serbian)

Currently translated at 98.8% (330 of 334 strings)

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

* Translated using Weblate (Serbian)

Currently translated at 100.0% (334 of 334 strings)

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

Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод.

* Translated using Weblate (Occitan)

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

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

* Translated using Weblate (Occitan)

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

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/

* Translated using Weblate (Serbian)

Currently translated at 100.0% (334 of 334 strings)

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

Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод.

* Translated using Weblate (German)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (German)

Currently translated at 99.7% (687 of 689 strings)

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

* Translated using Weblate (Serbian)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Serbian)

Currently translated at 100.0% (83 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* i18n-tasks noramlize && yarn manage:translations
 2018-09-02 22:31:35 +02:00
Marcin Mikołajczak
fb9fc05f0c i18n: Update Polish translation (#8581) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-09-02 22:14:48 +02:00
Eugen Rochko
696d73931c Fix nil error in admin_account_link_to helper (#8578) 
Fix #8573
 2018-09-02 19:10:32 +02:00
Eugen Rochko
2b99bba92c Update README.md 
Add link to quick start guide, link to general documentation, fix link to list of servers, remove Liberapay
 2018-09-02 18:32:25 +02:00
Eugen Rochko
9f4618d7a6 Weblate translations (2018-09-02) (#8577) 
* Translated using Weblate (Polish)

Currently translated at 100.0% (83 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/

* Translated using Weblate (Korean)

Currently translated at 100.0% (83 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/

* Translated using Weblate (Czech)

Currently translated at 100.0% (83 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/

* Added translation using Weblate (Tamil)

* Translated using Weblate (Greek)

Currently translated at 100.0% (83 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/

* Translated using Weblate (Corsican)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Corsican)

Currently translated at 100.0% (83 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/

* Translated using Weblate (Persian)

Currently translated at 100.0% (83 of 83 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/

* Translated using Weblate (Romanian)

Currently translated at 100.0% (334 of 334 strings)

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

* Added translation using Weblate (Romanian)

* Added translation using Weblate (Romanian)

* Added translation using Weblate (Romanian)

* i18n-tasks normalize && yarn manage:translations

* Fix ro YML files
 2018-09-02 18:20:26 +02:00
ThibG
56caf50db7 Update docker config and move some workers to different queues (#8345) 
* Reorder docker-compose's sidekiq queues to match config/sidekiq.yml

* Make the ̀“mailers” queue higher priority than “pull”
 2018-09-02 16:13:06 +02:00
Frederic Hemberger
e84ae0d8a2 Add aria-label to floatingActionButton (#8574) 2018-09-02 15:51:06 +02:00
Eugen Rochko
5facd13c76 Add weblate widget to README 2018-09-02 14:41:46 +02:00
Alix R
d21e46bba6 Add Corsican locale data (#8566) 2018-09-02 20:23:38 +09:00
Evgeny Petrov
6997fe6d8a [RU] Added translation for the following sections: (#8570) 
* Added translation for the following sections:
• Empty followers, mutes, boosts etc. lists
• Keyboard shortcuts
• "About"
• Plurals for statuses, users and subscribers counters
• Relays, Custom CSS and suspensions settings.
• Remote interactions
• Other misc stuff

* i18n-tasks normalize
 2018-09-02 20:21:54 +09:00
Eugen Rochko
b59191cf68 Weblate translations (2018-09-01) (#8561) 
* Translated using Weblate (German)

Currently translated at 99.9% (687 of 688 strings)

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

* Translated using Weblate (German)

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

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

* Translated using Weblate (German)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.9% (688 of 689 strings)

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

* Translated using Weblate (Dutch)

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

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

* Translated using Weblate (Japanese)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Greek)

Currently translated at 99.9% (688 of 689 strings)

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

* Translated using Weblate (Catalan)

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

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

* Translated using Weblate (Catalan)

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

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

* Translated using Weblate (Arabic)

Currently translated at 98.1% (676 of 689 strings)

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

* Translated using Weblate (French)

Currently translated at 99.9% (688 of 689 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Persian)

Currently translated at 99.7% (687 of 689 strings)

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

* Translated using Weblate (Welsh)

Currently translated at 7.3% (6 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Welsh)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Welsh)

Currently translated at 15.5% (107 of 689 strings)

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

* Translated using Weblate (Welsh)

Currently translated at 1.6% (1 of 62 strings)

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

* Translated using Weblate (Welsh)

Currently translated at 15.8% (109 of 689 strings)

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

* Translated using Weblate (French)

Currently translated at 99.9% (688 of 689 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Occitan)

Currently translated at 99.9% (688 of 689 strings)

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

* Translated using Weblate (Occitan)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Danish)

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

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

* Translated using Weblate (Occitan)

Currently translated at 99.7% (333 of 334 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (334 of 334 strings)

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

* Translated using Weblate (Czech)

Currently translated at 99.9% (688 of 689 strings)

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

* Added translation using Weblate (Romanian)

* Translated using Weblate (Romanian)

Currently translated at 47.9% (160 of 334 strings)

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

* i18n-tasks normalize && yarn manage:translations
 2018-09-02 03:14:46 +02:00
Eugen Rochko
00d1699a96 Whitelist report notification param in Settings::NotificationsController (#8560) 
Bug in #8559
 2018-09-02 02:05:32 +02:00
Eugen Rochko
601a0dc6cc Add preference for report notification e-mails, skip for duplicates (#8559) 
If an unresolved report for the same target account already exists,
no new notification is generated
 2018-09-02 00:11:58 +02:00
M Somerville
f21c1c58ce Skip VS15 (Emoji textual presentation). (#8553) 
Mastodon converts all Emoji to images, whether they have a VS15 after
them or not, but leaves the VS15 in the string, which is displayed as
a black box in Safari.
 2018-09-01 19:42:02 +02:00
Yamagishi Kazutoshi
8a0670a54e Integrating :one and :other in ar.yml (#8555) 2018-09-01 19:41:21 +02:00
ThibG
82cbf325c2 Merge pull request #699 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-09-01 17:44:06 +02:00
Thibaut Girka
65e4345a48 Merge branch 'master' into glitch-soc/merge-upstream 2018-09-01 17:23:46 +02:00
Yamagishi Kazutoshi
35beafabe9 Fix static URL when disable autoplay (#8548) 2018-09-01 16:09:24 +02:00
Thibaut Girka
b72cc57175 Fix composer not displaying on chrome mobile (fixes #696) 2018-09-01 09:39:25 +02:00
Eugen Rochko
894e01163b Bump version to 2.5.0rc2 2018-09-01 03:37:43 +02:00
trwnh
150ec66461 Fix the display of missing lists (#8523) 
* Fix the display of missing lists

See #6786 -- this fixes part of the issue pertaining to lists that don't exist. I copied the Column being returned from the missing status logic, which works fine. Prior to this, the missing lists logic would generate a column with no back button and with a broken layout. This doesn't fix the broken display of missing accounts -- the column construction pertaining to that logic happens in multiple external functions.

* import ColumnBackButton

missed the import with the first commit
 2018-09-01 03:36:36 +02:00
Eugen Rochko
32d3152852 Fix wrong string being used on login failure when using LDAP (#8534) 
Fix #8527
 2018-09-01 03:35:37 +02:00
ThibG
abc03a3b9d Merge pull request #694 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-31 20:56:22 +02:00
ThibG
b13f1d470a Do not show follow button on moved or memorial accounts (#8546) 
This restores the logic from before the public profile redesign. Fixes #8503
 2018-08-31 20:33:01 +02:00
Thibaut Girka
daa6110ce7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
 2018-08-31 19:10:57 +02:00
Thibaut Girka
ff18ba0d2b Add option to not automatically unfold content warnings matching a regexp 
Fixes #678
 2018-08-31 18:35:03 +02:00
Thibaut Girka
2fbebd89fb Allow text inputs in local settings dialog 2018-08-31 18:35:03 +02:00
Thibaut Girka
02c32ad7af Add a setting to automatically unfold all content warnings 2018-08-31 18:35:03 +02:00
Thibaut Girka
a3afd0791d [Glitch] Show compose form on delete & redraft when in mobile layout 
Port 97a2958ba1 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka
f485e2ced3 Fix search results on compose box 2018-08-31 18:33:46 +02:00
Thibaut Girka
923a7f3f11 Fix account header showing on search page 2018-08-31 18:33:46 +02:00
Thibaut Girka
deb14b957a [Glitch] On the mobile UI, move the search column to the right 
Port 5f0b9c5d36 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka
89b50796ba [Glitch] Hide search from Compose on mobile devices 
Port f48902e6e6 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka
fb195f37bb [Glitch] Add search item to tab bar for mobile devices 
Port 0e5e60a84b to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka
042b5212cd [Glitch] Use withRouter for TabsBar 
Port 2040094568 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka
e88fe59712 [Glitch] Move "compose" on mobile to floating action button 
Port 1237c34997 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka
000b9f7b03 [Glitch] When search enabled, display hint in search popout 
Port a91ef56e80 to glitch-soc
 2018-08-31 18:33:46 +02:00
caasi Huang
b61793b3fc Translate more messages to Traditional Chinese (#8543) 2018-08-31 23:22:03 +09:00
ThibG
108623e86d Self-notify on accepting follow requests (#8541) 2018-08-31 15:17:31 +02:00