Gina Häußge
38ec0b96b2
Started refactoring to match coding style and simplify things a bit.
2013-05-21 22:59:13 +02:00
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
525d73a20b
Event Manager
...
Added event manager to trigger system and gcode commands.
2013-05-20 20:04:21 -07:00
Gina Häußge
783b3b8166
Merge branch 'master' into devel
2013-05-20 20:19:26 +02:00
Marlon Wünnemann
b61db6dc0f
jQuery over SSL and GoogleCDN
...
Issue #127
2013-05-16 16:43:09 +03: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
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
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
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
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
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
c01b49fbc7
Forgot to commit Font Awesome
2013-03-30 18:29:13 +01:00
Gina Häußge
cfdfad1c06
Changed color and font-size of footer
2013-03-30 18:28:24 +01:00
Gina Häußge
b5b023a29c
Merge remote-tracking branch 'splitbrain/footer' into devel
2013-03-30 18:22:33 +01:00
Gina Häußge
f70649b0d2
Removed a couple of redundancies for loadAndPrint button, actions are now disabled if they don't make sense
2013-03-30 18:21:49 +01:00
Dale Price
021f413c12
add "Load and Print" button which automatically starts printing when a gcode file is done loading.
...
Solves foosel/OctoPrint#91
2013-03-26 00:09:36 -05:00
Dale Price
71f3dbbdcc
add tooltips to file controls
2013-03-25 23:55:53 -05:00
Andreas Gohr
9314e83665
added footer
...
makes it faster, to refer to the OctoPrint site when problems occur.
2013-03-24 16:11:54 +01:00
Gina Häußge
178b2f36d7
Only log the terminal output to disk if the "--debug" commandline switch is given
...
Otherwise slowdowns might be caused on Raspberry Pi when dumping all printer communication to SD
2013-03-17 22:32:35 +01:00
Gina Häußge
1477fb31fb
Merge branch 'devel'
2013-03-17 16:42:48 +01:00
Gina Häußge
192952c03f
Logging statements for timelapse creation
2013-03-17 16:31:20 +01:00
Gina Häußge
8543d628b5
New serial log at ~/.octoprint/logs/serial.log
...
Logs the same content as the terminal tab and is restricted to 2MB in size (hopefully).
Closes #77
2013-03-16 02:24:33 +01:00
Gina Häußge
7e595b27ed
Bugfix: configfile parameter was not properly used for settings in all cases
2013-03-16 01:48:28 +01:00
Gina Häußge
e08783c8bf
Merge remote-tracking branch 'daprice/master' into devel
2013-03-16 00:28:37 +01:00
Dale Price
088253e564
work around a bug in iOS 6 where ajax requests get cached and only work once
2013-03-14 20:55:02 -05:00
Dale Price
d564176c9c
fix localStorage bug by not trying (and failing) to make it a multidimensional array; use JSON to store array of filters in localStorage
2013-03-13 03:01:18 -05:00
Gina Häußge
4b8260b933
Fixed some indentation
2013-03-11 21:46:05 +01:00
Gina Häußge
e2798de727
Merge branch 'daftscience-master' into devel
2013-03-11 21:15:27 +01:00
Gina Häußge
363f00775b
New config options for daemonization, configfile location and basedir location
...
Using --daemon {start|stop|restart} OctoPrint can now be daemonized/controlled in daemon mode. Via --pidfile it's possible to set the pidfile to use, --configfile allows specification of the config.yaml to use, --basedir specifies the location of the basedir from which to base off the upload, timelapse and log folders. I also updated the README to include some config file settings which were previously undocumented.
2013-03-11 21:00:43 +01:00