31045b4c25
Merge branch 'peteruithoven-master' into devel
...
Conflicts:
octoprint/timelapse.py
2013-06-23 14:58:58 +02:00
329656837a
Renamed flipX, flipY to flipH, flipV, made update upon change instant, also made timelapse video reflect flipped webcam
2013-06-23 14:57:48 +02:00
0e56952913
Finalized decoupling of timelapse from printer module, made sure timelapse is properly unregistered from eventbus on change
2013-06-16 22:42:18 +02:00
236e26979f
Switched Timelapses to using Eventbus instead of direct connection
2013-06-16 21:50:50 +02:00
d571aa588a
Merge branch 'sdcard' into events
...
Conflicts:
octoprint/printer.py
octoprint/server.py
octoprint/util/comm.py
2013-05-27 01:33:54 +02:00
be99930021
Refactoring of event management
2013-05-27 00:56:57 +02:00
38ec0b96b2
Started refactoring to match coding style and simplify things a bit.
2013-05-21 22:59:13 +02:00
96adc0dc85
Merge branch 'norpchen-master' into events
...
Conflicts:
octoprint/server.py
octoprint/settings.py
2013-05-21 22:38:56 +02:00
525d73a20b
Event Manager
...
Added event manager to trigger system and gcode commands.
2013-05-20 20:04:21 -07:00
039a17d923
First try at SD card support
2013-05-20 19:18:03 +02:00
874a7421e9
Login and logout working for the first time
2013-04-13 21:45:20 +02:00
192952c03f
Logging statements for timelapse creation
2013-03-17 16:31:20 +01:00
a261896186
Fixed using wrong item collection for timelapse files, lead to always displaying all files, not just the ones of the current page.
2013-03-09 12:58:15 +01:00
07d4a8fd4f
Added (optional!) watermark addition to generated timelapse movies.
2013-03-09 00:23:52 +01:00
1fbb73e448
Refactored pagination/sorting/filtering of gcode files into own configurable listHelper now used to provide pagination etc to both gcode and timelapse file list.
2013-03-06 23:27:16 +01:00
727b4659cb
Bugfix: added getter for interval attribute on TimedTimelapse, went missing since a refactoring a couple of weeks back.
2013-02-28 09:46:26 +01:00
f03056c1b2
Made settings module more flexible regarding variable path lengths to needed values, made speed for printer movement configurable
2013-02-16 20:28:09 +01:00
0552d43b16
Further work on custom controls and custom bitrate for timelapses
2013-01-27 11:12:28 +01:00
720f3b3eb6
Renamed from Printer WebUI to OctoPrint
...
The location of the config folder has changed. OctoPrint will try to migrate the configuration from its old location (~/.printerwebui, ...) to its new one (~/.octoprint, ...). For this to work the following conditions must be met: 1) the old config folder exists and is a directory 2) the new config folder does not exist at all. The migration functionality will be in the future.
2013-01-18 23:44:11 +01:00
Gina Häußge