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

1686 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
8aab0ee318 Should fix #529 2014-08-01 14:20:11 +02:00
Gina Häußge
f9d1086062 UI now displays last print time as approx. total print time if available, otherwise uses estimated print time if available 
Closes #523
 2014-07-31 18:16:53 +02:00
Gina Häußge
5e8a04e54d Merge pull request #481 from Salandora/bugFixes 
Bug fixes
 2014-07-31 10:10:21 +02:00
Gina Häußge
be99c59725 Properly handle exceptions other than a non-zero return code for slicing and timelapse rendering 
Closes #508
 2014-07-17 15:34:00 +02:00
Gina Häußge
f6e2a59008 Correctly handle GET requests on /api/printer/{tool|bed} when printer is not operational 
Closes #515
 2014-07-17 13:02:00 +02:00
Gina Häußge
f7f7d5c4f0 We want the year in the docs to always be current 2014-06-30 11:18:22 +02:00
Gina Häußge
85fc2b2666 Let's see if fetching the version from the octoprint module works on rtd... 2014-06-30 11:13:47 +02:00
Gina Häußge
65624ed77e Also update the metadata correctly when an analysis finishes 
Closes #476 for good
 2014-06-23 18:54:45 +02:00
Gina Häußge
6a3241fa0b Another try at fixing #476 2014-06-23 16:22:57 +02:00
Gina Häußge
ff22ab0026 Submit login form upon enter in password field, switch to password field upon enter in username field 2014-06-23 13:55:49 +02:00
Gina Häußge
907f5051e1 Version resource on API with API and software version 2014-06-23 13:31:31 +02:00
Gina Häußge
76a9e94aed Added clean command to setup.py 2014-06-23 13:09:54 +02:00
Gina Häußge
de7808d42b Fixed setup.py to correctly work with versioneer 2014-06-23 10:35:59 +02:00
Gina Häußge
55b24c6a45 Removed left overs from old VERSION tracking 
(cherry picked from commit 603f667)
 2014-06-22 01:15:53 +02:00
Gina Häußge
12a4cbef46 Merge branch 'master' into devel 
Conflicts:
	setup.py
 2014-06-22 00:55:18 +02:00
Gina Häußge
f9a9a405cd About time to declare this as a stable version, should have done this ages 
ago...
 2014-06-22 00:42:03 +02:00
Gina Häußge
285f464b43 Versioning by versioneer: https://github.com/warner/python-versioneer/ 2014-06-22 00:41:03 +02:00
Gina Häußge
585bfba850 Merge branch 'master' into devel 
Conflicts:
	src/octoprint/server/ajax/control.py
 2014-06-21 20:19:49 +02:00
Gina Häußge
fa564c6029 Insert src folder at first position of sys.path 2014-06-21 20:16:53 +02:00
Gina Häußge
fd632fc63b Insert src folder at first position of sys.path 2014-06-21 20:11:04 +02:00
Gina Häußge
d8f1387703 Renamed a file 2014-06-08 16:54:17 +02:00
Gina Häußge
522eb40808 Documented SockJS interface, deprecated /api/state 2014-06-08 16:52:28 +02:00
Gina Häußge
587053b26c Forgot to git add image newly added to documentation 2014-06-07 18:23:55 +02:00
Gina Häußge
fa8d4eff0f Merge branch 'jonnor/api-allow-cors' into devel 2014-06-07 18:00:49 +02:00
Gina Häußge
666a9ef0fa ACCESS_CONTROL_REQUEST_HEADERS => Access-Control-Request-Headers 
While flask internally translates that just right back, this makes the implementation more readable since it matches the standard header name
 2014-06-07 17:49:55 +02:00
Jon Nordby
014ea3eadc API: Clarify Access-Control-Request-Header handling 
'headers' was a way too generic name, and the code structure implied
it was used in place of 'resp.headers' or 'request.headers', which is not the case.
Also add comment about the purpose of this code.
 2014-06-07 14:42:58 +02:00
