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

1611 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
0fd9b3354a Changed version... 2013-12-21 16:01:13 +01:00
Gina Häußge
765b941472 Merge branch 'master' into toMerge 
Conflicts:
	octoprint/server.py
	setup.py
	src/octoprint/printer.py
	src/octoprint/static/js/app/main.js
	src/octoprint/util/__init__.py
 2013-12-21 15:55:41 +01:00
Gina Häußge
64084bb628 A couple of manual merges... 2013-12-21 15:51:32 +01:00
Gina Häußge
df269eb4f7 More intelligent handling of disabling and re-enabling the webcam stream. 
See #314
(cherry picked from commit 1dd0aba)
 2013-12-21 14:52:06 +01:00
Gina Häußge
722b03dca8 Disable webcam stream when control tab is not in focus. 
Fixes #316
(cherry picked from commit 1b4a7c7)
 2013-12-21 14:51:53 +01:00
Gina Häußge
3ddfc93c1b Use G28 for homing (G1 was a copy-paste-error) 
Fixes #314
(cherry picked from commit 5b8126a)
 2013-12-21 14:51:43 +01:00
Gina Häußge
5eb70fa57d Properly calculate time deltas (forgot the days) 
(cherry picked from commit 84012d1)
 2013-12-21 14:50:46 +01:00
Gina Häußge
eccc9d6fbd WARNING: A lot of changes to the existing API and the event system. 
This WILL break existing API clients and probably some event handlers too. I'm sorry for the disruptive changes, but I needed to rectify some decisions before they went too far utilized elsewhere to still be corrected.

 Basically this change completely removes the old API and switches it (same endpoint) with the new one, that's basically the existing AJAX API that the client uses, but way more RESTful and based on JSON (exception being the file upload).

 The event system has been revamped to carry more payload data (and in an extensible form as dictionary, to allow for later addition of attributes to single events), with the existing event listeners adjusted to also allow users to make use of this data in their consumers.

 Documentation has been greatly enhanced for the REST API (and is still being added to), the events will be documented here as well.
 2013-12-21 14:46:20 +01:00
Gina Häußge
049ed723a7 Merge branch 'revampedEvents' into devel 2013-12-21 13:01:29 +01:00
Gina Häußge
b6cdc5803b More documentation 2013-12-21 13:01:18 +01:00
Gina Häußge
792299537d Some more documentation 2013-12-16 02:11:40 +01:00
Gina Häußge
7b01e72a9b Deleting a file of course work via DELETE, not POST 2013-12-16 01:49:17 +01:00
Gina Häußge
755549a745 Some further API documentation 2013-12-16 01:47:06 +01:00
Gina Häußge
1c39555255 Added a very small intro to the docs 2013-12-15 18:56:16 +01:00
Gina Häußge
ff5aba9a51 Forgot to commit images 2013-12-15 18:52:05 +01:00
Gina Häußge
467d012bce Added sphinx dependencies to requirements 2013-12-15 18:48:52 +01:00
Gina Häußge
09bed4e74f Started documenting OctoPrint's REST API 2013-12-15 18:45:38 +01:00
Gina Häußge
7a8e71b837 Fixed api_access decorator 2013-12-14 17:48:06 +01:00
Gina Häußge
90336277a7 Fixed refresh of SD file list 
Closes #326
 2013-12-14 10:11:27 +01:00
Gina Häußge
2b856e4508 Forgot to check in the new VERSION file 2013-12-02 17:42:20 +01:00
Gina Häußge
ac75ee9831 Starting documentation based on Sphinx 2013-12-02 17:40:31 +01:00
Gina Häußge
0b662b7211 Revamped the events slightly 
Payload data can now be properly injected into event handlers such as command triggers. Added a couple of new events to use for update triggers to the frontend instead of custom code, further decoupling the application. Movie rendering now also causes a frontend notification.
 2013-12-02 17:04:00 +01:00
Gina Häußge
9f7fc73441 data["print"] is now a boolean, so we don't need to check against valid_boolean_trues anymore but can use it directly instead 
Fixes #317
 2013-11-25 16:54:44 +01:00
