hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,943 Commits
7 Branches
0 Tags
179 MiB
Commit Graph

7943 Commits (2fe0cb16239ed86016ebea352425862a561b63a2)

Author SHA1 Message Date
Thibaut Girka 711826cb37 Accurately count deleted unread notifications 2018-09-07 20:37:17 +02:00
Thibaut Girka f4ca3262f2 [Glitch] Audio.prototype.seek is undefined 
Port f08e6e9ab5 to glitch-soc
 2018-09-07 20:37:17 +02:00
Thibaut Girka 8dbbec0939 Fix dropdown arrow position 2018-09-07 09:45:33 +02:00
Renato "Lond" Cerqueira 7607f4778b Use animation config for avatar in profile pages (#8614) 
Fixes #7380.
 2018-09-07 05:43:09 +02:00
abcang 2058af4a26 config/boot is required first (#8619) 2018-09-07 05:42:54 +02:00
Sorin Davidoi 10680f93e7 feat(auth/session_controller): Send Clear-Site-Data when logging out (#8627) 
Will clear the browser's cache, cookies and storage.

https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Clear-Site-Data
https://w3c.github.io/webappsec-clear-site-data/
 2018-09-07 05:42:16 +02:00
ThibG 0c5db3163a Fix dropdown arrow position (#8637) 2018-09-07 01:18:46 +02:00
Thibaut Girka 7f2f59dae6 Fix public profile's “show more” links styling 2018-09-05 13:46:19 +02:00
Thibaut Girka 258e8b7734 Port SCSS changes from 19b07ba260 2018-09-05 13:46:19 +02:00
Thibaut Girka 4b29a41f1d Port SCSS changes from 85bb32c410 2018-09-05 13:46:19 +02:00
Thibaut Girka 77e7da7d0d Port SCSS changes from 78fa926ed5 2018-09-05 13:46:19 +02:00
Thibaut Girka d8b2f15b23 Pause video playback if toot is collapsed or CWs folded (fixes #146) 2018-09-05 11:58:56 +02:00
Thibaut Girka a9ed9d3572 Fix videos being cropped 2018-09-05 11:58:43 +02:00
Aditoo17 8c96fd4967 Add Czech language option and locale data (#8594) 
* Added Czech language option

* Added Czech language option

* Add Czech locale data

* Delete duplicate locale-data/cs.js

Duplicate locale-data is ignored in Mastodon.

see https://github.com/tootsuite/mastodon/blob/v2.5.0/config/webpack/generateLocalePacks.js#L25-L35
 2018-09-05 08:50:06 +09:00
Thibaut Girka c0275cdcb2 Fix interactions between CW and sensitive flag when spoilersAlwaysOn is set 2018-09-04 19:40:57 +02:00
Thibaut Girka 3d5a789bbb Fix “sensitive” media warning and upload form colors in Mastodon-light 2018-09-04 18:50:26 +02:00
Thibaut Girka f1a73fd5f4 Outline white/grey/blue emojis 2018-09-04 16:01:41 +02:00
Thibaut Girka 6e771bf680 Light theme overhaul 2018-09-04 16:01:41 +02:00
Thibaut Girka 36f50be305 [Glitch] Add white outline to black emoji 
Inspired from 0bfa0f2374
 2018-09-04 15:40:27 +02:00
Thibaut Girka b6ce5fa3fb Fix emoji autosuggest when using a CDN for assets 2018-09-04 15:05:31 +02:00
Thibaut Girka 8622dccaf1 Disable focus points for letterboxed media 2018-09-04 13:31:55 +02:00
Thibaut Girka 9998271a5b Fix full-width margins 2018-09-04 13:31:55 +02:00
Thibaut Girka be644e3b7c Media gallery styling closer to upstream's 2018-09-04 13:31:55 +02:00
Thibaut Girka 8183d2ed55 [Glitch] Do not override ctrl/cmd+click in media gallery 2018-09-04 13:31:55 +02:00
Rey Tucker 40d04a3209 Add manifest_src to CSP 
Fixes manifest.json not being loaded because of CSP violation

h/t https://vulpine.club/@binary/100662852252438648
 2018-09-03 22:37:54 +02:00
Thibaut Girka bd437f8077 Add admin links to status and account menus (fixes #673) 
If the current logged-in user is an admin, add quick links to the admin
interface in account and toot dropdown menu. Suggestion by @ashkitten
 2018-09-03 18:19:11 +02:00
Thibaut Girka 7ea4c793d6 Allow to show a specific status in the admin interface 2018-09-03 18:19:11 +02:00
Thibaut Girka 6ad7dac791 Let the front-end know the current account is a moderator 2018-09-03 18:19:11 +02:00
Thibaut Girka b3fdd166e8 [Glitch] Skip VS15 (Emoji textual presentation) 
Port a060beee72 to glitch-soc
 2018-09-03 18:18:50 +02:00
Thibaut Girka 8e862ecf8d [Glitch] Add aria-label to floatingActionButton 
Port 7c12c7b124 to glitch-soc
 2018-09-03 18:18:39 +02:00
Thibaut Girka 27ee42299b [Glitch] Inactive header in main profile to match column 
Port 1bfe735d57 to glitch-soc
 2018-09-03 18:18:24 +02:00
Thibaut Girka a8de13c031 Fix CI badge, as we have switched from Travis to CircleCI 2018-09-03 17:41:28 +02:00
ThibG 174548f3bd
Merge pull request #702 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-09-03 17:40:03 +02:00
Thibaut Girka 6c233a04a0 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 e915bc3e9e Fixes columns scrolling to top when opening media modal 
Fixes #700
 2018-09-03 14:24:10 +02:00
Eugen Rochko ccc2f608c5
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 b65a9b7243
Bump version to 2.5.0 2018-09-02 22:32:27 +02:00
Eugen Rochko 14a300b428
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 78b89e7a5d
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 e1b79c69e1 i18n: Update Polish translation (#8581) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-09-02 22:14:48 +02:00
Eugen Rochko e926811724
Fix nil error in admin_account_link_to helper (#8578) 
Fix #8573
 2018-09-02 19:10:32 +02:00
Eugen Rochko 447d733913
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 dc8eb5305f
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 fdda332e4d 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 7c12c7b124 Add aria-label to floatingActionButton (#8574) 2018-09-02 15:51:06 +02:00
Eugen Rochko 988befb059
Add weblate widget to README 2018-09-02 14:41:46 +02:00
Alix R b0e3fffa1f Add Corsican locale data (#8566) 2018-09-02 20:23:38 +09:00
Evgeny Petrov 2caeeb951f [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 d97e383851
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 075e162319
Whitelist report notification param in Settings::NotificationsController (#8560) 
Bug in #8559
 2018-09-02 02:05:32 +02:00