Teja f2054a1bc3 somehow resolved the merge conflicts		2015-01-23 21:32:57 +01:00
..
filemanager	Merge branch 'mrbeam' into update_merge	2015-01-22 17:51:28 +01:00
plugin	Fixed a documentation bug	2015-01-19 11:15:09 +01:00
plugins	somehow resolved the merge conflicts	2015-01-23 21:32:57 +01:00
printer	somehow resolved the merge conflicts	2015-01-23 21:32:57 +01:00
server	somehow resolved the merge conflicts	2015-01-23 21:32:57 +01:00
slicing	Fetch estimated print time from cura slicing result, create print time statistics per printer profile, interpolate between stats and live estimation during printing for print time left	2014-12-17 17:31:30 +01:00
static	somehow resolved the merge conflicts	2015-01-23 21:32:57 +01:00
templates	somehow resolved the merge conflicts	2015-01-23 21:32:57 +01:00
translations	[i18n] Translation update	2014-12-18 15:15:23 +01:00
util	Merge remote-tracking branch 'upstream/devel' into update_merge	2015-01-23 11:37:47 +01:00
__init__.py	Versioning by versioneer: https://github.com/warner/python-versioneer/	2014-06-22 01:12:06 +02:00
_version.py	Fixed a couple of more missing branch fields and added Changelog entry	2014-11-04 10:07:46 +01:00
daemon.py	Renamed delpid to term to better match its modified behavior. Moved the registration of the SIGTERM handler to avoid an extremely unlikely race condition.	2015-01-10 01:34:47 -08:00
events.py	Added exception logging for event bus worker loop	2015-01-19 12:13:04 +01:00
settings.py	Merge remote-tracking branch 'upstream/devel' into update_merge	2015-01-23 11:37:47 +01:00
timelapse.py	Only decrement the image counter if it is set and larger than 0	2014-12-28 00:19:55 +01:00
users.py	Properly recognize app session keys everywhere. Also fixed a bug where the ApiUser was not properly provisioned with his roles.	2014-11-14 17:58:42 +01:00