q3k/OctoPrint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1266 commits 1 branch 0 tags 18 MiB
Commit graph

1266 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
96adc0dc85 Merge branch 'norpchen-master' into events 
Conflicts:
	octoprint/server.py
	octoprint/settings.py
 2013-05-21 22:38:56 +02:00
Lars Norpchen
f6108b5422 Update README.md 
Back out previous changes
 2013-05-20 21:14:00 -06:00
Lars Norpchen
525d73a20b Event Manager 
Added event manager to trigger system and gcode commands.
 2013-05-20 20:04:21 -07:00
Gina Häußge
b048cc390b Proper uploading incl. drag-n-drop for both local storage and SD card 2013-05-20 23:31:17 +02:00
Gina Häußge
783b3b8166 Merge branch 'master' into devel 2013-05-20 20:19:26 +02:00
Gina Häußge
039a17d923 First try at SD card support 2013-05-20 19:18:03 +02:00
Richard Mitchell
8c8101bf62 Forgot to simplify the success after testing 2013-05-18 18:21:33 +00:00
Richard Mitchell
e831ced2da simple change so the url loads from http or https whichever is in use 2013-05-18 18:13:17 +00:00
Richard Mitchell
c1760c9940 A very simple API endpoint for loading and printing files direct. This is by default turned off and it "allowed" via the settings 
From within Slic3r adding a post-processing script .bat containing

c:\curl\curl "http://192.168.0.7:5000/api/load?apikey=D96FA6A216CB44F78705D4506689D0EC&print=true" -F file=@%*
 2013-05-18 17:47:31 +00:00
Richard Mitchell
3f79faf55b Merge remote-tracking branch 'upstream/master' into devel 2013-05-18 06:32:04 +00:00
Gina Häußge
427fa61ac6 Merge pull request #128 from marwue/patch-1 
jQuery over SSL and GoogleCDN
 2013-05-16 06:48:56 -07:00
Marlon Wünnemann
b61db6dc0f jQuery over SSL and GoogleCDN 
Issue #127
 2013-05-16 16:43:09 +03:00
Lars Norpchen
7b214d3f16 Update README.md 2013-05-09 15:39:57 -06:00
Lars Norpchen
905c3dbea6 Update README.md 2013-05-09 15:38:03 -06:00
Lars Norpchen
c6363ea046 External commands on events 
These changes address issues 87 and 22 by adding the ability to trigger
external commands on print start, done, cancel and z-height change.
 2013-05-09 14:31:54 -07:00
Lars Norpchen
b609123d8a Revert "Added external system commands support for events" 
This reverts commit 3b66f63ff2.
 2013-05-09 14:22:40 -07:00
Lars Norpchen
3b66f63ff2 Added external system commands support for events 
Print start, print end, print cancel, and Z  height change can now
trigger external system commands.  These are set in config.yaml and take
_FILE_, _PERCENT_, _LINES_ and _ZHEIGHT_  tokens to be passed to
external commands.

system_commands:
  cancelled: echo cancelled _FILE_ at _PROGRESS_
percent done.
  print_done: echo done with _FILE_
  print_started: echo
starting _FILE_
  z_change: echo _LINE_ _PROGRESS_ _ZHEIGHT_
 2013-05-09 14:05:48 -07:00
Gina Häußge
0f546f0053 Merge pull request #122 from norpchen/master 
GCode files with unknown commands
 2013-05-09 08:16:36 -07:00
Lars Norpchen
957213321e Print 'unknown G/M code' warnings to console once 2013-05-09 08:07:33 -07:00
Gina Häußge
fc56744705 Fixed URL for setting timelapse configuration. 
Closes #110
 2013-05-01 20:17:30 +02:00
Gina Häußge
245d9651b6 Merge branch 'devel' into repetier 2013-04-28 11:51:29 +02:00
Gina Häußge
9e9705f1ce Follow up to commit b9d467d 
Forgot to change session key to new Flask-Principal attribute name, which caused issues on logout sometimes (but weirdly not always).

Closes #107
 2013-04-26 22:26:19 +02:00
