Commit graph

156 commits

Author SHA1 Message Date
Gina Häußge
5a5d29b1a9 Added some PRs to the Changelog 2016-05-19 18:30:33 +02:00
Gina Häußge
3322714a8a Merge branch 'maintenance' into devel
Conflicts:
	CHANGELOG.md
2016-05-09 10:29:20 +02:00
Gina Häußge
e79703ba6e Preparing release of 1.2.11 2016-05-04 13:36:06 +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
692166f067 Preparing release of 1.2.10 2016-03-16 09:38:58 +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
abe68adac8 Preparing release of 1.2.9 2016-02-10 14:47:18 +01:00
Gina Häußge
8d226dfbaa Merge branch 'maintenance' into devel
Conflicts:
	AUTHORS.md
	CHANGELOG.md
	src/octoprint/static/css/octoprint.css
2015-12-07 15:00:27 +01:00
Gina Häußge
dedadbc9ac Added another little fix to the change log 2015-12-07 13:23:58 +01:00
Gina Häußge
ec42c45204 Explained a bit better how the update bug in 1.2.7 actually manifests 2015-12-07 12:56:54 +01:00
Gina Häußge
5e96bd8b6a Fix: "Server Offline" should always win against "Please reload"
Nothing to reload if the server is offline, so show the offline message above
the reload one.
2015-12-07 11:51:20 +01:00
Gina Häußge
56a51a3800 Let's try releasing 1.2.8 2015-12-07 10:19:57 +01:00
Gina Häußge
66b71199e4 Merge branch 'maintenance' into devel
Conflicts:
	CHANGELOG.md
	src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
2015-12-03 12:03:56 +01:00
Gina Häußge
9d6b6cf103 Going to release 1.2.8 after the weekend 2015-12-03 12:02:36 +01:00
Gina Häußge
1e9ea8e85e Updated Changelog again 2015-12-02 17:12:17 +01:00
Gina Häußge
42d288c0e2 Updatefix 1.2.7 plugin needs restart after all 2015-12-02 16:34:57 +01:00
Gina Häußge
935c1da30f Updated Changelog for 1.2.8 again
Now includes note about updatefix plugin and changelog
entry about fixed softwareupdate issue.
2015-12-02 14:06:49 +01:00
Gina Häußge
111cf2c140 Merge branch 'fix/commTimeoutOnSupressedScriptCommands' into devel
Conflicts:
	CHANGELOG.md
	src/octoprint/plugins/softwareupdate/__init__.py
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/util/comm.py
2015-12-02 11:16:59 +01:00
Gina Häußge
ee1f9029d1 Preparing release of version 1.2.8 2015-12-01 13:18:11 +01:00
Gina Häußge
fca7b2ebae Merge branch 'maintenance' into devel
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
2015-10-20 14:55:46 +02:00
Gina Häußge
6c622f7c43 Fixed indentation of change log 2015-10-20 12:24:23 +02:00
Gina Häußge
758062133c Updated changelog for 1.2.7 2015-10-20 11:55:34 +02:00
Gina Häußge
251ec9d823 Added changelog entry for #632 and adjusted Fan On 2015-10-08 09:26:34 +02:00
Gina Häußge
e9074e127e Added a couple of changelog entries 2015-10-02 18:13:40 +02:00
Mark Walker
d3abeed3a9 Update changelog for 42d754 fix for #1047 2015-09-07 17:19:16 -07:00
Gina Häußge
64bb1adf8c Added CHANGELOG entry for second temperature polling interval 2015-09-03 18:59:05 +02:00
Gina Häußge
540cf4f4d9 Merge branch 'maintenance' into devel
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
2015-09-02 20:19:29 +02:00
Gina Häußge
536bb31965 Forgot the commit link in the changelog 2015-09-02 19:59:49 +02:00
Gina Häußge
ef46a49430 Also included #1041 in 1.2.6 2015-09-02 19:55:24 +02:00
Gina Häußge
754ef428a0 Preparing release of 1.2.6 2015-09-02 19:49:49 +02:00
Gina Häußge
4f3e2d7f49 Merge branch 'maintenance' into devel
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
	src/octoprint/plugins/softwareupdate/__init__.py
	src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
	src/octoprint/plugins/softwareupdate/updaters/pip.py
	src/octoprint/plugins/softwareupdate/updaters/update_script.py
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/util/sockjs.py
	src/octoprint/server/views.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/helpers.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/dialogs/settings.jinja2
	src/octoprint/templates/dialogs/settings/features.jinja2
	src/octoprint/templates/dialogs/settings/server.jinja2
	src/octoprint/translations/de/LC_MESSAGES/messages.mo
	src/octoprint/translations/de/LC_MESSAGES/messages.po
	src/octoprint/util/comm.py
	translations/de/LC_MESSAGES/messages.mo
	translations/de/LC_MESSAGES/messages.po
	translations/messages.pot
2015-09-01 08:34:24 +02:00
Gina Häußge
96fc70bdb2 Preparing release of 1.2.5 2015-08-31 10:28:52 +02:00
Gina Häußge
b4bb54aca6 Changelog entry for implementation of #949 2015-08-27 13:14:27 +02:00
Gina Häußge
963d590728 Allow specifying additional baud rates 2015-08-12 13:39:12 +02:00
Gina Häußge
64fa330fc5 Update for 1.3.0 change log 2015-08-11 15:29:21 +02:00
Gina Häußge
795c2c87f5 Merge branch 'maintenance' into devel
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
	src/octoprint/plugins/pluginmanager/__init__.py
	src/octoprint/util/__init__.py
2015-07-23 12:22:02 +02:00
Gina Häußge
25de95dc93 Preparing release of 1.2.4 2015-07-23 09:54:27 +02:00
Gina Häußge
4ddef52fb2 Changelog entry for server command settings 2015-07-22 11:03:34 +02:00
Gina Häußge
1d3eecd7d0 Added changelog entry for CuraEngine 15.06 support 2015-07-17 13:56:45 +02:00
Gina Häußge
1c806eb618 Merge branch 'maintenance' into devel
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
2015-07-09 21:52:23 +02:00
Gina Häußge
abbf937e7f Preparing release of 1.2.3 2015-07-08 17:22:18 +02:00
Gina Häußge
6abd7e27ce Forgot a changelog entry earlier 2015-07-08 16:45:12 +02:00
Gina Häußge
22d12ac54c Allow hiding plugins from Plugin Manager 2015-07-07 15:33:26 +02:00
Gina Häußge
3441431cdf Do only allow machinecode files for selection/printing 2015-07-06 10:49:24 +02:00
Gina Häußge
08546f5730 Started change log for 1.3.0 2015-07-06 10:20:29 +02:00
Gina Häußge
1c6b0554c7 Preparing release of 1.2.2 2015-06-30 21:19:50 +02:00
Gina Häußge
9f8d30a66c Preparing release of 1.2.1 2015-06-30 08:42:16 +02:00
Gina Häußge
a5b87a9067 Updated changelog 2015-06-29 17:49:19 +02:00
Gina Häußge
401ebcf685 Fix: Cleanly exit on SIGTERM 2015-06-25 15:18:33 +02:00
Gina Häußge
cfa4cb2a7c Preparing 1.2.0 release (forgot another changelog update) 2015-06-25 10:18:00 +02:00