Gina Häußge
dcd67e7645
Merge branch 'fix/includeReleasenotesInUpdateNotifications' into devel
...
Conflicts:
src/octoprint/plugins/softwareupdate/static/css/softwareupdate.css
src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
src/octoprint/plugins/softwareupdate/static/less/softwareupdate.less
src/octoprint/static/css/octoprint.css
src/octoprint/static/less/octoprint.less
2015-12-10 14:45:39 +01:00
Gina Häußge
8149a3b4a8
Include release notes in update notification
...
... and confirmation dialog and settings dialog.
github_release fetches release notes link from github. Check configurations
can always set individual release notes links via the new `release_notes`
property. The URL also supports placeholders `{octoprint_version}`,
`{target_version}` and `{target_name}`. A custom release note URL
hence could be configured by a plugin via
def get_update_information(self):
return dict(
myplugin=dict(
[...]
release_notes="https://me.github.io/MyPlugin/my/custom/releasenotes.html#version_{target_version} "
[...]
)
)
and if a new release "1.3.4" was now to be released would be displayed to the user as
https://me.github.io/MyPlugin/my/custom/releasenotes.html#version_1.3.4
The same of course is possible via config.yaml:
plugins:
softwareupdate:
checks:
myplugin:
release_notes: 'https://me.github.io/MyPlugin/my/custom/releasenotes.html#version_{target_version} '
2015-12-10 14:41:46 +01:00
Gina Häußge
8a7d234571
Merge branch 'fix/commTimeoutOnSupressedScriptCommands' into maintenance
2015-12-08 14:24:47 +01:00
Gina Häußge
f82d9817dc
Merge branch 'maintenance' into devel
2015-12-08 14:24:17 +01:00
Gina Häußge
c5c5383e0e
Fixed clean up of preemptive cache entries
2015-12-08 14:23:40 +01:00
Gina Häußge
b4d25db9c8
Merge branch 'fix/betterUiCaching' into maintenance
2015-12-08 13:45:37 +01:00
Gina Häußge
ed6834ac0b
Merge branch 'fix/intermediaryStartupPage' into devel
...
Conflicts:
src/octoprint/server/__init__.py
2015-12-08 13:36:01 +01:00
Gina Häußge
ef876cfd35
Fire up intermediary server on host and port
...
That way people will not see connection failed messages while the server is
still starting up.
Served intermediary page als "pings" an image on the backend to detect if
a) the backend is still responding at all ("intermediary.gif") and b) whether the
server has fully started up ("online.gif").
If the backend stops responding for 5s, a message is output that tells the user
that something went really wrong and to please check the log file.
Once the server becomes online, the intermediary page reloads/switches to the
actual UI.
2015-12-08 13:28:12 +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
547dcdd725
maintenance branch is now 1.2.9.dev
2015-12-07 14:58:19 +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
cda399f11a
Merge branch 'fix/ignoreCannotOpenSubdir' into maintenance
2015-12-07 13:21:57 +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
c98d3d1655
Also assume presence of heated bed in "add profile" dialog
2015-12-07 11:53:41 +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
2b4a985d85
Assume the presence of a heated bed in the default profile
2015-12-07 11:04:09 +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
0982c8cc62
Ignore the "cannot (open|error) subdir" errors from Marlin
2015-12-07 09:26:25 +01:00
Mark Bastiaans
682e78c256
Added name to authors
...
(cherry picked from commit 406fe75
2015-12-04 17:37:27 +01:00
Mark Bastiaans
d90a9e7fc4
Fixed checks with os.path.realpath() for systems with symlinked paths
...
(cherry picked from commit b7c9949
2015-12-04 17:36:49 +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
af1cd1f9e3
profile.key => profile.id
2015-12-03 09:53:37 +01:00
Gina Häußge
1f9ebe7201
Fixed a typo
2015-12-02 21:42:30 +01:00
Gina Häußge
bad88da2fe
Fixed a scrolling issue on the terminal tab
2015-12-02 18:12:08 +01:00
Gina Häußge
090671a044
Merge branch 'maintenance' into fix/commTimeoutOnSupressedScriptCommands
2015-12-02 17:26:25 +01:00
Gina Häußge
1e9ea8e85e
Updated Changelog again
2015-12-02 17:12:17 +01:00
Gina Häußge
c5bc000b56
Increased timeout for waiting for restart after update
...
20sec is too little.
2015-12-02 17:12:04 +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
c0774d0dd8
Fix: Do not stall comm when a command is supressed while printing
2015-12-02 11:08:51 +01:00
Gina Häußge
612005c4f6
Fixed a bug preventing OctoPrint from updating via github releases
...
Noticed while testing update path from 1.2.7 to 1.2.8
*bangs her head against a wall*
2015-12-02 09:25:15 +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
1d8cf86215
Updated translation source files and german translation
2015-12-01 11:42:57 +01:00
Gina Häußge
fbc0b8af91
Merge branch 'maintenance' into fix/betterUiCaching
2015-12-01 10:40:57 +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
ce8fa13fb8
Merge branch 'fix/contributeMd' into devel
2015-11-30 19:48:12 +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
966bec2bed
Merge branch 'fix/onlyShowBedIfPrinterHasBed' into devel
2015-11-30 11:11:51 +01:00
Gina Häußge
93bbedae86
Only process bed temps & commands if printer profile has heated bed
...
Solves #1125
2015-11-30 11:11:35 +01:00
Gina Häußge
ecd7045b84
Only use data for preemptive caching from plugins if it's set
2015-11-27 16:35:33 +01:00
Gina Häußge
1fc50b9940
Merge branch 'fix/terminalMemoryUsage' into devel
2015-11-27 15:06:17 +01:00
Gina Häußge
40fe74ef45
Cut off terminal after 3000 lines
...
When autoscroll was disabled, terminal could run on endlessly, eating
memory until the browser crashes. Now a hard upper limit ensures
that not more than 3000 lines are ever stored in the terminal. If autoscroll
is disabled and the limit is reached, no more log lines will be added. That
ensures that the log will not scroll and the current log excerpt will stay put.
2015-11-27 15:05:55 +01:00
Gina Häußge
8eab664a34
Merge branch 'fix/wrongJsReference' into devel
...
Conflicts:
src/octoprint/static/js/app/dataupdater.js
2015-11-27 11:32:41 +01:00
Gina Häußge
043b213a96
Move event processing for gcodefiles into corresponding viewmodel
...
Also fixes a javascript error (gcodeFileViewModel unknown)
2015-11-27 11:31:17 +01:00
Gina Häußge
8a7cf88f8d
A method that's called putJson should actually put JSON and not formdata...
2015-11-27 10:06:34 +01:00
