0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

63 Commits

Author SHA1 Message Date
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Zlatan Vasović
f6e7fc9309 Add Slack link to CONTRIBUTING.md 2015-06-05 11:35:13 +02:00
Kevin Kirsche
69af7fe1b2 Include Slack in list of places to get help
As Slack is a common replacement for IRC for projects (e.g. Wordpress), I propose that we encourage the use of Slack as you have members of the core team using it while IRC often does not have any of the core team available.
2015-06-02 21:51:45 -04:00
XhmikosR
315907c97c Use https when possible. 2015-05-17 12:43:20 +03:00
Yuan Yiyang
b6723cf0eb fix dead link: reduced text cases 2015-04-03 22:01:23 +08:00
Mark Otto
c16fee5efd Merge branch 'master' into v4
Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/breadcrumbs.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
dante2008
df2ea49c0a Fix a typo in contributing doc. 2015-02-22 13:59:15 +09:00
Mark Otto
325748ff68 Merge branch 'master' into v4
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
Chris Rebert
16089d92de Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs
[ci skip]
2015-01-15 11:25:05 -08:00
Chris Rebert
f24a1cb28d remove remaining remnants of the Customizer 2014-12-17 13:44:52 -08:00
Mark Otto
01fa32e879 Merge pull request #15167 from vsn4ik/rem_blob_master_from_links
Remove redundant .../blob/master/ prefix in markdown.
2014-11-29 14:25:12 -08:00
vsn4ik
992644ee34 Update links (.../blob/master prefix) in markdown. 2014-11-23 14:50:09 +03:00
Chris Rebert
8a4757dfb0 add documenting in MDN as a step in browser bug handling process
[skip sauce]
[skip validator]
2014-11-22 18:33:08 -08:00
Chris Rebert
7711c9d60d Document Savage cross-browser JS pull request tester bot
Refs #12352, which is now implemented & deployed.
More info: https://github.com/twbs/savage

[skip sauce]
2014-11-20 10:59:16 -08:00
Chris Rebert
cab74e3238 fix typo in CONTRIBUTING.md 2014-11-20 09:49:10 -08:00
Mark Otto
647d30aa04 move to the contributing guidelines 2014-11-11 19:25:54 -08:00
Chris Rebert
7c0f873659 Cover common contributor mistakes in CONTRIBUTING.md
Based on https://github.com/twbs/rorschach/tree/master/docs
2014-10-31 17:33:20 -07:00
Chris Rebert
5f3a980950 Explain issue/PR bots in CONTRIBUTING.md
[skip sauce]
[skip validator]
2014-10-30 17:06:54 -07:00
Chris Rebert
00b381ed9b Add browser bug reporting links to CONTRIBUTING docs; refs #13974 2014-10-03 15:16:46 -07:00
Chris Rebert
a28e5a3024 Mention HTML5 validator and Bootlint as part of troubleshooting steps
Fixes https://github.com/twbs/bootlint/issues/67
2014-09-23 17:14:13 -07:00
Chris Rebert
1e6849dd58 clean whitespace
Thanks to @collinanderson
Closes #14567
2014-09-08 13:35:07 -07:00
Heinrich Fenkart
95592e81a3 Update JS Bin template in CONTRIBUTING.md
Refs: #14109
2014-07-13 01:02:46 +02:00
Mark Otto
5850f637ab code guide, fixes #14126 2014-07-12 15:36:08 -07:00
Bas Bosman
cb7eb674ac Add autoprefixer 2014-03-07 09:01:54 +01:00
Zlatan Vasović
ba4206b644 Use different coding style for Gruntfile
Fixes #12657
2014-02-10 11:15:08 -08:00
Chris Rebert
cd8a896ce6 Merge pull request #12554 from ZDroid/grunt-test-note
Add `grunt test` note
2014-02-04 13:21:45 -08:00
Zlatan Vasović
0ed6075010 Add grunt test note 2014-02-04 22:06:15 +01:00
Mark Otto
95494f806d Merge pull request #12521 from twbs/outline-none-note
add note to CONTRIBUTING.md about `outline: none`
2014-02-04 01:49:29 -08:00
Zlatan Vasović
0ef0c7b2c0 Remove comma first rule
Removes outdated coding style rule.
2014-02-03 17:12:59 +01:00
Chris Rebert
f234496239 add note to CONTRIBUTING.md about outline: none 2014-02-01 23:19:28 -08:00
Mark Otto
829eefd6f7 Merge pull request #12356 from twbs/wcag-contributing
add WCAG color guideline to CONTRIBUTING.md
2014-01-23 20:55:39 -08:00
Mark Otto
bd6751e932 Merge pull request #12355 from twbs/aria-contributing
add WAI-ARIA guideline to CONTRIBUTING.md
2014-01-23 20:53:33 -08:00
Chris Rebert
aa8b1543be add WCAG color guideline to CONTRIBUTING.md 2014-01-23 14:01:59 -08:00
Chris Rebert
2f26eaea5b add WAI-ARIA guideline to CONTRIBUTING.md 2014-01-23 12:50:57 -08:00
Chris Rebert
7d015817ed fix typo and use the v3-specific StackOverflow tag 2014-01-23 11:18:56 -08:00
Waynn Lue
cba9d81340 use periods for consistency in each line 2014-01-09 12:22:31 -08:00
Zlatan Vasović
ec594887fe Drop redundant 'the' 2014-01-07 22:40:23 +01:00
Joel Kuzmarski
3661c4b8ff Improve wording in CONTRIBUTING.md
Parts of the "Pull requests" section are strangely worded.

This commit fixes that.
2014-01-07 02:11:07 -06:00
Joel Kuzmarski
483974695c Fix bad anchor link in CONTRIBUTING.md
Hey look, I'm contributing to CONTRIBUTING.md!

This anchor must have been overlooked while updating the docs in a previous commit. Expected behavior: scroll the document to a linked section. Experienced behavior: nada.

This proposed file change renames the anchor text from `coding conventions` to `coding guidelines` and changes the anchor link from `#code-conventions` to `#code-guidelines`.
2014-01-07 01:45:33 -06:00
soundarapandian
8b564f9e32 Use correct directory name for bootstrap contribution 2013-12-24 16:05:19 +05:30
tomByrer
c84688fc4f https://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824 2013-12-21 09:39:34 -07:00
Mark Otto
b59b37bc2c Fixes #11918: Fork the @h5bp contributing guidelines and combine with our coding guidelines 2013-12-18 17:34:30 -08:00
Chris Rebert
5428523a37 cleanup licensing section more 2013-12-18 15:16:29 -08:00
Mark Otto
cb40a2ee8c Punt Apache license information and stick with MIT 2013-12-18 14:54:24 -08:00
Mark Otto
540677c42a Fixes #11795: Update the contributing guidelines to include some more CSS guidelines 2013-12-15 13:39:45 -08:00
Chris Rebert
f8e0f16663 fix broken link in CONTRIBUTING.md 2013-12-03 22:08:26 -08:00
Mark Otto
95487f75d1 Merge pull request #11329 from ZDroid/patch-1
Add 'in' to complete thought
2013-11-30 00:40:32 -08:00
Zlatan Vasović
8f589c6cfd Add 'in' to complete thought
Simple grammar fix.
2013-11-19 13:29:19 +01:00
Chris Rebert
ce0d008bc3 add release checklist to CONTRIBUTING file; fixes #11290 2013-11-10 17:16:21 -08:00
Chris Rebert
25b7a5200d fix #11144 2013-10-17 11:21:06 -07:00