Gina Häußge
677d33e448 Fixed sending of command again. Also now make g and m codes appear in uppercase automatically. 2013-11-25 11:46:24 +01:00
Gina Häußge
1dd0aba8f5 More intelligent handling of disabling and re-enabling the webcam stream. 
See #314
 2013-11-24 17:33:05 +01:00
Gina Häußge
1b4a7c7896 Disable webcam stream when control tab is not in focus. 
Fixes #316
 2013-11-24 16:55:14 +01:00
Gina Häußge
5b8126ae17 Use G28 for homing (G1 was a copy-paste-error) 
Fixes #314
 2013-11-24 13:12:02 +01:00
Gina Häußge
a1350c9344 Corrected merge bugs 2013-11-20 22:01:09 +01:00
Gina Häußge
84012d1232 Properly calculate time deltas (forgot the days) 2013-11-20 22:00:47 +01:00
Gina Häußge
0199599880 Merge branch 'master' into devel 
Conflicts:
	octoprint/server.py
	octoprint/util/__init__.py
	setup.py
	src/octoprint/printer.py
	src/octoprint/static/js/app/main.js
	src/octoprint/templates/index.jinja2
 2013-11-20 21:57:20 +01:00
Gina Häußge
2f3c3c0c20 Properly calculate time deltas (forgot the days) 
Fixes #313
 2013-11-20 20:22:03 +01:00
Gina Häußge
e690053fd4 Added user apikeys, made ajax api available via apikeys, restified ajax api (WIP) 2013-11-19 22:53:26 +01:00
Gina Häußge
ae3e474c92 Fix relative path to git root 2013-11-18 13:35:40 +01:00
Gina Häußge
297d101f5f Only apply the temperature offset if the temperature being set from the GCODE isn't 0 ("heaters off") 2013-11-18 11:35:38 +01:00
Gina Häußge
4d2213544e Made metadata saving for gcode files more error resilient (hopefully that is) 2013-11-15 20:54:13 +01:00
Gina Häußge
895d077d85 Refactored parts of comm.py to reduce length of _monitor 2013-11-11 22:03:15 +01:00
Gina Häußge
35b010b059 Better fitting error message when opening a known serial port fails (e.g. due to permission problems), auto detection errors now got their own message 
Fixes #294
 2013-11-10 20:29:37 +01:00
Gina Häußge
204128e1ca Fixed #296 
(cherry picked from commit fdfa433)
 2013-11-10 18:57:44 +01:00
Gina Häußge
fdfa433243 Fixed #296 2013-11-10 18:55:36 +01:00
Gina Häußge
aa69d181bf Fixed load API 2013-11-10 17:31:55 +01:00
Gina Häußge
e9f218208d Merge remote-tracking branch 'origin/devel' into devel 2013-11-09 20:30:04 +01:00
Gina Häußge
8ca3baee04 Fixed a couple of things with the new blueprints, should work now 2013-11-09 20:26:18 +01:00
Gina Häußge
3c68353c57 Merge pull request #293 from tonnerre/sane-ulimit 
Don't give everyone write access to octoprint data.
 2013-11-04 09:22:32 -08:00
Gina Häußge
fe37ab3cd8 Refactored server.py into submodules, extracted ajax and rest api into their own blueprints, and while doing all this also took care of #291 2013-10-28 22:08:36 +01:00
Gina Häußge
f2b0bfb7dc Merge pull request #292 from tonnerre/devel 
Remove the version name from the minified less.js version.
 2013-10-27 10:58:52 -07:00
Tonnerre LOMBARD
f7f8c09a77 Actually, umask 002 is what we want here. 2013-10-27 02:39:29 +02:00
Tonnerre LOMBARD
37c949e83b Currently, octoprint gives write access to all files in its data 
directory to everybody.

This was probably considered appropriate for the case of octoprint
running on a single-user device, but given that Unix has groups
support, it is not necessary, and can be very harmful.
 2013-10-27 02:32:14 +02:00
Tonnerre LOMBARD
b35258fad6 Remove the version name from the minified less.js version. 2013-10-26 23:28:38 +02:00
Gina Häußge
1a6030c737 Added missing docstring 2013-10-21 10:29:59 +02:00
Gina Häußge
9008a2fb7f Moved axes inverting to printer settings, changed naming and data format a bit 2013-10-20 22:22:58 +02:00