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

4441 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Werner
2df4da2af0 Merge pull request #90 from Gallore/f_swupdate_bitbucket 
F swupdate bitbucket
 2017-05-02 11:30:45 +02:00
Andy Werner
6d00f05b0b Merge branch 'f_bitbucket_swupdate' into f_swupdate_bitbucket 2017-05-02 11:29:59 +02:00
Andy Werner
72da1fb0e7 Software update plugin: added check_type bitbucket_commit 2017-05-02 11:11:54 +02:00
Andy Werner
4700b1a69f Merge branch 'f_bitbucket_swupdate' of github.com:mrbeam/OctoPrint into f_bitbucket_swupdate 2017-04-28 18:14:05 +02:00
make-ing
c45e3d7c73 # This is a combination of 2 commits. 
# This is the 1st commit message:

added our own mrbeam2 branches to allow for tag lookup.

# This is the commit message #2:

Added check_type 'bitbucket_commit' to softwareupdate plugin
 2017-04-28 18:10:00 +02:00
Andy Werner
550c032e37 testing bitbucket_commit 2017-04-28 16:40:20 +02:00
make-ing
fa5260a9ff added our own mrbeam2 branches to allow for tag lookup. 2017-04-12 10:42:23 +02:00
Gina Häußge
0a69dbeddb Preparing release of 1.3.2 2017-03-16 13:08:31 +01:00
Gina Häußge
1c132c39ad Preparing release of 1.3.2rc1 2017-03-10 14:35:11 +01:00
Gina Häußge
7114462024 Fixed python setup.py babel_compile 2017-03-10 14:24:49 +01:00
Gina Häußge
11b96005a9 And some more rewording in CONTRIBUTING.md 2017-03-10 14:00:31 +01:00
Gina Häußge
fea6b5096c Some more rewording in the README 2017-03-10 13:53:35 +01:00
Gina Häußge
40e2fa6bf4 Updated README to include safe mode, version badge & some rewording 2017-03-10 13:52:18 +01:00
Gina Häußge
3006bde972 octoprint --safe -> octoprint serve --safe 2017-03-10 13:51:44 +01:00
Gina Häußge
c7ae580c54 Updated PR template for whitelisted maintenance branch 2017-03-10 13:35:10 +01:00
Gina Häußge
55762ee71a Documentation updated for safe mode feature 2017-03-10 13:34:55 +01:00
Gina Häußge
ebae1b475b Don't apply navbar gradient to dropdown entries 2017-03-10 12:49:21 +01:00
Gina Häußge
61fbde4e51 Manual test plugin for parts of the update mechanism 2017-03-10 12:01:09 +01:00
Gina Häußge
6e793c2ba3 Don't mark "can't clean" messages from setup.py clean as error 
Might confuse users to see that marked up like an error when it's
perfectly normal for some kinds of installs simply because the
specific build folders never were created in the first place.
 2017-03-10 11:36:49 +01:00
Gina Häußge
b38884db63 Removed an obsolete (and broken) method from PipCaller 2017-03-10 11:20:13 +01:00
Gina Häußge
a49772fcf3 Removed bits from clean command made redundant by #732 
Force --all on stock clean command unless --orig is specified, in
which case "python setup.py clean" behaves like the stock clean
command. Additionally there are now --noeggs to skip egg deletion and
--nopyc to skip pyc deletion.
 2017-03-09 18:41:55 +01:00
Gina Häußge
052796d5d2 Merge branch 'feature/inherit-clean' of https://github.com/DanLipsitt/OctoPrint into improve/cleanCommand 2017-03-09 18:40:50 +01:00
Gina Häußge
559238ca3c More solid parsing of line number from resends 
Matches:

  * Resend:23
  * Resend:N23
  * Resend:N:23
  * rs 23
  * rs N23
  * rs N:23
  * rs N23 Expected checksum 109

Based on issue reported via PR #300
 2017-03-09 17:08:01 +01:00
Gina Häußge
fa16037e9a Unit test for M115 response parsing 2017-03-09 16:39:16 +01:00
Gina Häußge
d298c3c672 Apply analysis throttle only every n lines 
Default n = 100, configurable via config.yaml. Should make analysis a
bit faster while still giving the Pi air to breathe.
 2017-03-09 15:38:52 +01:00
