glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Claire	69737b703a	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.	4 years ago
Eugen Rochko	cf699f7bf9	Add pull request title recommendations to CONTRIBUTING.md (#16247 )	4 years ago
Claire	b81710c02c	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.	4 years ago
Joe	4f05a43f8f	Fix link to documentation repo (#15620 )	4 years ago
Thibaut Girka	ff67385cfb	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code	5 years ago
sclaire-1	df15a2cd37	Edit CONTRIBUTING.md (#12401 ) Edited to improve clarity, concision, and assertiveness	5 years ago
Thibaut Girka	0ae7d84273	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `package.json`	5 years ago
Scott Sweeny	1018097c40	Fix crowdin badge display in CONTRIBUTING.md (#12273 ) * Fix crowdin badge display in CONTRIBUTING.md The Crowdin localization badge in `CONTRIBUTING.md` appeared to have the wrong markup around it. This manifested in some extra brackets and an unformatted `crowdin` string. * Make Crowdin badge a link to the Mastodon project	5 years ago
Thibaut Girka	5717f75340	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Yusuke Nakamura	0828126784	Update translating platform has changed to crowdin (CONTRIBUTING.md) (#11094 ) Restore and change from `89096860`	6 years ago
Thibaut Girka	f509815379	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Yusuke Nakamura	2c12620adb	Remove 'Weblate' from CONTRIBUTING.md (#10778 ) The mastodon project no longer used weblate to translate UI sentences. (ref #10385)	6 years ago
Thibaut Girka	42713b9710	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md: kept our version	6 years ago
Eugen Rochko	d4300c3b98	Add note that contributors may request reimbursement through OpenCollective (#9933 )	6 years ago
Thibaut Girka	dcded13a99	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	6 years ago
Eugen Rochko	890968603b	Update CONTRIBUTING.md (#9014 ) * Update CONTRIBUTING.md * Update CONTRIBUTING.md * Update CONTRIBUTING.md * Update CONTRIBUTING.md	6 years ago
David Yip	b316d373ea	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: CONTRIBUTING.md	7 years ago
Marcin Mikołajczak	d181aad033	Improve “how to translate” (#7358 )	7 years ago
Yamagishi Kazutoshi	00ff8dc00a	Add translate guide to CONTRIBUTING.md (#7355 )	7 years ago
Gô Shoemake	51e3ac2534	Added link to docs website	7 years ago
kibigo!	2e0645c26c	Updated readme and contrib docs	7 years ago
Matt Jankowski	fc122e9d78	README tidy up (#2026 ) * Remove docker guide and put it in docs repo * Move tasks to docs repo * Move requirements to contributing doc * Move advice about tagged releases to docs repo * Move local domain and host config to docs repo * Link to related tech	8 years ago
Matt Jankowski	a67909ec1e	Rubocop instructions (#1973 ) * Rubocop link for Sublime Text * Fix rubocop links * Link to gh issues page from contributing doc	8 years ago
Shel R	9e63bf446e	Request documentation (#1616 ) This addition to the submission guidelines requests that contributors remember to document their code. It's not a hard fast rule just a reminder.	8 years ago
Neville Park	54c796c8df	Corrected spelling mistake	8 years ago
Eugen Rochko	8c7277acd4	Add link to contribution guidelines to README	8 years ago
Eugen Rochko	50f3a81f63	Added contribution guidelines	8 years ago

27 Commits (0c2eb949fc21ceecbd99a81e5ffe75517a1e64df)