Gina Häußge
ed11da4903
Merge branch 'Mikk36-dev/ffmpegThreads' into devel
2015-02-26 11:48:37 +01:00
Gina Häußge
942c916df5
Added tool tips for webcam options
...
Also fixed label element references
2015-02-26 11:47:55 +01:00
Mikk Kiilaspää
a4d83c33ec
Add an option to specify the amount of encoding threads for FFMPEG
2015-02-25 23:50:00 +02:00
Gina Häußge
141725d002
Merge branch 'Mikk36-devel' into devel
2015-02-24 19:47:11 +01:00
Gina Häußge
07987dad46
Proper default values for interval in server on API
2015-02-24 19:46:55 +01:00
Gina Häußge
90dda10ca0
Proper default values for timelapse settings when no settings available from server
2015-02-24 19:46:24 +01:00
Gina Häußge
2250fea68a
Changed location of fps configuration setting in timelapse config
2015-02-24 19:28:50 +01:00
Gina Häußge
0bf9be8be9
Added change log entry
2015-02-24 19:27:20 +01:00
Gina Häußge
fcc6a8c4c3
Changed wording for timelapse fps configuration a bit
2015-02-24 19:24:50 +01:00
Gina Häußge
ebbcd28536
Fixed a client side range check for timelapse fps
2015-02-24 19:24:32 +01:00
Gina Häußge
b273e06e88
Server side range checking for timelapse config
2015-02-24 19:24:11 +01:00
Mikk Kiilaspää
197859b675
Fix v2 for response parsing
2015-02-24 20:00:58 +02:00
Mikk Kiilaspää
f5ece9b5b4
Add the option to change timelapse fps
2015-02-24 19:39:29 +02:00
Mikk Kiilaspää
f0a71acf98
Fix response parsing
2015-02-24 17:48:15 +02:00
Gina Häußge
478b4f9550
Muted style of "Hint:" message in Files sidebar and Control tab
2015-02-24 14:15:33 +01:00
Gina Häußge
e9623fdc36
Improved behaviour of terminal window
...
* Disabling autoscrolling now also stops cutting of the log while it's enabled, effectively preventing log lines from being modified at all
* Applying filters displays "[...]" where lines where removed
* Added a link to scroll to the end of the terminal log (useful for when autoscroll is disabled)
* Added a link to select all current contents of the terminal log for easy copy-pasting
* Added a display of how many lines are displayed, how many are filtered and how many are available in total
Closes #735
2015-02-24 14:14:52 +01:00
Gina Häußge
a6e5ea268b
Fixed timelapse postroll settings
...
* Changing Timelapse post roll activates save button
* Timelapse post roll is loaded properly from config
(cherry picked from commit e1d7573
2015-02-24 11:09:17 +01:00
Gina Häußge
543b8df48b
Extended documentation to include replace feature for plugin template components
2015-02-24 09:29:02 +01:00
Gina Häußge
2fac5c76d9
Fixed styling of tables in docs
2015-02-23 22:15:04 +01:00
Gina Häußge
bb0a607891
Fixed gcode and terminal view models not properly handling missing elements
2015-02-23 21:41:19 +01:00
Gina Häußge
b401d957e5
Tabs now overflow into a tabdrop instead of wrapping
2015-02-23 21:40:55 +01:00
Gina Häußge
1c931a65e7
Asset injection for core components now uses same mechanism as plugins
2015-02-23 21:40:17 +01:00
Gina Häußge
b9fd3dda7d
Added onAfterTabChange callback, fixed tab switching this way
...
Both temperature graph and terminal need to be updated AFTER the tab has been switched (onAfterTabChange) not before (onTabChange).
2015-02-23 14:55:43 +01:00
Gina Häußge
8b4b5fb058
Documented slightly changed view model registration
...
Still backwards compatible though!
2015-02-23 14:00:14 +01:00
Gina Häußge
3a41ec2e20
Refactored view models, switched from underscore to lodash
...
Also added loglevel.js to allow for level based logging and added sprintf.js separately
2015-02-23 13:54:40 +01:00
Gina Häußge
cc975f77aa
Removed broken source map links in jquery.min.js and underscore-min.js
...
Should get rid of *.min.map 404s
2015-02-23 10:43:44 +01:00
Gina Häußge
81ef3d1e02
Fixed new slider controls
...
Needed proper observables to work
2015-02-22 22:26:05 +01:00
Gina Häußge
09ecd68fde
Parametric commands for custom controls can now define sliders instead of input fields
2015-02-22 22:19:43 +01:00
Gina Häußge
60a747620c
Bit more error resilience for the gcode viewer ui elements
2015-02-22 21:49:33 +01:00
Gina Häußge
4abcf1054b
Added controls for changing feed and flow rate factors to Controls tab
...
Closes #362
2015-02-22 21:20:56 +01:00
Gina Häußge
e476e4154e
Added custom control type for rows of controls
...
This allows horizontal placement of buttons. Custom controls in rows can have specified two new attributes: width which is the width of their container in the bootstrap 12-slot grid, and offset to specify offsets to the former control on the row.
2015-02-22 16:42:26 +01:00
Gina Häußge
4829c21db7
Merge branch 'master' into devel
2015-02-22 16:03:08 +01:00
Gina Häußge
d974ab0979
Forgot a changelog entry (again)
...
(cherry picked from commit 2111a06
2015-02-22 15:38:44 +01:00
Gina Häußge
2111a06ce3
Forgot a changelog entry (again)
2015-02-22 15:37:37 +01:00
Gina Häußge
89d972ff40
Always make sure to (re)set file position to the beginning when starting SD card prints
...
Closes #780
(cherry picked from commit 5c35a28
2015-02-22 15:24:48 +01:00
Gina Häußge
5c35a288a3
Always make sure to (re)set file position to the beginning when starting SD card prints
...
Closes #780
2015-02-22 15:15:45 +01:00
Gina Häußge
ad23c88347
Merge remote-tracking branch 'origin/devel' into devel
2015-02-20 19:02:00 +01:00
Gina Häußge
f60435aca4
Also allow downloading of STL files from server
2015-02-20 19:01:14 +01:00
Gina Häußge
578f77a411
Merge pull request #775 from matobago/patch-1
...
Error messages show the proper name of the objects
2015-02-18 22:03:14 +01:00
Marcel
61c4a8b635
Error messages show the proper name of the objects
...
Just try to figure out why some binding wasn't working on my version and came out with this small change
2015-02-18 12:07:36 -08:00
Gina Häußge
28738a5179
More documentation and unit tests
2015-02-18 17:16:37 +01:00
Gina Häußge
258b824ff8
self._printer in plugins now allows direct access to the transport object (serial instance in most cases)
2015-02-17 21:53:45 +01:00
Gina Häußge
7438ba1eea
Merge remote-tracking branch 'origin/devel' into devel
2015-02-17 14:26:52 +01:00
Gina Häußge
3c33401b48
GCODE viewer: Only try to instantiate sliders if their elements are available
2015-02-17 13:51:34 +01:00
Gina Häußge
9aa45041f6
View models can now implement getAdditionalControls to add controls to the control tab
...
Controls may now contain a new property "javascript" which may be either a javascript function to be called when the control is executed, or a string to be eval'd when the control is executed. If it is a function, it will be called with the config of the custom control as single parameter "data". If it is a string it will be eval'd within a function context providing the custom control configuration as variable data.
Additionally controls may contain a new property "enabled", which may also be either a javascript function or a string to be eval'd. The custom control config will be available to the enabled code as described above. The code is expected to return true if the component should be enabled or false if not.
2015-02-17 13:51:05 +01:00
Gina Häußge
56bce984fa
Merge pull request #673 from fjriosp/reconnect_fix
...
BugFix to Reconnect on Debian
2015-02-17 09:42:42 +01:00
Gina Häußge
6cdd8de248
docs: Fixed a wrong reference
2015-02-13 15:50:09 +01:00
Gina Häußge
197ed7b912
More documentation
2015-02-13 12:50:02 +01:00
Gina Häußge
7de90e16f6
And of course I forgot a file again and overlooked a typo...
2015-02-12 13:34:57 +01:00
Gina Häußge
cad4e2f6dc
Update some line numbers
2015-02-12 13:31:12 +01:00
