Gina Häußge
50965d69ce
Include info about setting up dev env in CONTRIBUTING.md
2017-01-10 19:00:58 +01:00
Gina Häußge
aca3dfae49
Merge branch 'maintenance' into devel
...
# Conflicts:
# CHANGELOG.md
2016-09-23 14:35:31 +02:00
Gina Häußge
354042b84d
Preparing release of 1.2.16
2016-09-23 09:51:45 +02:00
Gina Häußge
b6fbbb353a
Merge branch 'maintenance' into devel
...
# Conflicts:
# CHANGELOG.md
# src/octoprint/filemanager/storage.py
# src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2
2016-09-09 12:31:29 +02:00
Gina Häußge
079430e3c8
Preparing release of 1.2.16rc1
2016-09-09 11:52:56 +02:00
Gina Häußge
efca776102
Merge branch 'maintenance' into devel
...
Conflicts:
src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2
src/octoprint/plugins/softwareupdate/updaters/update_script.py
2016-08-26 14:24:13 +02:00
Gina Häußge
b5bc03e711
First throw at release channels
...
We start out with master (Stable), rc/maintenance (Maintenance) and rc/devel (Devel)
2016-08-25 09:41:12 +02:00
Gina Häußge
de78c14ae3
Merge branch 'maintenance' into devel
...
Conflicts:
CHANGELOG.md
src/octoprint/static/js/app/dataupdater.js
src/octoprint/static/js/app/main.js
src/octoprint/static/js/app/viewmodels/files.js
src/octoprint/static/js/app/viewmodels/loginstate.js
2016-06-09 12:56:07 +02:00
Gina Häußge
885b48911e
Preparing release of 1.2.12 (part two)
...
Another update of the CHANGELOG after fixing a bug. Shifted release date
to tomorrow to leave more time for final tests that was now eaten up by the
last minute bug fix.
Also updated CONTRIBUTING file to explain new prerelease branch.
2016-06-08 16:48:39 +02:00
Gina Häußge
7bdc4418fd
Merge branch 'maintenance' into devel
...
Conflicts:
CHANGELOG.md
docs/configuration/config_yaml.rst
src/octoprint/plugins/virtual_printer/virtual.py
src/octoprint/server/__init__.py
src/octoprint/settings.py
src/octoprint/static/js/app/dataupdater.js
src/octoprint/static/js/app/viewmodels/settings.js
src/octoprint/templates/dialogs/settings/serialconnection.jinja2
src/octoprint/util/comm.py
2016-03-16 11:24:52 +01:00
Gina Häußge
4a933228c7
Added PR and issue templates, updated CONTRIBUTING.md
2016-03-14 11:43:15 +01:00
Gina Häußge
632724a023
Updated CONTRIBUTING.md
...
* Don't add red herrings to tickets
* Provide all information when actually experiencing the same
symptoms as an existing ticket
2016-02-16 08:42:05 +01:00
Gina Häußge
cb687f01f7
Merge branch 'maintenance' into devel
...
Conflicts:
src/octoprint/static/js/app/viewmodels/files.js
src/octoprint/util/pip.py
2016-02-15 10:01:02 +01:00
Gina Häußge
fe134e7986
Added back the "test without plugins" clause to the bug reporting guide
2016-02-12 12:10:19 +01:00
Gina Häußge
e28ca60f21
Merge branch 'maintenance' into devel
...
Conflicts:
CHANGELOG.md
2016-02-10 16:46:56 +01:00
Gina Häußge
92c65cb21c
Added info about branches and versioning to contribution guide
2016-02-10 11:09:31 +01:00
Gina Häußge
9066c54d8d
Fixed a typo, fixed a wrongly fixed typo
2016-01-29 09:09:04 +01:00
Gina Häußge
780794c466
Merge branch 'development' of https://github.com/bwgan/OctoPrint into pr/bwgan/development
...
Conflicts:
src/octoprint/daemon.py
2016-01-29 09:04:58 +01:00
bwgan
f8c0df4e78
Typo and spelling fixes
...
Fixes various spelling issues and typos.
2016-01-28 18:59:38 +00:00
Gina Häußge
c720cc3a4a
Added note to not misuse (feature) requests for support questions
2016-01-21 10:58:00 +01:00
Gina Häußge
b8283b2499
And of course now I spotted another left-over...
2015-12-01 10:29:11 +01:00
Gina Häußge
da0f1fa3c8
Some more small changes and updated the flow chart
2015-12-01 10:22:23 +01:00
Gina Häußge
0d18ca421b
Typos are my nemesis
2015-11-30 19:46:28 +01:00
Gina Häußge
48dd2657e9
Some more rewording and fixing of typos
2015-11-30 19:40:31 +01:00
Gina Häußge
62f2d11f8b
Major overhaul of CONTRIBUTING.md
...
Now includes all bug reporting related information
as well plus a little flow chart regarding ticket creation.
Also reworded large sections.
2015-11-30 19:31:33 +01:00
Gina Häußge
db866d2310
Finally added a proper AUTHORS file
...
Also adjusted contribution guidelines to ask people to include themselves when filing
a PR.
(cherry picked from commit 1b594b2
2015-07-15 10:35:38 +02:00
Gina Häußge
f32c977381
Update CONTRIBUTING.md
2015-01-27 09:53:09 +01:00
Gina Häußge
2de863c5db
Update CONTRIBUTING.md
2015-01-23 12:50:34 +01:00
Gina Häußge
09e5676009
Update CONTRIBUTING.md
2015-01-23 12:30:02 +01:00
Gina Häußge
2d76aa029a
Updated contribution guidelines
...
We sadly still need to be more clear that tickets need to adhere to certain standards to be manageable...
2014-10-17 13:04:35 +02:00
Gina Häußge
48dc27e106
Update CONTRIBUTING.md
2014-08-01 14:23:11 +02:00
Gina Häußge
32a38af4f7
Update CONTRIBUTING.md
2014-07-27 16:18:30 +02:00
Gina Häußge
887ec45b6b
Create CONTRIBUTING.md
2014-05-19 22:48:41 +02:00
