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
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
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
Gina Häußge
52bd2bee49
Merge remote-tracking branch 'daprice/load-and-print' into devel
2013-03-30 17:30:25 +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
4af360bbac
Merge pull request #85 from splitbrain/initscript
...
added init script
2013-03-24 06:16:04 -07:00
Andreas Gohr
06cbe6081f
added init script
2013-03-24 13:16:17 +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
e1d4832026
Moved configuration description to wiki and removed obsolete information regarding the repository rename.
2013-03-16 02:40:42 +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
1e381cc793
Moved setup instructions for Raspbian to a wiki page.
2013-03-16 00:34:40 +01:00
Gina Häußge
3350b48a76
Merge remote-tracking branch 'origin/master' into devel
2013-03-16 00:32:18 +01:00
Gina Häußge
e08783c8bf
Merge remote-tracking branch 'daprice/master' into devel
2013-03-16 00:28:37 +01:00
Gina Häußge
dc5b8d9606
Update README.md
2013-03-16 00:17:12 +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
Gina Häußge
625ad32f6c
Merge pull request #75 from daprice/master
...
Fix storing of ItemListHelper sorting/filtering in localStorage
2013-03-13 02:36:10 -07: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
1afb690b8f
... it's been a long day.
2013-03-11 21:05:52 +01:00
Gina Häußge
b7a3105655
Smallish fixes for argparser
2013-03-11 21:04:56 +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
Gina Häußge
8570f73794
Merge branch 'master' into devel
2013-03-11 18:41:35 +01:00
Tom
f10e10f5b3
Converts commands uppercase
2013-03-11 10:39:03 -04:00
Tom
2904bd62d7
Enter key sends command
...
Sending a command also clears the field.
2013-03-11 10:38:41 -04:00
Gina Häußge
b23098a265
Fixed TimedTimelapse
...
Fixed access of interval attribute
2013-03-11 09:39:54 +01:00
Gina Häußge
09adb8dfda
Fixed TimedTimelapse
...
Interval parameter gets now accessed correctly
2013-03-11 09:38:36 +01:00
Gina Häußge
1ebc0c0ce9
Temporary workaround for the gcode viewer options not cooperating until those are integrated a bit more.
...
Targets #35 .
2013-03-10 22:06:08 +01:00
