Gô Shoemake
|
22f2750578
|
Merge pull request #384 from ThibG/glitch-soc/features/no-media-url
Remove text requirement when media attached from statuses (fixes #381)
|
2018-03-12 13:09:42 -07:00 |
|
Gô Shoemake
|
61f7b7bc3e
|
Merge pull request #344 from chriswmartin/getting-started-badge-merge
merge tootsuite pr #6313 into glitch & move getting_started dispatch stuff to mapDispatchToProps
|
2018-03-12 13:07:59 -07:00 |
|
Gô Shoemake
|
2395a4c313
|
Merge pull request #344 from chriswmartin/getting-started-badge-merge
merge tootsuite pr #6313 into glitch & move getting_started dispatch stuff to mapDispatchToProps
|
2018-03-12 13:07:59 -07:00 |
|
Thibaut Girka
|
cb3a0bf3ed
|
Remove text requirement when media attached from statuses (fixes #381)
Ports 0c2a08adeb to glitchsoc
|
2018-03-12 18:39:07 +01:00 |
|
Thibaut Girka
|
841ef606a9
|
Remove text requirement when media attached from statuses (fixes #381)
Ports cfa9b6e13a to glitchsoc
|
2018-03-12 18:39:07 +01:00 |
|
艮 鮟鱇
|
aa3b1144d1
|
set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758)
|
2018-03-12 16:21:48 +01:00 |
|
艮 鮟鱇
|
f5f165a5eb
|
set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758)
|
2018-03-12 16:21:48 +01:00 |
|
Eugen Rochko
|
9350e691cc
|
Bump version to 2.3.1rc2
|
2018-03-12 12:48:49 +01:00 |
|
Eugen Rochko
|
f89ff65ec7
|
Bump version to 2.3.1rc2
|
2018-03-12 12:48:49 +01:00 |
|
Akihiko Odaki
|
9d4e04bc34
|
Insert space before shortcode if necessary (#6751)
|
2018-03-12 12:47:51 +01:00 |
|
Akihiko Odaki
|
48b940d5c6
|
Insert space before shortcode if necessary (#6751)
|
2018-03-12 12:47:51 +01:00 |
|
Yamagishi Kazutoshi
|
b29feb5c67
|
Hide pinned toots on with replies (#6753)
|
2018-03-12 12:47:18 +01:00 |
|
Yamagishi Kazutoshi
|
6ae70a92c9
|
Hide pinned toots on with replies (#6753)
|
2018-03-12 12:47:18 +01:00 |
|
Yuto Tokunaga
|
010c71f19c
|
Avoid using JS to set height in MediaModal (#6750)
avoid using JS to set height of ReactSwipeableViews component
reduce max-height of <img/> to 80% to avoid the screen covered by image
|
2018-03-12 03:52:05 +01:00 |
|
Yuto Tokunaga
|
fa5c867e0e
|
Avoid using JS to set height in MediaModal (#6750)
avoid using JS to set height of ReactSwipeableViews component
reduce max-height of <img/> to 80% to avoid the screen covered by image
|
2018-03-12 03:52:05 +01:00 |
|
nightpool
|
d09d640953
|
Fix Procfile on OS X (#6748)
|
2018-03-12 03:50:40 +01:00 |
|
nightpool
|
641abe2db7
|
Fix Procfile on OS X (#6748)
|
2018-03-12 03:50:40 +01:00 |
|
Eugen Rochko
|
f2e5501822
|
Fix follow relationships not loading after notifications fetch (#6746)
|
2018-03-12 03:20:56 +01:00 |
|
Eugen Rochko
|
4f7f6b3922
|
Fix follow relationships not loading after notifications fetch (#6746)
|
2018-03-12 03:20:56 +01:00 |
|
Yamagishi Kazutoshi
|
8d6d74b319
|
Weblate translations (2018-03-11) (#6742)
* Translated using Weblate (Japanese)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Finnish)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Finnish)
Currently translated at 25.1% (146 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/
* Translated using Weblate (Slovak)
Currently translated at 91.2% (530 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Arabic)
Currently translated at 67.6% (393 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (581 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Finnish)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Finnish)
Currently translated at 92.0% (69 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/
* Translated using Weblate (Finnish)
Currently translated at 60.3% (35 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Translated using Weblate (Arabic)
Currently translated at 68.3% (397 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 99.2% (274 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Arabic)
Currently translated at 73.8% (429 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Slovak)
Currently translated at 91.2% (530 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* bundle exec i18n-tasks normalize && yarn manage:translations
|
2018-03-11 16:21:26 +01:00 |
|
Yamagishi Kazutoshi
|
8b14726f5b
|
Weblate translations (2018-03-11) (#6742)
* Translated using Weblate (Japanese)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Finnish)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Finnish)
Currently translated at 25.1% (146 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/
* Translated using Weblate (Slovak)
Currently translated at 91.2% (530 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Arabic)
Currently translated at 67.6% (393 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (581 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Finnish)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Finnish)
Currently translated at 92.0% (69 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/
* Translated using Weblate (Finnish)
Currently translated at 60.3% (35 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Translated using Weblate (Arabic)
Currently translated at 68.3% (397 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 99.2% (274 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (276 of 276 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Arabic)
Currently translated at 73.8% (429 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Slovak)
Currently translated at 91.2% (530 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* bundle exec i18n-tasks normalize && yarn manage:translations
|
2018-03-11 16:21:26 +01:00 |
|
Marcin Mikołajczak
|
655f656e5c
|
i18n: Update Polish translation and “yarn manage:translations” (#6743)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
2018-03-11 16:21:16 +01:00 |
|
Marcin Mikołajczak
|
9090b63831
|
i18n: Update Polish translation and “yarn manage:translations” (#6743)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
2018-03-11 16:21:16 +01:00 |
|
Eugen Rochko
|
b744cfee18
|
Bump version to 2.3.1rc1
|
2018-03-11 15:13:13 +01:00 |
|
Eugen Rochko
|
ab27dccba5
|
Bump version to 2.3.1rc1
|
2018-03-11 15:13:13 +01:00 |
|
Eugen Rochko
|
c1d44284ca
|
Fix focal point cropping in MediaGallery, fix focal point modal (#6740)
* Use object-position with object-fit instead of JS top/left
* Fix focal point modal
|
2018-03-11 15:12:33 +01:00 |
|
Eugen Rochko
|
56eb5c3f34
|
Fix focal point cropping in MediaGallery, fix focal point modal (#6740)
* Use object-position with object-fit instead of JS top/left
* Fix focal point modal
|
2018-03-11 15:12:33 +01:00 |
|
TrashMacNugget
|
1526661329
|
Add license info to README (#6583)
* Add license info to README
* Reference AUTHORS file
|
2018-03-11 15:12:23 +01:00 |
|
TrashMacNugget
|
56333cca88
|
Add license info to README (#6583)
* Add license info to README
* Reference AUTHORS file
|
2018-03-11 15:12:23 +01:00 |
|
Eugen Rochko
|
51b32f06fa
|
Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741)
|
2018-03-11 14:55:49 +01:00 |
|
Eugen Rochko
|
1aaec701bb
|
Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741)
|
2018-03-11 14:55:49 +01:00 |
|
Konrad Pozniak
|
7d455651d3
|
add new avatar placeholder missing.png (#6728)
|
2018-03-11 14:55:38 +01:00 |
|
Konrad Pozniak
|
cd252b794e
|
add new avatar placeholder missing.png (#6728)
|
2018-03-11 14:55:38 +01:00 |
|
Jenkins
|
828d10c327
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2018-03-11 09:17:21 +00:00 |
|
Jenkins
|
a0724cd742
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2018-03-11 09:17:21 +00:00 |
|
Eugen Rochko
|
b9b01bf14a
|
Add show more/less toggle for entire threads in web UI (#6733)
Fix #1258
|
2018-03-11 09:52:59 +01:00 |
|
Eugen Rochko
|
b6003afcdb
|
Add show more/less toggle for entire threads in web UI (#6733)
Fix #1258
|
2018-03-11 09:52:59 +01:00 |
|
David Yip
|
701c1f410d
|
Merge pull request #379 from ThibG/glitch-soc/features/improved-account-header
Port #6627 and #6636 to glitch-soc flavour
|
2018-03-10 23:35:16 -06:00 |
|
David Yip
|
0c2a16fcbf
|
Merge pull request #379 from ThibG/glitch-soc/features/improved-account-header
Port #6627 and #6636 to glitch-soc flavour
|
2018-03-10 23:35:16 -06:00 |
|
Marcin Mikołajczak
|
74e72ba369
|
i18n: Update Polish translation (#6731)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
2018-03-11 01:56:30 +09:00 |
|
Marcin Mikołajczak
|
f5ee2d469b
|
i18n: Update Polish translation (#6731)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
2018-03-11 01:56:30 +09:00 |
|
abcang
|
f25dfde752
|
Improve performance of account_media_status_ids (#6729)
|
2018-03-10 17:44:26 +01:00 |
|
abcang
|
37b043d447
|
Improve performance of account_media_status_ids (#6729)
|
2018-03-10 17:44:26 +01:00 |
|
Akihiko Odaki
|
53b39b8042
|
Use Alpine Linux yarn package in Docker (#6725)
Yarn was manually installed to meet the Yarn version requirement of
webpacker. Today, Alpine Linux 3.7 provides Yarn new enough.
|
2018-03-10 11:49:04 +01:00 |
|
Akihiko Odaki
|
36579bac88
|
Use Alpine Linux yarn package in Docker (#6725)
Yarn was manually installed to meet the Yarn version requirement of
webpacker. Today, Alpine Linux 3.7 provides Yarn new enough.
|
2018-03-10 11:49:04 +01:00 |
|
Eugen Rochko
|
a9d7b3f7a3
|
Fix #6717: Do not double html-encode page titles (#6720)
|
2018-03-10 11:43:20 +01:00 |
|
Eugen Rochko
|
4476a45444
|
Fix #6717: Do not double html-encode page titles (#6720)
|
2018-03-10 11:43:20 +01:00 |
|
Akihiko Odaki
|
9e68e02c8e
|
Remove su-exec from Docker image (#6722)
It is no longer necessary since commit
aff432db1e.
|
2018-03-10 11:42:42 +01:00 |
|
Akihiko Odaki
|
58a4633707
|
Remove su-exec from Docker image (#6722)
It is no longer necessary since commit
be9bab171d.
|
2018-03-10 11:42:42 +01:00 |
|
Akihiko Odaki
|
6337d2099b
|
Remove git from Docker image (#6724)
|
2018-03-10 11:42:28 +01:00 |
|