4488 Commits (f82e90bf11fd147c40f467a0d2eb0097d11898ac)

 

All Branches   

Search

Author	SHA1	Message	Date
Ondřej Hruška	f82e90bf11	workaround for notif clearing	7 years ago
beatrix	b1217242fc	Merge pull request #125 from glitch-soc/data-column ... Add data-column="..." to all columns	7 years ago
beatrix	5dec67d964	Merge pull request #159 from glitch-soc/closed-instance-landing-page-login-form ... add login form to landing page if regs are closed	7 years ago
Ondřej Hruška	ce3e0faf4d	add login form to landing page if regs are closed	7 years ago
beatrix	c027a7bd4d	Merge pull request #157 from glitch-soc/merging-upstream ... ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!	7 years ago
kibigo!	53f829dfa8	HAML fix	7 years ago
kibigo!	cf1f83ca2a	Fixed lingering upstream Theme code	7 years ago
kibigo!	1522795853	new HAML for statuses	7 years ago
Ondřej Hruška	e9f9e3cc89	unbreak onboarding modal	7 years ago
Ondřej Hruška	cf24ce7e03	remove wrong emojify usage in old glitch components	7 years ago
Ondřej Hruška	74e4fc8f8a	fix custom emoji not shown in statuses	7 years ago
Ondřej Hruška	9a5418942c	fix some js errors due to number->string change of status ID	7 years ago
Ondřej Hruška	daad07b1d5	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	7 years ago
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	7 years ago
Ondřej Hruška	fcf0d2078e	Skip-merge commit '0401a24558294b6941c30c922af3f2063dfd305e' into merging-upstream	7 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	7 years ago
Ondřej Hruška	06e299cef5	Revert "autoscroll emoji suggestions box" ... This reverts commit c89cce0219.	7 years ago
Ondřej Hruška	8a24ad5828	Revert "Merge pull request #149 from glitch-soc/mojon-suggest" ... This reverts commit fa3587645d, reversing changes made to 15c9c2fd7e.	7 years ago
Yamagishi Kazutoshi	b9f59ebcc6	Update Yarn to version 1.1.0 (#5125) ... * Update Yarn to version 1.1.0 * remove hard-coding	7 years ago
Eugen Rochko	e648ef0bfb	Remove web UI warnings about OStatus privacy (#5102) ... * Remove web UI warnings about OStatus privacy * yarn run manage:translations	7 years ago
Eugen Rochko	db3ed498b0	When OAuth password verification fails, return 401 instead of redirect (#5111) ... Call to warden.authenticate! in resource_owner_from_credentials would make the request redirect to sign-in path, which is a bad response for apps. Now bad credentials just return nil, which leads to HTTP 401 from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into this way.	7 years ago
Yamagishi Kazutoshi	901fc48aae	Upgrade Webpacker to version 3.0.1 (#5122)	7 years ago
Eugen Rochko	3caf0ba923	Fix empty query sent to postgres for custom emojis (#5121)	7 years ago
Eugen Rochko	6e83b5e719	Update brakeman to 3.0 and bundler-audit to 0.6 (#5117)	7 years ago
nullkal	b32a1d5754	Refactor 500 file generation for future extension (#5105)	7 years ago
m4sk1n	9d53a38a44	i18n: Update Polish translation (#5106) ... * i18n: Update Polish translation * i18n: Update Polish translation	7 years ago
kibigo!	f7ca205f38	Fixed webpack config code	7 years ago
kibigo!	86e617a839	Better themeing support!!	7 years ago
Eugen Rochko	e528114c53	Follow-up to #4582 and #5027, removing dead code (#5101)	7 years ago
Eugen Rochko	cf7fbf2c56	Fix #5059 - Stop processing payload if it's from local account (#5100)	7 years ago
Eugen Rochko	91e5b0dfdb	Send streaming API delete to people mentioned in status (#5103) ... - Previously they wouldn't receive it unless they were author's followers - Skip unpush from public/hashtag timelines if status wasn't public in the first place	7 years ago
Eugen Rochko	3b60832214	New error page graphic. Other error page improvements (#5099) ... - 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault	7 years ago
Lynx Kotoura	259181c41a	Fix size of single media in media-gallery (#5098)	7 years ago
Eugen Rochko	510df0ac55	Fix emojify() by generating a mapping to existing Twemoji files (#5080) ... A new rake task emojis:generate downloads a full list of valid unicode sequences from unicode.org and checks it against existing Twemoji files, finally generating a map from each sequence to the existing file (e.g. when there's multiple ways an emoji can be expressed). The map is dumped into app/javascript/mastodon/emoji_map.json That file is loaded by emojione_light.js (now a misnomer) which decorates it further with shortcodes taken from emoji-mart's index.	7 years ago
Akihiko Odaki	98936bfcdf	Add missing validations in ActivityPub::Activity::Create (#5096)	7 years ago
unarist	5c82c2b75f	Increase max height of preview card image (#5092) ... We added horizontal layout to preview card for wide image. However, max height of the thumbnail is still limited to 120px and it makes nearly square images to too small for that layout. This PR increases max height as well as max width.	7 years ago
Yamagishi Kazutoshi	0fea700c7b	Refresh manifest before generate 500.html (#5090)	7 years ago
Eugen Rochko	2c8e3fbbfb	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	7 years ago
Eugen Rochko	b982d549f4	Add strong_migrations gem to warn when creating unsafe migrations (#5078)	7 years ago
Eugen Rochko	909a6d4661	Fix streaming API double-JSON-encoding status IDs for deletes (#5069)	7 years ago
JeanGauthier	3f3de38075	OC update: different emoji picker (#5046) (#5077)	7 years ago
ThibG	c267acfcf7	Thread toot notification mails by conversation (#5061) ... * Thread toot notification mails by conversation * Make codeclimate happy and avoid potential mis-threading	7 years ago
Daigo 3 Dango	ab625c57ce	Compact status_ids in StatusRelationshipsPresenter (#5073)	7 years ago
abcang	e756c4f5ec	Fix media spoiler of DetailedStatus (#5071)	7 years ago
Daigo 3 Dango	a0bbeafb04	Suppress backtrace when failed to communicate with a remote instance (#5076)	7 years ago
Eugen Rochko	2f079573ed	In detail status view, display attachment uncropped if there's only one (#5054) ... * In detail status view, display attachment uncropped if there's only one * Make media spoiler the size of the media it hides, enable on static	7 years ago
Eugen Rochko	b2820c3913	Forgotten in #5039, change statuses_tags tag_id to bigint (#5070)	7 years ago
Eugen Rochko	adc38078dd	Make sure nil IDs to not get cast to empty string in REST API (#5068)	7 years ago
Eugen Rochko	dae0af1fd2	Change mobile layout breakpoint from 1024px to 630px (#5063) ... 630px = Drawer + 1 Column	7 years ago
Eugen Rochko	5b8d0ad71b	Dropdown triangles a bit nicer, smoother scrolling on touch (#5062)	7 years ago