fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 19:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
5655 commits 128 branches 266 tags 988 MiB
Commit graph

5655 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
codl 9abb5becf4
remove escapes from server-side γaml handler 
this matches a change that was made in the client-side equivalent
 2018-01-24 14:23:25 +01:00
David Yip c53d7196e6
Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-code 
Remove some leftover code
 2018-01-23 10:27:13 -06:00
Thibaut Girka 2107891edb Remove some leftover code, I guess 2018-01-23 09:20:18 +01:00
David Yip a90d0419d9
Merge pull request #343 from glitch-soc/merge-upstream-20180121 
Merge upstream
 2018-01-21 18:00:08 -06:00
David Yip 48d79007f6
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121 2018-01-21 16:26:50 -06:00
David Yip 81b78fac54
Update Vagrantfile to ubuntu/xenial64. 
The version of Redis that ships with Ubuntu Trusty is too old to support
the HyperLogLog commands.  I guess we could add a custom apt repo for
this, but it seems a lot easier to just use the latest Ubuntu LTS
release (i.e. xenial), which has a recent-enough Redis in its archives.
 2018-01-21 16:09:40 -06:00
Norayr Chilingarian 48cd6dc6ca armenian translations initial commit (#6320) 
* adding armenian translations

* updating config files for armenian translations

* armenian translation fix

* fixing spaces
 2018-01-22 05:02:23 +09:00
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb
 2018-01-21 13:36:10 -06:00
codl cfd2b06821 fix filter search index being too strict when looking for line breaks (#6318) 2018-01-21 13:23:17 +01:00
ThibG d613dda91d Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) 
Since 872a0d5bd8, assets URL are absolute and
not relative. Unfortunately, the domain used to build such URLs is the wrong
one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.
 2018-01-21 13:22:31 +01:00
Aboobacker MK 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314) 2018-01-21 13:21:28 +01:00
Eugen Rochko 31d1485887
Display number of follow requests in getting started menu, and (#6313) 
if notifications column is not mounted, also display number of
unread notifications there.
 2018-01-21 13:20:20 +01:00
Eugen Rochko 1287de1b83
Fix invalid value passed to full_asset_url in mailers (#6312) 2018-01-21 13:20:00 +01:00
David Yip 2c578a01d8
Merge remote-tracking branch 'origin/master' into gs-master 2018-01-20 16:42:57 -06:00
David Yip e7a0840f8c
Merge pull request #336 from ThibG/glitch-soc/features/tag-warning 
Display a warning when composing unlisted toots with something looking like a hashtag
 2018-01-20 16:37:52 -06:00
David Yip 24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream 
Merge upstream
 2018-01-20 16:37:35 -06:00
Iijima Yasushi 72f9eab3d6 Change mailer avatar url (#6309) 
* Change mailer avatar url

* Use full_asset_url method
 2018-01-20 19:27:13 +01:00
David Yip 3cae362214
Merge new onboarding styles; delete refs to PNGs. 2018-01-20 11:23:06 -06:00
David Yip 38f6d8130d
Eliminate stray conflict markers. 2018-01-20 10:46:43 -06:00
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/styles/mastodon/components.scss
 2018-01-20 10:45:43 -06:00
Eugen Rochko 0b7a0d15c7
Bump version to 2.2.0rc1 2018-01-20 16:27:19 +01:00
SerCom_KC 80b3ca0f6f Update Simplified Chinese translations (#6306) 
* i18n: (zh-CN) Add translations of #6251

* i18n: (zh-CN) Improve translations for #6291

* Fix en.json

* i18n: (zh-CN) Update translations for #6303

* i18n: (zh-CN) Add translations of #6273
with minor adjustment

* Minor fix

* Minor fix
 2018-01-21 00:11:21 +09:00
Eugen Rochko 45afdf1781
Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305) 2018-01-20 03:49:06 +01:00
Eugen Rochko 79b34a0fa2
Restore onboarding modal (#6303) 
* Restore onboarding modal
Revert 5ba8b3a396

* Change greeting elephant graphic, fix up some design issues

* Fix wrong link color in onboarding modal
 2018-01-20 01:32:37 +01:00
Eugen Rochko 872a0d5bd8
Improve HTML e-mails based on Litmus tests (#6301) 
* Use PNG images in HTML e-mails

* Make webpack use URLs with host so fonts load inside HTML e-mails

Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker

* Improve responsive design

* Add missing PNG icon
 2018-01-20 01:32:21 +01:00
Eugen Rochko 01421999ae
Make text e-mails consistent with HTML ones in UserMailer (#6291) 
* Make text e-mails consistent with HTML ones in UserMailer

* Fix UserMailer specs
 2018-01-20 01:32:05 +01:00
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
 2018-01-19 15:22:10 -06:00
David Yip b8c6656ce9
Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks 
Do not discard statuses obtained via websocket when API request finishes
 2018-01-19 15:17:20 -06:00
Thibaut Girka 1619efd735 Do not discard statuses obtained via websocket when API request finishes 
This backports 0b888acfd4
 2018-01-19 21:59:12 +01:00
ThibG 0b888acfd4 Do not throw away statuses obtained via websocket when API request finishes (#6302) 2018-01-19 21:48:00 +01:00
Yamagishi Kazutoshi 238de58e65 Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
Yamagishi Kazutoshi 7233ac07d2 Add support Ruby v2.5.0 (#6097) 2018-01-19 20:53:30 +01:00
ThibG b1e03197fa Process mentions and reblogs even from resolved threads (#6299) 
This may lead to out-of-order notifications, but this is better than not having
notifications at all.
 2018-01-19 19:11:35 +01:00
Pierre Ozoux 7be53a10b0 Fix "tzinfo-data is not present" docker error (#6300) 
when starting the container.
 2018-01-19 19:11:19 +01:00
ThibG a0de3222dd Retry delivering toots over ActivityPub for about 2 days (#6298) 
Currently, Mastodon will retry delivering toots for a bit over 1 hour.
This is a very short timespan when considering private and direct toots, which
cannot be seen by the recipient at all after the delivery attempts have failed.

Ideally, private and direct toots should have a different number of retries,
but I do not know how to do that.
 2018-01-19 15:49:48 +01:00
Eugen Rochko 540b3f37ae
Replace drawer elephant graphic with a vector image (#6286) 
* Replace drawer elephant graphic with a vector image

* Replace wave graphic with SVG

* Remove unused elephant graphic
 2018-01-19 15:25:27 +01:00
Marcin Mikołajczak 852b48295f i18n: Update Polish translation (#6297) 2018-01-19 21:49:25 +09:00
Thibaut Girka 1287b2782b Display a warning when composing unlisted toots with something looking like a hashtag 
This is a backport of b6af88192f to the glitch flavour.
 2018-01-19 12:59:33 +01:00
David Yip 2b2de41bc7
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-01-18 23:40:37 -06:00
David Yip 26ecee79bf
Merge pull request #332 from glitch-soc/merge-upstream 
Merge in home feed regeneration changes from upstream
 2018-01-18 22:00:11 -06:00
David Yip ae369bceb3
Merge pull request #333 from glitch-soc/win95-update 
Update win95 theme from cybrespace/mastodon
 2018-01-18 13:35:24 -06:00
Eugen Rochko 9b3b40df66
Fix regeneration marker not expiring (#6290) 
* Fix regeneration key not getting expired

* Add rake task to remove old regeneration markers
 2018-01-18 20:29:56 +01:00
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273) 
* Remove onboarding modal

* Welcome e-mail

* Send welcome e-mail after confirmation

* Remove obsolete translations
 2018-01-18 19:17:25 +01:00
David Yip 766d6aac44
Strip trailing whitespace on win95.scss 2018-01-18 10:54:50 -06:00
David Yip d3f64812a6
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update 
Conflicts:
	app/javascript/styles/win95.scss
	config/themes.yml
 2018-01-18 10:54:12 -06:00
David Yip 3896cd5d79
Use absolute paths for new working/not-found SVGs 
This allows these component styles to be used in i.e. the win95 skin.
 2018-01-18 10:25:54 -06:00
David Yip bcd86404da
Port 7badad7797 to glitch frontend 2018-01-18 10:25:37 -06:00
David Yip 1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-18 09:17:58 -06:00
David Yip e27eedbd08
Merge branch 'gs-master' into merge-upstream 2018-01-18 09:14:28 -06:00
David Yip 708ec07e27
Style fixes to make eslint happier, hopefully 2018-01-18 09:13:07 -06:00