Gina Häußge
f7e1b39af9 Added checkbox to the settings dialog for CORS, also slight changes in the documentation 2014-06-07 13:21:54 +02:00
Jon Nordby
33005ea243 API: Add documentation for newly added cross-origin config option 2014-06-07 01:27:07 +02:00
Jon Nordby
651a9d30ce API: Only allow cross-origin requests if explicitly enabled 
To enable, set the key "allowCrossOrigin" under "api" in config.yml
No user interface for this option yet
 2014-06-07 01:04:32 +02:00
Jon Nordby
0bd6005cb9 API: Allow cross-origin requests 
When a REST API is called from within a browser page from a different domain,
the server needs to explicitly allow this. This makes the OctoPrint
API available also to other webapps, for instance those hosted on same network in hackerspace.
 2014-06-07 00:27:19 +02:00
Gina Häußge
3ee745d79c Always send commands with checksum when printing 2014-06-05 21:23:07 +02:00
Gina Häußge
ec508f5224 And another place I forgot to adapt to the new sd file list format 2014-06-01 18:44:39 +02:00
Gina Häußge
1b9523f700 Forgot to adapt verifyFileExists to new sd file list format 2014-06-01 11:54:03 +02:00
Gina Häußge
ee31808522 Also support extended sd file list (including size in bytes) from printer 
See also #486 where support for SD_EXTENDED_DIR format was requested between the lines ;)
 2014-05-30 18:05:43 +02:00
Gina Häußge
7414c921f3 Forgot to add some files to git again, argh! 2014-05-29 17:41:46 +02:00
Gina Häußge
d1d6e8e11c Filename might be None, do not try to pass that to os.path.basename. 
See #486
 2014-05-29 13:09:29 +02:00
Gina Häußge
778f9039fb supportRepetierTargetTemp being true is a too broad expression, also check for TargetExtr or TargetBed on line 
See #486
 2014-05-29 13:04:51 +02:00
Gina Häußge
4904c184f7 Removed accidentally committed dummy error (for testing pnotify migration) 2014-05-29 13:02:56 +02:00
Gina Häußge
cbde819e07 Better error reporting for timelapse rendering and system commands, updated pnotify and added possibility to add a "more" section to notifications 2014-05-26 22:51:45 +02:00
Salandora
3d6cb623f0 Autodetect Baudrate bugfix 2014-05-26 10:46:47 +02:00
Salandora
47cfcd7b12 Event Progress bugfix 2014-05-26 10:45:55 +02:00
Gina Häußge
244128c7ed Merge remote-tracking branch 'origin/devel' into devel 2014-05-25 20:19:03 +02:00
Gina Häußge
9c9b98dde4 Properly detect current file, forgot to adjust detection stuff in upload API after renaming things in the job tracking. 
Thanks to Bryan Mayland for spotting this.

Closes #476
 2014-05-25 20:18:41 +02:00
Gina Häußge
36d1522f01 Merge pull request #475 from Salandora/master 
Bug fix for Emergency Stop
 2014-05-22 21:53:06 +02:00
Salandora
536e17eac4 Bug fix for Emergency Stop 2014-05-22 17:56:50 +02:00
Gina Häußge
7bba1dc944 Merge pull request #473 from Salandora/EmergencyBug 
Emergency Stop should not only trigger an event but also at least cancel the print

Closes #448
 2014-05-22 12:33:32 +02:00
Salandora
59c859fb17 Bug fix for Emergency Stop 2014-05-22 11:46:42 +02:00
Gina Häußge
887ec45b6b Create CONTRIBUTING.md 2014-05-19 22:48:41 +02:00
Gina Häußge
faa0521428 Renamed folder "watchdog" to "watched" 2014-05-19 18:02:24 +02:00
Gina Häußge
8886b20c01 And also forgot to push one more file 
Kids, never code while on a moving train with a flaky internet connection, you tend to miss important things...
 2014-05-19 18:00:57 +02:00