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
650e1971d4
Merge branch 'maintenance' into devel
...
# Conflicts:
# CHANGELOG.md
# src/octoprint/static/js/app/viewmodels/usersettings.js
2016-09-16 14:11:43 +02:00
Gina Häußge
26fb208f48
Preparing release of 1.2.16rc2
2016-09-16 12:54:48 +02:00
Gina Häußge
2fc86e095f
1.2.16rc1 was actually pushed out on 2016-09-09, not -08
2016-09-12 12:49:04 +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
039412183c
Merge branch 'maintenance' into devel
...
Conflicts:
CHANGELOG.md
2016-07-30 09:57:31 +02:00
Gina Häußge
afdb98a92f
Postponing the release of 1.2.15 until tomorrow
2016-07-29 21:50:45 +02:00
Gina Häußge
7b48270239
Preparing release of 1.2.15
2016-07-29 16:30:55 +02:00
Gina Häußge
aae01fe81b
Merge branch 'maintenance' into devel
...
Conflicts:
CHANGELOG.md
docs/api/fileops.rst
src/octoprint/plugins/virtual_printer/virtual.py
src/octoprint/server/api/files.py
src/octoprint/static/css/octoprint.css
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/settings.js
src/octoprint/templates/sidebar/state.jinja2
src/octoprint/util/comm.py
2016-07-28 15:00:23 +02:00
Gina Häußge
14969e5508
Preparing release of 1.2.14
2016-07-28 12:15:22 +02:00
Gina Häußge
b32c231c47
Merge branch 'maintenance' into devel
...
Conflicts:
CHANGELOG.md
src/octoprint/plugins/virtual_printer/virtual.py
src/octoprint/static/js/app/viewmodels/gcode.js
2016-06-21 16:10:02 +02:00
Gina Häußge
c70708e915
Fixed changelog for 1.2.13
...
Will stay this way now for 1.2.13 though, already released. Follow up versions
should reflect the contents of the release notes however.
2016-06-16 13:26:30 +02:00
Gina Häußge
cb2e0d449f
Preparing release of 1.2.13
2016-06-16 12:19:17 +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
4c34cb84c7
Preparing release of 1.2.12
2016-06-08 13:09:04 +02:00
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
