summaryrefslogtreecommitdiff
path: root/src/sardana
Commit message (Expand)AuthorAge
* Reset tango dicts on set_datazreszela2020-09-16
* Remove unused initialized flagzreszela2020-09-16
* Fix merge from master to release-Jul20zreszela2020-09-16
* Merge pull request #1413 from dschick/fix-scanstats-fwhmreszelaz2020-09-14
|\
| * fix FWHM for erf-like function with negative derivativeDaniel Schick2020-09-14
| * fix FWHM calculationDaniel Schick2020-09-14
* | Merge pull request #1412 from MaxIV-KitsControls/wa_macro_dial_none_fixÁureo Freitas2020-09-14
|\ \ | |/ |/|
| * parse dial position to nan in wa macro if motor position is NoneAbdullah Amjad2020-09-14
* | Merge branch 'master' into release-Jul20Áureo Freitas2020-09-11
|\ \
| * | Correct version number in the codereszelaz2020-08-11
| * | Bump version 2.8.6-alpha to 2.8.6Jordi Andreu2020-08-10
| * | Bump version 2.8.5 to 2.8.6-alphaJordi Andreu2020-08-10
| * | Fix MacroButton with repeat parameters (#1172)zreszela2020-08-10
| * | Bump version 2.8.5-alpha to 2.8.5Jordi Andreu2020-04-27
| * | Bump version 2.8.4 to 2.8.5-alphaJordi Andreu2020-04-27
| * | MeasurementGroup's configurations created with Taurus3 were supposedzreszela2020-04-27
| * | Fix meas grp configuration URIs back compatzreszela2020-04-27
| * | Small flake8 fixAntonio Milan Otero2019-11-13
| * | Merge pull request #2 from tiagocoutinho/hotfix-2.8.4amilan2019-11-08
| |\ \
| | * | Fix compatibility with python 2.6Jose Tiago Macara Coutinho2019-11-07
| * | | Fix flake8zreszela2019-11-06
| * | | Add backwards compatibility for nr_pointszreszela2019-11-06
| * | | Rename nr_points to nb_points in scanszreszela2019-11-06
| * | | Add tests for fscanzreszela2019-11-06
| * | | Fix issue 1218.Antonio Milan Otero2019-11-06
| * | | Bump version 2.8.4-alpha to 2.8.4Antonio Milan Otero2019-11-05
| * | | Bump version 2.8.3 to 2.8.4-alphaAntonio Milan Otero2019-11-05
| |/ /
* | | Update version in deprecation messageszreszela2020-09-08
* | | Bump version 3.0.3-alpha to 3.0.3zreszela2020-09-08
* | | Bump version 3.0.2 to 3.0.3-alphazreszela2020-09-08
* | | fix flake8zreszela2020-09-08
* | | Avoid Synchronizer and Synchronization problems with non-timerable channelszreszela2020-09-08
* | | Make certain columns editable for timerable channels onlyzreszela2020-09-08
* | | Merge pull request #1402 from reszelaz/protect_scanstatsreszelaz2020-09-07
|\ \ \
| * | | Do not calculate stats on 1D and 2D channelszreszela2020-08-28
| * | | Prevent scanstats when no moveable involved in the scanzreszela2020-08-28
* | | | Merge remote-tracking branch 'upstream/develop' into release-Jul20zreszela2020-09-07
|\ \ \ \ | | |_|/ | |/| |
| * | | Correct sphinx warningszreszela2020-09-07
| * | | Add copyright headerzreszela2020-09-06
| * | | Remove legacy qtconsole code from spockzreszela2020-09-06
| * | | Add note about experimental featurezreszela2020-09-06
| * | | Merge branch 'develop' into qtspockzreszela2020-09-04
| |\ \ \
| * | | | Remove compatibility with Python 3.2 or earlierTim Schoof2019-08-19
| * | | | Fix message on status barzreszela2019-08-12
| * | | | Improve storing of Taurus settingszreszela2019-08-12
| * | | | Fix storing of model name in Taurus settingszreszela2019-08-12
| * | | | Fix bug introduced in juypter-client 5.2.3Tim Schoof2019-08-12
| * | | | Add runMacro method to QtSpock for executing macro nodesTim Schoof2019-08-12
| * | | | Fix QtSpock GUI testsTim Schoof2019-08-12
| * | | | Only restart kernel when new model differs from old modelTim Schoof2019-08-09