Gina Häußge
d721e5edc2 Merge branch 'devel' into repetier 
Conflicts:
	octoprint/util/comm.py
 2013-04-16 15:14:18 +02:00
Gina Häußge
0bb17818e1 Do not convert command to send to upper case after checksum was calculated 
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"

Should fix #103
(cherry picked from commit 628ffb5)
 2013-04-16 14:46:22 +02:00
Gina Häußge
628ffb5600 Do not convert command to send to upper case after checksum was calculated 
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"

Should fix #103
 2013-04-16 14:45:25 +02:00
Gina Häußge
b74d9d19ce Merge pull request #101 from AxTheB/devel 
Change shebang to run correct python in virtualenv
 2013-04-15 15:06:09 -07:00
Václav 'Ax' Hůla
028751c193 Change shebang to run correct python in virtualenv 2013-04-15 13:38:35 +02:00
Gina Häußge
b9d467d23f Upgraded to most recent Flask-Principal version, since an attribute name was changed there which OctoPrint uses 2013-04-14 15:33:11 +02:00
Gina Häußge
d7d8bba2e9 Fixed access to admin-only resources in case of disabled access control 2013-04-14 15:04:39 +02:00
Gina Häußge
552048efbe Fixed Modernizr queries by gcode renderer 2013-04-14 13:42:30 +02:00
Gina Häußge
7e82214d75 Added missing files 2013-04-14 13:15:54 +02:00
Gina Häußge
f7334ef65f Fixed some merge bugs 2013-04-13 22:26:23 +02:00
Gina Häußge
19dc238f06 User management now working 
Also reorganized javascripts a bit (as preparation for some refactoring coming up) and renamed templates from ".html" to ".jinja2".
 2013-04-13 22:21:53 +02:00
Gina Häußge
244ff25e2f Fixed settings for gcode file list 2013-04-13 22:20:41 +02:00
Gina Häußge
3e5a6d3679 Furhter work on user management 2013-04-13 22:20:41 +02:00
Gina Häußge
93a73a0ad8 Added roles (user and admin) and according requirements 2013-04-13 22:19:17 +02:00
Gina Häußge
1febcd671a "Writing" backend methods now protected (need logged in user (or dummy user if access control is disabled) to perform action), most "writing" frontend controls disabled if no logged in (or dummy) user returned from backend. 2013-04-13 22:19:17 +02:00
Gina Häußge
b27e1ce15e User factory method for creating SocketConnection object for Tornadio2 2013-04-13 21:45:20 +02:00
Gina Häußge
874a7421e9 Login and logout working for the first time 2013-04-13 21:45:20 +02:00
Gina Häußge
150d6cb53d First work on login and user management 2013-04-13 21:42:53 +02:00
Gina Häußge
34a860efda Added confirmation dialog and different logo for print job restart 
Closes #98
 2013-04-10 16:37:12 +02:00
Gina Häußge
46173bc35e Merge branch 'webcamMove' into devel 2013-04-07 22:15:15 +02:00
Gina Häußge
3174559072 Moved webcam view to Control tab 2013-04-07 22:15:04 +02:00
Gina Häußge
656aeb0189 Fixed evaluation of boolean argument for loadAndPrint from UI 
Closes #96.
 2013-04-07 22:06:17 +02:00
Gina Häußge
e70071f6c1 Removed waitForWait again (that didn't make much sense to begin with...) 2013-04-01 17:31:02 +02:00
Gina Häußge
9618407aed Merge branch 'devel' into repetier 
Conflicts:
	octoprint/server.py
 2013-04-01 17:25:08 +02:00
Gina Häußge
d20aae6474 Added homepage to footer 2013-04-01 17:23:56 +02:00
Gina Häußge
edea3789b2 Made Webcam omnipresent 2013-04-01 17:20:25 +02:00
Gina Häußge
1f06faa167 Update README.md 2013-03-30 18:31:17 +01:00
Gina Häußge
c01b49fbc7 Forgot to commit Font Awesome 2013-03-30 18:29:13 +01:00