pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3422 commits 20 branches 22 tags 141 MiB
Commit graph

3422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
6945394fc2 Merge branch 'fix/disablePrintButtonWithoutFile' into devel 2016-01-25 16:29:29 +01:00
Gina Häußge
bcd7bb4d20 Don't enable Print button if no job is selected 
Fixes #1007
 2016-01-25 16:28:52 +01:00
Gina Häußge
b63e372e7e Merge remote-tracking branch 'origin/devel' into devel 2016-01-25 15:08:30 +01:00
Gina Häußge
9d924be5f9 Merge branch 'fix/uploadWhileOffline' into devel 
Conflicts:
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/files.js
 2016-01-25 15:05:50 +01:00
Gina Häußge
8151e617cc Merge branch 'maintenance' of github.com:foosel/OctoPrint into maintenance 2016-01-25 14:41:52 +01:00
Gina Häußge
1e429606e1 Only trigger drag overlay for files, not texts 2016-01-25 14:39:48 +01:00
Gina Häußge
7fbfaadc21 Do not read no return value as "False" return value for onServerDisconnect 2016-01-25 13:51:46 +01:00
Gina Häußge
814355e281 Do not show drag-n-drop overlay if server is offline 
Fixes #1196
 2016-01-25 13:51:10 +01:00
Gina Häußge
c720cc3a4a Added note to not misuse (feature) requests for support questions 2016-01-21 10:58:00 +01:00
Gina Häußge
3d34411025 Merge branch 'fix/disableSettingsSaveWhileBusy' into devel 
Conflicts:
	src/octoprint/static/js/app/viewmodels/settings.js
 2016-01-19 11:52:25 +01:00
Gina Häußge
660de61997 Merge remote-tracking branch 'origin/maintenance' into maintenance 2016-01-19 11:51:15 +01:00
Gina Häußge
f4b3206d49 Disable the settings dialog's save button while sending or receiving 2016-01-19 11:19:51 +01:00
Gina Häußge
4abfa6c3b3 Updated installation instructions 2016-01-13 17:12:41 +01:00
Gina Häußge
3b35d921d1 Merge branch 'fix/resetSettingsScrollPosition' into devel 2016-01-12 13:30:34 +01:00
Gina Häußge
2a059cf0cb Reset scroll position and selected tab in settings dialog 
Also added means to open settings dialog navigating directly to a specific tab
 2016-01-12 13:30:10 +01:00
Gina Häußge
4e84d62741 Reset scroll position and selected tab in about dialog 2016-01-12 11:00:35 +01:00
Gina Häußge
04bb262187 Fixed an issue with resolving various files as templates in source installs 
Missing _data prefix
 2016-01-12 10:59:48 +01:00
Gina Häußge
c44920c0f7 Updated used third party libraries & licenses 2016-01-11 16:46:36 +01:00
Gina Häußge
e4828450c9 Merge branch 'fix/slugifyFilenames' into devel 
Conflicts:
	setup.py
 2016-01-11 16:43:38 +01:00
Gina Häußge
7743372ee4 Slugify file names on local storage 
Just stripping anything non-ASCII leads to errors with UTF-8 only
filenames.

Closes #1181
 2016-01-11 16:42:05 +01:00
Gina Häußge
682dd902e6 Merge branch 'fix/refreshFilesButton' into devel 2016-01-11 15:42:06 +01:00
Gina Häußge
59027d349f Added button to refresh file list 
Also added tooltips for all three file list buttons
 2016-01-11 15:41:38 +01:00
Gina Häußge
e034e7c7e2 Merge branch 'fix/m114CustomControlExample' into devel 2016-01-05 11:49:33 +01:00
Gina Häußge
9fd8b09e34 Fixed custom control M114 example to also match negative coordinates 2016-01-05 11:48:55 +01:00
Gina Häußge
62a25767a3 Merge branch 'maintenance' into devel 2016-01-05 11:43:20 +01:00
Gina Häußge
450e24bbc2 Added missing AUTHORS.md entry 2016-01-05 11:42:38 +01:00
Gina Häußge
c020c7afe0 Merge branch 'master' of https://github.com/richjoyce/OctoPrint into pr/richjoyce/settings_remove_fix 2016-01-05 11:40:18 +01:00
Gina Häußge
5cdf45d218 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/static/js/app/viewmodels/loginstate.js
 2016-01-05 11:38:05 +01:00
