6681 Commits (dc67caa371cc0237367469e8f14e56e9e57cdaf8)

 

All Branches   

Search

Author	SHA1	Message	Date
Thibaut Girka	dc67caa371	Port upstream's result section headers (fixes #366)	7 years ago
ThibG	fecc496e34	Merge pull request #508 from ThibG/glitch-soc/fixes/remove-leftover-from-attachment-url-insertion ... Fix caret position after inserting suggestions	7 years ago
Thibaut Girka	f9a8240394	Fix caret position after inserting suggestions (fixes #281)	7 years ago
Thibaut Girka	2e017e752f	Remove unneeded code now that attachment URL isn't appended to toots	7 years ago
ThibG	162abbe9a7	Merge pull request #514 from ThibG/glitch-soc/fixes/fix-hardcoded-fav ... [Glitch] Use .star-icon instead of hardcoding color in detailed statuses	7 years ago
ThibG	2e58fed4c6	Merge pull request #518 from ThibG/glitch-soc/merge-master ... Merge upstream changes	7 years ago
Thibaut Girka	4cb367e6d4	Merge branch 'master' into glitch-soc/merge-master ... Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss	7 years ago
Isatis	a1db299d79	Remove Puma pidfile before boot if container receives SIGTERM (#7052)	7 years ago
Akihiko Odaki	4e718bbb25	Introduce flat layout to contexts reducer (#7150) ... This allows to filter out replies in threads even if contexts of those replies are not fetched.	7 years ago
Yamagishi Kazutoshi	590ae5ac66	Enable media timeline (#7598)	7 years ago
Lynx Kotoura	499af41a9d	More polished light theme (#7620) ... * Revert "Remove pointer to light theme until it is more polished (#7594)" This reverts commit ab94772b5c. * True up the hierarchical structure of mastodon-light theme * Fix mastodon-light theme	7 years ago
Lynx Kotoura	f78eee8d6a	Fix color of /about/more link anchors (#7618)	7 years ago
ThibG	d99f5bf6b5	Merge pull request #517 from ThibG/glitch-soc/fixes/max_toot_chars ... Add missing comma in InitalStateSerializer (fixes #516)	7 years ago
Jeroen	daff01a5a5	Added the law requirements for the EU/EEA (#7605) ... * Added the law requirements for the EU/EEA See article 8 of the GDPR * fix * i18n-tasks normalize	7 years ago
ThibG	d1b2466320	Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)	7 years ago
Thibaut Girka	5d64e6a618	Add missing comma in InitalStateSerializer (fixes #516)	7 years ago
Thibaut Girka	2b26e7ed5f	[Glitch] Use .star-icon instead of hardcoding color in detailed statuses ... Port 6d50785928 to glitch-soc	7 years ago
ThibG	6d50785928	Use .star-icon instead of hardcoding color in detailed statuses (fixes #7610) (#7613)	7 years ago
ThibG	67f74f71aa	Merge pull request #510 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	7 years ago
ThibG	e2697a3657	Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search ... [Glitch] Fetch relationships for search results in UI	7 years ago
ThibG	6b93ea6b27	Merge pull request #512 from ThibG/glitch-soc/fixes/fix-ckbox-color ... Change notification cleaning checkbox color (fixes #511)	7 years ago
Thibaut Girka	bdfce657fb	Change notification cleaning checkbox color (fixes #511)	7 years ago
Thibaut Girka	28ccf0a464	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	a4527fe33c	Fix caret position after selected suggestion and media upload (#7595) ... * Fix media upload reseting caret position to last inserted emoji * Fix caret position after inserting suggestions (fixes #6089)	7 years ago
Yamagishi Kazutoshi	c0b945b77e	Fix tests for invites controller (regression from 32c3fc08fe) (#7597)	7 years ago
Eugen Rochko	32c3fc08fe	Yeah, it was supposed to be #create?	7 years ago
Eugen Rochko	8205147d04	Bump version to 2.4.0	7 years ago
Eugen Rochko	ab94772b5c	Remove pointer to light theme until it is more polished (#7594)	7 years ago
ThibG	0f523757f2	Remove unneeded code now that attachment URL isn't appended to toots (#7593)	7 years ago
Eugen Rochko	2d34552fbc	Do not encode HTML entities in initial Web Push payload body (#7592)	7 years ago
SerCom_KC	82da8b7ec6	[WIP] i18n: Update Simplified Chinese translations (#7576) ... * i18n: (zh-CN) #7027 * Rewording This placeholder is also seen on single user page at Moderation > Accounts, where "this report" doesn't make sense. * i18n: (zh-CN) #6425 * i18n: (zh-CN) #6497 * i18n: (zh-CN) #6246 * i18n: (zh-CN) Improvements	7 years ago
Shuhei Kitagawa	0a5527319a	Add tests for report notes controller (#7589)	7 years ago
Eugen Rochko	fd007264dc	Enforce order on authorized applications page (#7587) ... Fix #7586	7 years ago
Yamagishi Kazutoshi	ff98de966f	Hide section headline for timelines in production (#7590) ... * Hide section headline for timelines in production * comment out	7 years ago
Yamagishi Kazutoshi	f5421e5309	Change column params on pinned timeline (#7581)	7 years ago
bsky	818fa6fc80	Remove outline (#7582)	7 years ago
Thibaut Girka	cdb1d08119	[Glitch] Fetch relationships for search results in UI ... Port webui changes from 750f3e64c9 to glitch-soc	7 years ago
Evgeny Petrov	96040c54f5	[RU] Added mastodon-light string (#7583)	7 years ago
ThibG	4749fe5019	Merge pull request #503 from glitch-soc/merge-upstream ... Merge upstream	7 years ago
David Yip	647f58f92a	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: config/locales/pl.yml The conflict in config/locales/pl.yml concerns the themes key, which is not used in glitchsoc. Resolution: remove the themes key-related changes, i.e. accept-ours.	7 years ago
Marcin Mikołajczak	9b1b968262	🌍: 🇵🇱⬆️ (#7580) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Jenkins	8f74ec1286	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
ThibG	f6d0f955bf	Merge pull request #495 from ThibG/glitch-soc/fixes/port-upstream-fixes ... Port various WebUI fixes from upstream	7 years ago
Thibaut Girka	3315877afe	Fix width only being set for standalone media	7 years ago
Thibaut Girka	df3fa2cb78	[Glitch] Use real container width in MediaGallery srcSet ... Port 765a8dad9a to glitch-soc	7 years ago
Thibaut Girka	4e5afb1c41	[Glitch] Do not override the default push notification settings ... Port 6bee19117f to glitch-soc	7 years ago
ThibG	abc2e46848	Merge pull request #499 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	7 years ago
Eugen Rochko	20c650b644	Save onlyMedia prop when pinning column (#7575)	7 years ago
Eugen Rochko	f548332935	Display only domain of report account if remote under comment (#7574)	7 years ago
Thibaut Girka	72c454e2b3	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.	7 years ago