Gina Häußge
d7b29a8725 Added @kantlivelong to AUTHORS.md 2017-03-09 15:36:26 +01:00
Gina Häußge
136736d307 Reset line numbers if printer sends "start" when operational 
Might have been an external reset of the printer we didn't otherwise
detect, and unless we reset the line numbers we'll now be off and run
into resend requests.

Solves #1676
 2017-03-09 14:35:07 +01:00
Shawn Bruce
5d1a0eaa16 Only reset scroll position for settings content. (Fixes #1812) 
(cherry picked from commit 5c81833)
 2017-03-09 11:57:08 +01:00
Gina Häußge
2d9c16e859 Allow PRs against maintenance for bug fixes 2017-03-09 11:49:55 +01:00
Andy Werner
8a4934e6f8 Fix an issue in user settings 
* UserSettings: crashed if overwrite an existing key with primitive value by same key with complex value. Also reduced number of calls to user.get_setting()

* Updated tests

(cherry picked from commit b75b53d)
 2017-03-08 18:11:36 +01:00
Gina Häußge
a0e5f79483 Only load file into GCODE viewer when that is actually visible 
Reduces needed bandwidth on page load, might help to mitigate
bandwidth related issues described in #1241.
 2017-03-08 18:03:16 +01:00
Gina Häußge
ef6159cc96 Applied text changes proposed by @seigel in #1735 2017-03-06 15:51:14 +01:00
Gina Häußge
ab42cc2a7f Better error resilience against garbage history data from plugins 
See #1805
 2017-03-06 15:32:30 +01:00
Gina Häußge
01cffafe77 Fixed documentation of printer profile API 
Closes #1732
 2017-03-06 14:36:43 +01:00
Gina Häußge
d8f2630fd4 Don't call onUserLoggedIn/Out on user reload 2017-03-06 14:11:41 +01:00
Gina Häußge
811c91955c Fix for new user settings getting lost until restart 
On reload of the user settings a new user object was created but not
updated on the associated session user(s). That let to session user
(s) still referring to the old user instances with the only partially
updated user settings.

Behaviour changed such that on a reload of the users from file
(including user settings) all registered session users will now get
their reference updated as well.

Also made modelling of user id to session id a bit less redundant.
 2017-03-06 14:02:39 +01:00
Gina Häußge
01ebf8fba7 Fix for two timing sensitive unit tests 2017-03-06 11:54:03 +01:00
Gina Häußge
2dcd6e02b1 Remove webapp headers to play nice with Safari's session handling 
Solves #1792
 2017-03-06 11:37:00 +01:00
Gina Häußge
d845257cf4 Fixed caching of main page 
Got broken by 62890ef73a
 2017-03-01 18:28:37 +01:00
Gina Häußge
c765e6e228 Revert "Only do lookup by userid if session is None" 
This reverts commit f02fac20ed.

The commit turned out to nuke the "remember me" functionality.
 2017-03-01 15:49:19 +01:00
Gina Häußge
20e1219d9e Virtual printer: configurable ok format 2017-03-01 15:48:36 +01:00
Gina Häußge
14120f732b Only check if we need to close login dropdown if it's open 2017-02-28 10:00:51 +01:00
Gina Häußge
b7e2b0f794 Fixed login dropdown not auto closing on click outside of it 
When two wrongs make one right...
 2017-02-28 09:54:36 +01:00
Gina Häußge
f02fac20ed Only do lookup by userid if session is None 2017-02-27 15:51:24 +01:00
Gina Häußge
30e962b447 Merge branch 'maintenance' into devel 2017-02-24 15:28:01 +01:00
Gina Häußge
755bcaa311 Add current path to "Back" button in file list 
Closes #1712
 2017-02-24 15:05:26 +01:00
Gina Häußge
aab98a7c9f Disable "Slice" button when printing and local slicer is selected 
Solves #1631
 2017-02-24 13:21:33 +01:00
Gina Häußge
3a984d41ff Remove color option in printer profile editor 
We don't use it anywhere and its presence keeps confusing users. Kept
in the model since we might want to use it at some later time.

Closes #1790
 2017-02-24 12:38:37 +01:00
Gina Häußge
28d01e2fa6 Disable external heatup detection until firmware is detected 2017-02-24 12:32:05 +01:00
Gina Häußge
2198add8e6 SWU: Refresh cache on startup & prevent concurrent refresh & fix hash 2017-02-24 11:56:02 +01:00