pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3398 commits 20 branches 22 tags 141 MiB
Commit graph

3398 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
62a25767a3 Merge branch 'maintenance' into devel 2016-01-05 11:43:20 +01:00
Gina Häußge
450e24bbc2 Added missing AUTHORS.md entry 2016-01-05 11:42:38 +01:00
Gina Häußge
c020c7afe0 Merge branch 'master' of https://github.com/richjoyce/OctoPrint into pr/richjoyce/settings_remove_fix 2016-01-05 11:40:18 +01:00
Gina Häußge
5cdf45d218 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/static/js/app/viewmodels/loginstate.js
 2016-01-05 11:38:05 +01:00
Gina Häußge
384e150448 Fixed some whitespace 2016-01-05 11:32:55 +01:00
Gina Häußge
d4260468be Merge branch 'devel_knockout_bindings' of https://github.com/BillyBlaze/OctoPrint into pr/BillyBlaze/devel_knockout_bindings 2016-01-05 11:17:04 +01:00
Gina Häußge
a11774484e Merge branch 'files_sidebar' of https://github.com/BillyBlaze/OctoPrint into pr/BillyBlaze/files_sidebar 2016-01-05 11:04:24 +01:00
Gina Häußge
d3129a800f We also don't need the empty file anymore then 2016-01-05 10:56:13 +01:00
Richard Joyce
0d7965ebf1 Fix missing kwargs in PluginSettings remove 2016-01-04 09:25:58 -08:00
Paul de Vries
34ceb93509 Initialize loginUser and loginPass with an empty string 
Clear loginUser and loginPass after a successful login (e.g. the user made a typo)
 2016-01-03 22:02:49 +01:00
Paul de Vries
645c2da7a5 Moved custom bindings from main.js to bindings/{bindingname}.js 
Added custom bindings files in the flask.py js list

Removed inline onclick with sliderToggle and made a custom binding
'toggleContent'

Add padding and line-height to intermediary heading for better readability
 2015-12-30 17:54:22 +01:00
Paul de Vries
b987e2ac7d Remove 'folder' className to 'back' 2015-12-25 19:57:30 +00:00
Paul de Vries
1f878fefb0 Add .type as className for better styling 2015-12-25 19:50:26 +00:00
Paul de Vries
bff20bf4d9 If dynamic LESS or CSS is empty then do not parse the jinja2 assets block 2015-12-25 18:28:28 +00:00
Paul de Vries
da1ae91d9a Remove XHTML and make it HTML5 valid 2015-12-25 18:12:44 +00:00
Paul de Vries
ff96642f82 Upgrade LESS v1.3.3 to v2.5.3 2015-12-25 18:12:14 +00:00
Gina Häußge
c120261e2b Increased backend fail counter for intermediary page 
Also made sure that baseURL always ends in a /
 2015-12-18 17:39:30 +01:00
Gina Häußge
f0acacec6a Intermediary page needs to remove fragments for baseUrl 
Otherwise image pinging won't work properly.
 2015-12-18 14:30:53 +01:00
Gina Häußge
86b96b8d4a Don't allow empty folder names 2015-12-17 16:56:09 +01:00
Gina Häußge
9b3e4f5c2a Properly capture StorageErrors 2015-12-17 16:48:02 +01:00
Gina Häußge
376c832b0b Fixed a ReferenceError when processing the SlicingProgress events 2015-12-17 13:57:39 +01:00
Gina Häußge
9fbe130169 Merge branch 'fix/aclFirstRun' into maintenance 2015-12-17 13:19:26 +01:00
Gina Häußge
7791f7751f Merge branch 'fix/aclFirstRun' into devel 
Conflicts:
	src/octoprint/server/__init__.py
	src/octoprint/server/api/__init__.py
	src/octoprint/server/views.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/firstrun.js
 2015-12-17 13:16:51 +01:00
Gina Häußge
b96d1b51e0 Disabled ACL is now tracked through enabled flag on UserManager 
That allows us to properly enable and disable it at runtime (during first run).
 2015-12-17 13:08:45 +01:00
Gina Häußge
22ae7fecf4 Merge branch 'fix/timeoutOnUnknownCommands' into devel 
Conflicts:
	src/octoprint/util/comm.py
 2015-12-17 10:45:33 +01:00
Gina Häußge
570c66b6f3 Trigger command processing on unknown commands 
We suffer from the same problem as commands being suppressed in the
send queue here. If a non-GCODE-command we send to the printer
produces no output, our _monitor loop will wait until the next response
produced by another command. Which we won't send though since
we are stuck waiting in the _monitor loop waiting for a response. Hence
we need to manually trigger further command processing from the
send loop here in order to ensure things keep going.
 2015-12-17 10:44:43 +01:00
Gina Häußge
e64a9bd4b5 Added feature flag to toggle F command support 
Defaults to off, set feature.supportFAsCommand to true to enable.
 2015-12-17 10:37:32 +01:00
Gina Häußge
dd843c8f67 Also recognize F as standalone GCODE command 
While 3D printers usually don't support that, at least Smoothieware
does combined with CNC operations.
 2015-12-16 16:50:42 +01:00
Salandora
8c85ed8ce5 Fix for system menu not getting properly reloaded after entries changed. 
Plus added a missing semicolon.
 2015-12-16 12:28:41 +01:00
Salandora
f9f22daa4d Merge branch 'fix/systemMenu' into devel 2015-12-16 12:21:34 +01:00
Salandora
ccd2ddc056 Fixed a bug with access control during first run 
Requests against restricted resources could fail even though the
first run wizard had been completed successfully.
 2015-12-16 11:59:45 +01:00
Salandora
54f24b43f0 If no system actions were configured during rendering of the page, no system menu was added to the template. 
hat caused system actions added during runtime (e.g. by API) to not show up until a re-rendering of the page.
 2015-12-16 11:35:25 +01:00
Gina Häußge
7232df686a Merge branch 'fix/compatibilityCheck' into devel 
Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
 2015-12-14 14:24:30 +01:00
Gina Häußge
eae68f04ca Use PEP440 compatible version compatibility check 
Also make sure that if we have a pkg_resources version that returns
tuples we not only remove any intermediary version parts if the base
version is requested, but we also append "*final" to the tuple afterwards,
otherwise the compatibility check will fail.
 2015-12-14 14:14:44 +01:00
Gina Häußge
7e947a8403 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/server/__init__.py
 2015-12-14 11:58:21 +01:00
Gina Häußge
7fcd04ae61 Also use pre-calculated revision information instead of fetching anew 2015-12-14 10:16:29 +01:00
Gina Häußge
365c852769 Merge branch 'fix/fasterUpdateCheck' into devel 
Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
	src/octoprint/plugins/softwareupdate/__init__.py
 2015-12-14 09:57:20 +01:00
Gina Häußge
28eb436c88 Merge branch 'fix/includeReleasenotesInUpdateNotifications' into devel 2015-12-10 17:12:11 +01:00
Gina Häußge
1a4920fc36 Display remote version in update message, not local one... 2015-12-10 17:12:02 +01:00
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
Salandora
e8bd29ef99 Replace get_versions() calls with octoprint.server.VERSION, to get some time improvment 2015-12-09 10:29:24 +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