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

1688 commits

Author SHA1 Message Date
David Yip
ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master' 
Conflicts:
 	app/controllers/statuses_controller.rb
 2018-04-12 03:30:57 -05:00
David Yip
f42e335e19 Merge pull request #418 from ThibG/glitch-soc/fixes/composer-dropdowns 
Place composer dropdown menus top if they are closer to the bottom of the viewport
 2018-04-12 03:28:22 -05:00
David Yip
ef678ae350 Merge pull request #416 from ThibG/glitch-soc/features/media-modal 
Port various media modal improvements to glitch-soc
 2018-04-12 00:20:19 -05:00
ThibG
47cb9587b7 Place privacy dropdown menu top if it is closer to the bottom of the viewport (#7106) 2018-04-11 20:42:50 +02:00
Thibaut Girka
9b6e579c76 Update glitch-soc style to match changes to reports UI 
Port style changes from 5a166a19a7
 2018-04-11 19:15:42 +02:00
Akihiko Odaki
6c2344d4dd Paginate ancestor statuses in public page (#7102) 
This also limits the statuses returned by API, but pagination is not
implemented in Web API yet. I still expect it brings user experience
better than making a user wait to fetch all ancestor statuses and flooding
the column with them.
 2018-04-11 12:35:09 +02:00
Jenkins
e4e0aa5d21 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-11 00:50:09 +00:00
Thibaut Girka
d1bfe4cdad Place composer dropdown menus top if they are closer to the bottom of the viewport 2018-04-10 20:52:31 +02:00
Emelia Smith
5a166a19a7 Feature: Improve reports ui (#7032) 
* Further improvements to Reports UI

- Clean up notes display
- Clean up add new note form
- Simplify controller
- Allow reopening a report with a note
- Show created at date for reports
- Fix report details table formatting

* Show history of report using Admin::ActionLog beneath the report

* Fix incorrect log message when reopening a report

* Implement fetching of all ActionLog items that could be related to the report

* Ensure adding a report_note updates the report's updated_at

* Limit Report History to actions that happened between the report being created and the report being resolved

* Fix linting issues

* Improve report history builder

Thanks @gargron for the improvements
 2018-04-10 20:27:59 +02:00
Eugen Rochko
93a1afb66c Improve load gap styling in web UI (#7100) 2018-04-10 17:12:10 +02:00
Emelia Smith
7a06bd7085 Feature: Direct message from Statuses (#7089) 
* Fix: Switching between composing direct message and mention from menus

Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that.

* Fix: Add missing proptype check for onMention in Status component

* Add the ability to send a direct message to a user from the menu on Statuses

* Add space between "Embed" and "Mention" on expanded statuses menu
 2018-04-09 17:09:11 +02:00
Marcin Mikołajczak
33671bcc50 i18n: Update Polish translation (#7085) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-09 17:28:53 +09:00
David Yip
337fc136fd Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
 2018-04-08 19:05:02 -05:00
Thibaut Girka
d8dea31e0c [Glitch] Fix video player height 
Port 5eea3f9877 to glitch-soc
 2018-04-09 01:08:51 +02:00
Thibaut Girka
c2b7080a6e [Glitch] Refactor scss 
Port 480131a376 to glitch-soc
 2018-04-09 01:08:50 +02:00
Thibaut Girka
27ad9247a3 Fix video modal 2018-04-09 00:11:10 +02:00
Thibaut Girka
9a5a49f17c [Glitch] Avoid using JS to set height in MediaModal 
Port 010c71f19c to glitch-soc
 2018-04-08 23:18:24 +02:00
Thibaut Girka
89f5ae00a5 [Glitch] Improved media modal 
Port d6e88e29e2 to glitch-soc
 2018-04-08 23:15:25 +02:00
Thibaut Girka
a5a305feb5 [Glitch] Allow to open a modal for embedded photo 
Port 16a49799cf to glitch-soc
 2018-04-08 23:06:33 +02:00
Emelia Smith
f48902e6e6 Hide search from Compose on mobile devices (#7077) 
* Hide search from Compose on mobile devices

We're presently seeing large numbers of users accidentally tooting what they're trying to search for. This PR hides the search form from the Compose view, now that we have a dedicated "search" tab on mobile.

* Don't "showSearch" on mobile if we're not currently searching (isSearchPage)
 2018-04-08 18:25:08 +02:00
Emelia Smith
0e5e60a84b Add search item to tab bar for mobile devices (#7072) 
* Add search item to tab bar for mobile devices

* Fix missing prop validation
 2018-04-08 14:26:58 +02:00
Akihiko Odaki
fb8768a469 Free stroage if it is exceeding disk quota (#7061) 2018-04-08 13:32:39 +02:00
Thibaut Girka
2a4785a250 Fix video playback in glitch-soc detailed statuses 2018-04-08 12:22:12 +02:00
Hisham Muhammad
835a974a2a i18n: improve "Welcome" translation in Portuguese (#7068) 
* i18n: update gender-neutral language for pt and pt-BR

Instead of using "bem-vindo(a)" (a masculine form of "Welcome"
with a "(a)" in the end to mean "bem-vinda" for the feminine form),
use "boas-vindas", which is a gender-neutral form of "Welcome").

There is already precedent for using "boas-vindas" in the
Brazilian Portuguese localization, in `config/locales/pt-BR.yml`.
European Portuguese dictionary Priberam also registers it as a valid form:
https://www.priberam.pt/dlpo/boas-vindas

* i18n: pt-BR minor orthography fix

The form "a bordo" does not take an accent.
http://oredator.com.br/curso-de-redacao/uncategorized/a-bordo-ou-a-bordo
 2018-04-07 21:36:03 +02:00
Harmon
f7c306596f Remove duplicate frequently used emojis (#7064) 2018-04-07 14:53:11 +02:00
Isatis
f3db0d6ecc retrieve custom emoji list via API instead of before page load (#7047) 2018-04-04 22:25:34 +02:00
Eugen Rochko
e54b79a777 Adjust privacy policy (#6666) 
* Adjust privacy policy to be more specific to Mastodon

Fix #6613

* Change data retention of IP addresses from 5 years to 1 year

* Add even more information

* Remove all (now invalid) translations of the privacy policy

* Add information about archive takeout, remove pointless consent section

* Emphasis on DM privacy

* Improve wording

* Add line about data use for moderation purposes
 2018-04-04 21:47:39 +02:00
David Yip
a60a600a10 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	spec/views/about/show.html.haml_spec.rb
 2018-04-04 13:56:58 -05:00
David Yip
19001dd3dd Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-04-04 13:55:42 -05:00
beatrix
f5dfd3fae5 Merge pull request #412 from ThibG/glitch-soc/cleanup 
Remove duplicate message entries (minor code cleanup)
 2018-04-04 11:36:54 -04:00
Thibaut Girka
e57ed1cb27 Update accounts SCSS for public pages 2018-04-04 15:40:59 +02:00
Thibaut Girka
7518a4b9d7 Remove duplicate message entries 2018-04-04 12:19:00 +02:00
Emelia Smith
07ffc4fa11 Revert "Add double-tap zoom functionary to ZoomableImage (#6944)" (#7035) 
Unfortunately the new hammer.js functionality wasn't correctly tested and didn't work across devices and browsers, as such, it's best to revert PR #6944 until we can revisit this functionality and make it work across all devices and browsers that are supported by Mastodon.

This reverts commit 7551951094.
 2018-04-04 11:58:15 +02:00
Eugen Rochko
7f1e924fa9 Add contact account to landing page ("Administered by") (#6984) 2018-04-04 01:11:26 +02:00
Jenkins
62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
mayaeh
b505eec7e5 i18n: Add Japanese translations for #7000 (#7022) 
* run yarn manage:translations.

* run i18n-tasks add-missing ja.

* Update Japanese translations.
 2018-04-03 18:21:33 +09:00
Thibaut Girka
e1e4a53496 [Glitch] Fix: Prevent submission using same logic as submit button disabling. 
Port 7d791f494b to glitch-soc
 2018-04-02 20:04:18 +02:00
unarist
d88504ec84 Add missing rejection handling for Promises (#7008) 
* Add eslint-plugin-promise to detect uncaught rejections

* Move alert generation for errors to actions/alert

* Add missing rejection handling for Promises

* Use catch() instead of onReject on then()

Then it will catches rejection from onFulfilled. This detection can be
disabled by `allowThen` option, though.
 2018-04-02 14:51:02 +02:00
Emelia Smith
4be5383b91 Fix issues with sending direct messages from user profile (#6999) 
* Clear compose textarea when starting a new direct message

Previous behaviour resulted in potentially misdirected direct messages.

* Hide search when starting to compose a direct message
 2018-04-02 13:44:19 +02:00
Yamagishi Kazutoshi
21fa7b6520 Weblate translations (2018-04-02) (#7007) 
* Translated using Weblate (Galician)

Currently translated at 100.0% (587 of 587 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (587 of 587 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (587 of 587 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 76.4% (449 of 587 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.8% (586 of 587 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 92.3% (542 of 587 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 92.3% (542 of 587 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (58 of 58 strings)

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

* Translated using Weblate (Polish)

Currently translated at 98.9% (581 of 587 strings)

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

* Translated using Weblate (French)

Currently translated at 99.6% (585 of 587 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (586 of 587 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (Persian)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.8% (586 of 587 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.8% (586 of 587 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (587 of 587 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/

* Translated using Weblate (Arabic)

Currently translated at 76.6% (450 of 587 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (587 of 587 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 92.6% (544 of 587 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/

* Translated using Weblate (Arabic)

Currently translated at 82.9% (487 of 587 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 98.6% (74 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/

* Translated using Weblate (Slovak)

Currently translated at 93.6% (550 of 587 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 95.4% (560 of 587 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/

* Translated using Weblate (Korean)

Currently translated at 100.0% (58 of 58 strings)

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

* Translated using Weblate (Korean)

Currently translated at 99.8% (586 of 587 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (280 of 280 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 82.9% (487 of 587 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 99.2% (278 of 280 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 87.3% (513 of 587 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 99.6% (279 of 280 strings)

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

* bundle exec i18n-tasks normalize && yarn manage:translations

* revert
 2018-04-02 13:43:30 +02:00
Evgeny Petrov
2964c7a7b8 Russian language updated (#7005) 
* Russian language updated

* Small fixes for RU language

* bundle exec i18n-tasks normalize
 2018-04-02 19:49:06 +09:00
luzi82
89d3bc36a3 i18n: update zh-HK translation (#7004) 
* i18n: update zh-HK translation

* i18n: update zh-HK translation

* i18n-tasks normalize
 2018-04-02 19:11:37 +09:00
David Yip
21394c5462 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml
 2018-04-01 20:24:50 -05:00
Emelia Smith
7d791f494b Fix: Prevent submission using same logic as submit button disabling. (#6993) 
This prevents submission through ctrl/cmd+enter when the submit button is disabled.
 2018-04-01 22:19:43 +02:00
Marcin Mikołajczak
9458e263d5 i18n: Update Polish translation (#6985) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-01 10:31:38 +02:00
mayaeh
e0046b2c13 i18n: Add Japanese translations for domain blocks (#6979) 
* run yarn manage:translations

* Update Japanese translations for domain blocks.
 2018-03-31 21:09:39 +09:00
unarist
11fb748041 Ignore AbortError when cancelled sharing (#6978) 
`navigator.share()` rejects Promise if user cancelled sharing, and it may
print it as an error on JavaScript console.

This patch ignores it and prints other errors on the console.
 2018-03-31 13:16:38 +02:00
Jenkins
658440838b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-30 19:17:17 +00:00
beatrix
766a008931 Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui 
Port #6628 to glitch-soc flavour
 2018-03-30 14:50:02 -04:00
Thibaut Girka
769c536db4 [Glitch] Remove pointer events on the entire UI when a dropdown menu is open 
Port 95fce1bca0 to glitch-soc
 2018-03-30 12:45:23 +02:00