Gina Häußge
384e150448 Fixed some whitespace 2016-01-05 11:32:55 +01:00
Gina Häußge
d4260468be Merge branch 'devel_knockout_bindings' of https://github.com/BillyBlaze/OctoPrint into pr/BillyBlaze/devel_knockout_bindings 2016-01-05 11:17:04 +01:00
Gina Häußge
a11774484e Merge branch 'files_sidebar' of https://github.com/BillyBlaze/OctoPrint into pr/BillyBlaze/files_sidebar 2016-01-05 11:04:24 +01:00
Gina Häußge
d3129a800f We also don't need the empty file anymore then 2016-01-05 10:56:13 +01:00
Richard Joyce
0d7965ebf1 Fix missing kwargs in PluginSettings remove 2016-01-04 09:25:58 -08:00
Paul de Vries
34ceb93509 Initialize loginUser and loginPass with an empty string 
Clear loginUser and loginPass after a successful login (e.g. the user made a typo)
 2016-01-03 22:02:49 +01:00
Paul de Vries
645c2da7a5 Moved custom bindings from main.js to bindings/{bindingname}.js 
Added custom bindings files in the flask.py js list

Removed inline onclick with sliderToggle and made a custom binding
'toggleContent'

Add padding and line-height to intermediary heading for better readability
 2015-12-30 17:54:22 +01:00
Paul de Vries
b987e2ac7d Remove 'folder' className to 'back' 2015-12-25 19:57:30 +00:00
Paul de Vries
1f878fefb0 Add .type as className for better styling 2015-12-25 19:50:26 +00:00
Paul de Vries
bff20bf4d9 If dynamic LESS or CSS is empty then do not parse the jinja2 assets block 2015-12-25 18:28:28 +00:00
Paul de Vries
da1ae91d9a Remove XHTML and make it HTML5 valid 2015-12-25 18:12:44 +00:00
Paul de Vries
ff96642f82 Upgrade LESS v1.3.3 to v2.5.3 2015-12-25 18:12:14 +00:00
Gina Häußge
c120261e2b Increased backend fail counter for intermediary page 
Also made sure that baseURL always ends in a /
 2015-12-18 17:39:30 +01:00
Gina Häußge
f0acacec6a Intermediary page needs to remove fragments for baseUrl 
Otherwise image pinging won't work properly.
 2015-12-18 14:30:53 +01:00
Gina Häußge
86b96b8d4a Don't allow empty folder names 2015-12-17 16:56:09 +01:00
Gina Häußge
9b3e4f5c2a Properly capture StorageErrors 2015-12-17 16:48:02 +01:00
Gina Häußge
376c832b0b Fixed a ReferenceError when processing the SlicingProgress events 2015-12-17 13:57:39 +01:00
Gina Häußge
9fbe130169 Merge branch 'fix/aclFirstRun' into maintenance 2015-12-17 13:19:26 +01:00
Gina Häußge
7791f7751f Merge branch 'fix/aclFirstRun' into devel 
Conflicts:
	src/octoprint/server/__init__.py
	src/octoprint/server/api/__init__.py
	src/octoprint/server/views.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/firstrun.js
 2015-12-17 13:16:51 +01:00
Gina Häußge
b96d1b51e0 Disabled ACL is now tracked through enabled flag on UserManager 
That allows us to properly enable and disable it at runtime (during first run).
 2015-12-17 13:08:45 +01:00
Gina Häußge
22ae7fecf4 Merge branch 'fix/timeoutOnUnknownCommands' into devel 
Conflicts:
	src/octoprint/util/comm.py
 2015-12-17 10:45:33 +01:00
Gina Häußge
570c66b6f3 Trigger command processing on unknown commands 
We suffer from the same problem as commands being suppressed in the
send queue here. If a non-GCODE-command we send to the printer
produces no output, our _monitor loop will wait until the next response
produced by another command. Which we won't send though since
we are stuck waiting in the _monitor loop waiting for a response. Hence
we need to manually trigger further command processing from the
send loop here in order to ensure things keep going.
 2015-12-17 10:44:43 +01:00