metu.life

Commit Graph

Author	SHA1	Message	Date
beatrix	5a4de1cf0f	Merge pull request #349 from codl/patch-1 remove escapes from server-side ɣaml handler	7 years ago
codl	9abb5becf4	remove escapes from server-side γaml handler this matches a change that was made in the client-side equivalent	7 years ago
David Yip	c53d7196e6	Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-code Remove some leftover code	7 years ago
Thibaut Girka	2107891edb	Remove some leftover code, I guess	7 years ago
David Yip	a90d0419d9	Merge pull request #343 from glitch-soc/merge-upstream-20180121 Merge upstream	7 years ago
David Yip	48d79007f6	Merge remote-tracking branch 'origin/master' into merge-upstream-20180121	7 years ago
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.	7 years ago
Norayr Chilingarian	48cd6dc6ca	armenian translations initial commit (#6320 ) * adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces	7 years ago
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	7 years ago
codl	cfd2b06821	fix filter search index being too strict when looking for line breaks (#6318 )	7 years ago
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.	7 years ago
Aboobacker MK	112b1fa265	Redirect to 2FA creation page when otp_secret is not available (#6314 )	7 years ago
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.	7 years ago
Eugen Rochko	1287de1b83	Fix invalid value passed to full_asset_url in mailers (#6312 )	7 years ago
David Yip	2c578a01d8	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
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	7 years ago
David Yip	24b6e4121f	Merge pull request #342 from glitch-soc/merge-upstream Merge upstream	7 years ago
Iijima Yasushi	72f9eab3d6	Change mailer avatar url (#6309 ) * Change mailer avatar url * Use full_asset_url method	7 years ago
David Yip	3cae362214	Merge new onboarding styles; delete refs to PNGs.	7 years ago
David Yip	38f6d8130d	Eliminate stray conflict markers.	7 years ago
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	0b7a0d15c7	Bump version to 2.2.0rc1	7 years ago
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	7 years ago
Eugen Rochko	45afdf1781	Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305 )	7 years ago
Eugen Rochko	79b34a0fa2	Restore onboarding modal (#6303 ) * Restore onboarding modal Revert 5ba8b3a396895ecec083c5258aaf9084d584a7c4 * Change greeting elephant graphic, fix up some design issues * Fix wrong link color in onboarding modal	7 years ago
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	7 years ago
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	7 years ago
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	7 years ago
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	7 years ago
Thibaut Girka	1619efd735	Do not discard statuses obtained via websocket when API request finishes This backports `0b888acfd4`	7 years ago
ThibG	0b888acfd4	Do not throw away statuses obtained via websocket when API request finishes (#6302 )	7 years ago
Yamagishi Kazutoshi	238de58e65	Change belongs_to_required_by_default to true (#5888 )	7 years ago
Yamagishi Kazutoshi	7233ac07d2	Add support Ruby v2.5.0 (#6097 )	7 years ago
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.	7 years ago
Pierre Ozoux	7be53a10b0	Fix "tzinfo-data is not present" docker error (#6300 ) when starting the container.	7 years ago
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.	7 years ago
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	7 years ago
Marcin Mikołajczak	852b48295f	i18n: Update Polish translation (#6297 )	7 years ago
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.	7 years ago
David Yip	2b2de41bc7	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	7 years ago
David Yip	26ecee79bf	Merge pull request #332 from glitch-soc/merge-upstream Merge in home feed regeneration changes from upstream	7 years ago
David Yip	ae369bceb3	Merge pull request #333 from glitch-soc/win95-update Update win95 theme from cybrespace/mastodon	7 years ago
Eugen Rochko	9b3b40df66	Fix regeneration marker not expiring (#6290 ) * Fix regeneration key not getting expired * Add rake task to remove old regeneration markers	7 years ago
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	7 years ago
David Yip	766d6aac44	Strip trailing whitespace on win95.scss	7 years ago
David Yip	d3f64812a6	Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update Conflicts: app/javascript/styles/win95.scss config/themes.yml	7 years ago
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.	7 years ago
David Yip	bcd86404da	Port `7badad7797` to glitch frontend	7 years ago
David Yip	1964a0f941	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
David Yip	e27eedbd08	Merge branch 'gs-master' into merge-upstream	7 years ago

1 2 3 4 5 ...

5656 Commits (5a4de1cf0f94903307c4808b002b6a2d5187646b) All Branches Search

5656 Commits (5a4de1cf0f94903307c4808b002b6a2d5187646b)

All Branches