#
# ChangeLog for src/sas in sasview
#
# Generated by Trac 1.0.1
# Dec 25, 2024 2:41:15 AM

Sat, 29 Sep 2018 00:33:22 GMT butler [863ac2c]
	* src/sas/sascalc/fit/pagestate.py (modified)

	Update fix to pagestate.py for ticket-1179 branch as per P. Kienzle

	Use ...


Fri, 28 Sep 2018 19:39:06 GMT krzywon [e9920cd]
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)

	Add SasView version to report files. refs #1179


Fri, 28 Sep 2018 18:08:27 GMT smk78 [1b4cb41]
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasview/local_config.py (modified)

	Added BAM to About box


Fri, 28 Sep 2018 17:24:02 GMT smk78 [94ce044]
	* src/sas/sasview/images/bam_logo.png (added)

	Add bam logo to sasview/src/sas/sasview/images


Fri, 28 Sep 2018 11:20:48 GMT smk78 [490f790]
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)

	Tweaks to corfunc_help.rst


Thu, 27 Sep 2018 16:37:09 GMT GitHub <noreply@…> [acdf0d1]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* LICENSE.TXT (modified)
	* docs/sphinx-docs/source/index.rst (modified)
	* docs/sphinx-docs/source/user/RELEASE.rst (added)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* installers/README-ABOUT-RELEASE-NOTES.txt (added)
	* installers/README-next-release.txt (deleted)
	* installers/README.txt (deleted)
	* src/sas/sascalc/corfunc/LICENSE.TXT (added)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified)
	* src/sas/sasview/local_config.py (modified)
	* src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (added)
	* src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (modified)

	Merge pull request #183 from SasView/bad_file_loader_fix

	Continue ...


Thu, 27 Sep 2018 10:42:39 GMT smk78 [dcca58d]
	* src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (modified)

	Updated tutorial


Wed, 26 Sep 2018 21:07:03 GMT krzywon [9c7e2b8]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)

	Keep file loader errors for each file together and separate files
	from ...


Wed, 26 Sep 2018 17:26:22 GMT smk78 [a9261ca]
	* src/sas/sasview/media/correlation_function_analysis_in_sasview_v4x.pdf (added)
	* src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (modified)

	Added new tutorial pdf and updated tutorial pdf


Wed, 26 Sep 2018 17:02:33 GMT smk78 [357a65a]
	* src/sas/sascalc/corfunc/LICENSE.TXT (added)

	Added /sasview/src/sas/sascalc/corfunc/LICENSE.TXT from GitHub


Wed, 26 Sep 2018 13:49:58 GMT smk78 [5652efc]
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)

	Changed text displayed from Long Period / 2 to Long Period


Mon, 24 Sep 2018 12:53:48 GMT krzywon [7ab3b79b]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)

	Put error(s) in an array rather than scalar to prevent iterating
	through ...


Fri, 21 Sep 2018 15:14:12 GMT smk78 [577460c]
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified)

	Inserted LF to improve formatting in Sphinx


Tue, 18 Sep 2018 17:27:13 GMT smk78 [8ac05a5]
	* docs/sphinx-docs/source/user/RELEASE.rst (added)
	* installers/README-ABOUT-RELEASE-NOTES.txt (added)
	* installers/RELEASE.txt (deleted)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/releasebox.py (deleted)
	* src/sas/sasview/local_config.py (modified)

	Implementing html Release Notes from Help menu.


Tue, 18 Sep 2018 13:38:26 GMT krzywon [009abcc]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)

	Continue loading remaining files if a single file cannot be loaded.


Mon, 17 Sep 2018 16:33:08 GMT smk78 [5e88e27c]
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/releasebox.py (added)
	* src/sas/sasview/local_config.py (modified)

	Create Release Notes option in Help Menu and popup box


Fri, 14 Sep 2018 14:26:06 GMT smk78 [5f08251]
	* src/sas/sasgui/guiframe/gui_manager.py (modified)

	Removed old commented text


Fri, 14 Sep 2018 11:18:54 GMT smk78 [bb008fd]
	* src/sas/sasgui/guiframe/gui_manager.py (modified)

	Redirect Help >> Tutorial to Documentation tutorials page


Thu, 13 Sep 2018 18:46:42 GMT krzywon [8a1f574]
	* src/sas/sasview/test/1d_data/cansas1d.xsl (deleted)

	Remove unneccessary xsl file from test 1D data folder.


Wed, 12 Sep 2018 16:27:16 GMT smk78 [356af60e]
	* docs/sasview/.gitignore (added)
	* docs/sasview/README.txt (added)
	* src/sas/sasview/media/.gitignore (added)
	* src/sas/sasview/media/README.txt (modified)

	Added some README's to documentation/tutorial folders


Wed, 12 Sep 2018 13:03:07 GMT smk78 [65b99eb]
	* src/sas/sasview/media/Tutorial.pdf (added)
	* src/sas/sasview/media/basic_1d_fitting_in_sasview_v3x_4x.pdf (added)
	* src/sas/sasview/media/getting_started_with_sasview.pdf (added)
	* src/sas/sasview/media/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf (added)

	Updating shipped tutorials - step2


Wed, 12 Sep 2018 13:01:12 GMT smk78 [7495a56]
	* src/sas/sasview/media/Tutorial.pdf (deleted)
	* src/sas/sasview/media/getting_started_with_sasview.pdf (deleted)

	Replacing shipped tutorials - step1


Mon, 10 Sep 2018 17:26:03 GMT GitHub <noreply@…> [a4a1ac9]
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/guiframe/report_image_handler.py (added)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* .gitignore (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/rst_prolog (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)
	* src/sas/sasview/__init__.py (modified)
	* src/sas/sasview/local_config.py (modified)
	* src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_RT2.xml (added)
	* src/sas/sasview/test/1d_data/Ludox_silica.xml (added)
	* src/sas/sasview/test/1d_data/cansas1d.xsl (added)

	Merge pull request #172 from SasView/ticket-1166

	Fix for report ...


Mon, 10 Sep 2018 13:15:01 GMT krzywon [44e8f48]
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)

	Be sure image handler is initialized in invariant panel and code ...


Sun, 09 Sep 2018 15:35:35 GMT butler [b4398819]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Fix blank page when clicking help on a plugin model

	Addresses #529.  ...


Sun, 09 Sep 2018 10:15:43 GMT ajj [b229a3b]
	* docs/sphinx-docs/source/conf.py (modified)
	* src/sas/sasview/__init__.py (modified)
	* src/sas/sasview/local_config.py (modified)

	Updating version numbers and DOI for 4.2 release


Sun, 09 Sep 2018 09:25:43 GMT smk78 [346745a]
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)

	Overhauled slit_calculator_help. Fixes #897


Thu, 06 Sep 2018 18:11:25 GMT krzywon [d0ce666f]
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/guiframe/report_image_handler.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)

	Remove image references when report is closed and point to correct
	file ...


Thu, 06 Sep 2018 14:58:01 GMT krzywon [fa412df]
	* src/sas/sasgui/guiframe/report_image_handler.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)

	Simplify calling image handler and add documentation.


Thu, 06 Sep 2018 14:44:42 GMT smk78 [8b727a9]
	* src/sas/sasview/test/1d_data/Ludox_silica.xml (added)

	Added dataset to \test\1d_data


Thu, 06 Sep 2018 13:13:35 GMT krzywon [ec4b19c]
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)

	Apply image handler to invariant report generation and fix issue with ...


Thu, 06 Sep 2018 08:51:17 GMT smk78 [e6d309c]
	* src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_RT2.xml (added)
	* src/sas/sasview/test/1d_data/cansas1d.xsl (added)

	Add example 1d data with dQ to \test\1d_data


Wed, 05 Sep 2018 19:04:17 GMT krzywon [0cf4f84]
	* src/sas/sasgui/guiframe/report_image_handler.py (added)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Create base report image handler for all images and modify fitting to ...


Tue, 04 Sep 2018 15:38:42 GMT Paul Kienzle <pkienzle@…> [170b251]
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)

	sphinx superscripts/subsitution don't work in *emphasized text*


Mon, 03 Sep 2018 09:58:43 GMT butler [9bf40e7]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	fix typo in docs


Sat, 25 Aug 2018 02:11:19 GMT butler [76939a6]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	more MacOS panel size tweak


Sat, 25 Aug 2018 01:51:28 GMT butler [c4d9a3e]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	tweak mac panel width


Fri, 24 Aug 2018 23:51:43 GMT butler [643efb5]
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)

	Minor edits to sli_calcutaor_help.rst

	Fix superscript on TM .. but ...


Fri, 24 Aug 2018 19:51:39 GMT butler [7277f81]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	Fix sum|multiply help string for sum.


Mon, 20 Aug 2018 04:10:48 GMT butler [388aefb]
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (modified)

	Add warning to OpenCL dialog

	Add note that "No OpenCL" will not run ...


Mon, 13 Aug 2018 20:47:22 GMT GitHub <noreply@…> [ec52ea1]
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)
	* installers/README-next-release.txt (modified)
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)

	Merge pull request #164 from SasView/ticket-1132

	Load data for slit ...


Mon, 13 Aug 2018 19:47:15 GMT GitHub <noreply@…> [3bfcd9e]
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* installers/README-next-release.txt (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)

	Merge pull request #161 from SasView/ticket-1142-plugin-reload

	Ticket ...


Thu, 09 Aug 2018 23:20:21 GMT GitHub <noreply@…> [636cf8d]
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)

	Merge pull request #162 from SasView/beta_load_project

	Beta Load ...


Thu, 09 Aug 2018 18:10:33 GMT Paul Kienzle <pkienzle@…> [e2663b7]
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)

	remove cached model before attempting reload.  Refs #1142


Wed, 08 Aug 2018 19:38:17 GMT krzywon [d788619]
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)

	Use first data object from list when loading slit length data files.


Wed, 08 Aug 2018 15:34:31 GMT GitHub <noreply@…> [cd59dc5]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)

	Merge pull request #159 from SasView/ticket-1139

	Batch slicer ...


Fri, 03 Aug 2018 14:15:27 GMT Paul Kienzle <pkienzle@…> [de68f78]
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)

	Batch slicer documentation minor revisions.


Wed, 01 Aug 2018 13:51:17 GMT krzywon [59873e1]
	* src/sas/sascalc/fit/pagestate.py (modified)

	Remove any non-numeric characters from the version number when
	loading ...


Mon, 30 Jul 2018 14:25:32 GMT Paul Kienzle <pkienzle@…> [fa374b0]
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)

	Save before pushing... Fixes #1142


Mon, 30 Jul 2018 14:22:14 GMT Paul Kienzle <pkienzle@…> [2a6058c]
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)

	fix broken plugin model tests. Fixes #1142


Thu, 26 Jul 2018 12:06:56 GMT krzywon [bd5c3b1]
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)

	Use q_mean from ABS files to match Igor analysis.


Wed, 25 Jul 2018 19:58:41 GMT krzywon [3d86118]
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)

	Batch slicer documentation revisions.


Wed, 25 Jul 2018 18:56:21 GMT krzywon [ddb036e5]
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)

	Add batch slicing documentation.


Wed, 25 Jul 2018 18:54:43 GMT krzywon [a20a255]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified)

	Add a help button to the slicer parameters panel.


Fri, 06 Jul 2018 01:22:42 GMT butler [a8bbba2]
	* docs/sphinx-docs/source/conf.py (modified)
	* installers/README.txt (modified)
	* src/sas/sasview/__init__.py (modified)

	Preparing 4.2.0-beta release

	Changed version numbers and date.  First ...


Mon, 25 Jun 2018 15:58:51 GMT krzywon [dabcaf7]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Change error boxes to match style of other non-modifiable boxes in ...


Mon, 18 Jun 2018 20:43:00 GMT krzywon [8a51dea0]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Run Layout on the fitpage during data and dispersity changes to fix ...


Mon, 11 Jun 2018 13:30:11 GMT GitHub <noreply@…> [316b9c1]
	* src/sas/sasview/sasview.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* test/corfunc/test/utest_corfunc.py (modified)

	Merge pull request #155 from SasView/ticket-1084

	Checking cc compiler ...


Sun, 03 Jun 2018 10:33:35 GMT GitHub <noreply@…> [9258c43c]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* build_tools/requirements.txt (modified)
	* setup.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sasdataloader/test/FEB18012.ASC (added)
	* test/sasdataloader/test/test_data/TestExtensions (added)
	* test/sasdataloader/test/test_data/TestExtensions.asc (added)
	* test/sasdataloader/test/test_data/TestExtensions.notxml (added)
	* test/sasdataloader/test/test_data/TestExtensions.nxs (added)
	* test/sasdataloader/test/test_data/TestExtensions.xml (added)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (modified)

	Merge pull request #151 from SasView/ticket885b

	Ticket885b

	This ...


Thu, 31 May 2018 04:13:42 GMT butler [8b89396]
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)

	Edit docs to reflect change on polydisperse parameters.


Tue, 15 May 2018 10:04:36 GMT wojciech [1270e3c]
	* src/sas/sasview/sasview.py (modified)

	Improved message text


Mon, 14 May 2018 09:36:59 GMT wojciech [fac42cf]
	* src/sas/sasview/sasview.py (modified)

	some additional code clean-up


Mon, 14 May 2018 09:05:15 GMT wojciech [e979ad4]
	* src/sas/sasview/sasview.py (modified)

	Clean-up and modality change


Mon, 14 May 2018 08:41:00 GMT wojciech [8faef63]
	* src/sas/sasview/sasview.py (modified)

	Moved dialog to SasView class to avoid calling wx.App twice


Wed, 09 May 2018 07:38:59 GMT wojciech [d55e750]
	* src/sas/sasview/sasview.py (modified)

	Added OpenCL info


Mon, 07 May 2018 08:34:11 GMT wojciech [aadfd693]
	* src/sas/sasview/sasview.py (modified)

	final message improvement


Mon, 07 May 2018 08:08:33 GMT wojciech [08707cc]
	* src/sas/sasview/sasview.py (modified)

	show the window fix


Mon, 07 May 2018 07:28:49 GMT wojciech [e810d8f]
	* src/sas/sasview/sasview.py (modified)

	show the window fix


Mon, 07 May 2018 07:11:18 GMT wojciech [2bd0e4a]
	* src/sas/sasview/sasview.py (modified)

	string formatting


Mon, 07 May 2018 07:05:48 GMT wojciech [49f9f9e]
	* src/sas/sasview/sasview.py (modified)

	clean-up


Mon, 07 May 2018 07:03:27 GMT wojciech [18b98f3]
	* src/sas/sasview/sasview.py (modified)

	clean-up


Mon, 07 May 2018 06:47:10 GMT wojciech [20610f5]
	* src/sas/sasview/sasview.py (modified)

	Improved dialog box


Thu, 03 May 2018 05:28:56 GMT wojciech [360eff3]
	* src/sas/sasview/sasview.py (modified)

	message box improved


Wed, 02 May 2018 12:15:59 GMT wojciech [47439ce]
	* src/sas/sasview/sasview.py (modified)

	Generic message box implemented to support position change of dialog


Wed, 02 May 2018 09:35:50 GMT wojciech [b80d945]
	* src/sas/sasview/sasview.py (modified)

	message box should stay on top


Wed, 02 May 2018 07:43:43 GMT wojciech [86d6abd]
	* src/sas/sasview/sasview.py (modified)

	message dialog added


Tue, 01 May 2018 13:08:09 GMT wojciech [f387050]
	* src/sas/sasview/sasview.py (modified)

	Supressing cc error, still requires improvement


Tue, 01 May 2018 12:51:46 GMT wojciech [c9bf97b]
	* src/sas/sasview/sasview.py (modified)

	Fixed error handling


Tue, 01 May 2018 12:42:33 GMT wojciech [d2647feb]
	* src/sas/sasview/sasview.py (modified)

	Logging support added


Tue, 01 May 2018 12:16:02 GMT wojciech [c82cf89]
	* src/sas/sasview/sasview.py (modified)

	Forcing cc check at installation that should trigger Xcode


Tue, 01 May 2018 09:36:38 GMT wojciech [f4161f7a]
	* src/sas/sasview/sasview.py (modified)

	Commenting error message out to see if this is a troublemaker


Tue, 01 May 2018 09:10:03 GMT wojciech [0a5d1a8]
	* src/sas/sasview/sasview.py (modified)

	Checked order for check, so error is raised from wx


Tue, 01 May 2018 08:48:25 GMT wojciech [1b068256]
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasview/sasview.py (modified)

	Merge branch 'master' of https://github.com/SasView/sasview into ...


Tue, 01 May 2018 07:58:51 GMT wojciech [666454e]
	* src/sas/sasview/sasview.py (modified)

	Checking cc compiler on OSX prior to sasmodel installation


Mon, 30 Apr 2018 21:12:46 GMT GitHub <noreply@…> [7d5e7da]
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Merge pull request #152 from llimeht/tmp/matplotlibwx

	Fix imports for ...


Mon, 30 Apr 2018 19:13:37 GMT krzywon [c192960]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	refs #1081 - Stop early exit of model parameter updates when
	dispersity ...


Sun, 22 Apr 2018 02:46:16 GMT Stuart Prescott <stuart@…> [1cf490b6]
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)

	Fix imports for matplotlib 2.2.2

	The wx backend no longer eposes both ...


Tue, 17 Apr 2018 13:29:25 GMT GitHub <noreply@…> [1176137]
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* build_tools/requirements.txt (modified)
	* setup.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* test/sasdataloader/test/FEB18012.ASC (added)
	* test/sasdataloader/test/test_data/TestExtensions (added)
	* test/sasdataloader/test/test_data/TestExtensions.asc (added)
	* test/sasdataloader/test/test_data/TestExtensions.notxml (added)
	* test/sasdataloader/test/test_data/TestExtensions.nxs (added)
	* test/sasdataloader/test/test_data/TestExtensions.xml (added)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (modified)

	Merge pull request #149 from SasView/ticket-1079

	Removing save button ...


Tue, 10 Apr 2018 09:20:57 GMT wojciech [91552b5]
	* src/sas/sasgui/guiframe/report_dialog.py (modified)

	Restoring save button for linux as it seems to be working


Mon, 09 Apr 2018 16:00:41 GMT krzywon [63ddc03]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasview/test/1d_data/10000A_sphere_dsm.xml (moved)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* test/sasdataloader/test/FEB18012.ASC (added)
	* test/sasdataloader/test/test_data/TestExtensions (added)
	* test/sasdataloader/test/test_data/TestExtensions.asc (added)
	* test/sasdataloader/test/test_data/TestExtensions.notxml (added)
	* test/sasdataloader/test/test_data/TestExtensions.nxs (added)
	* test/sasdataloader/test/test_data/TestExtensions.xml (added)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (modified)

	Merge branch 'master' into ticket-1068-2


Mon, 09 Apr 2018 08:46:38 GMT wojciech [3b070a0]
	* src/sas/sascalc/fit/pagestate.py (modified)

	fixed imaged width for win


Mon, 09 Apr 2018 08:07:25 GMT wojciech [47c44f0]
	* src/sas/sascalc/fit/pagestate.py (modified)

	Reverting Windows page layout


Thu, 05 Apr 2018 07:26:35 GMT wojciech [a8e368b]
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)

	Fixing width for printing


Thu, 05 Apr 2018 06:10:18 GMT wojciech [062c9ea]
	* src/sas/sasgui/guiframe/report_dialog.py (modified)

	removed save button again as it doesn't work from installer. Print ...


Wed, 04 Apr 2018 20:14:46 GMT wojciech [5818dae]
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Reverted save button as potential solution to the problem has been
	found


Mon, 02 Apr 2018 21:22:17 GMT gonzalezm [d247504b]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	Remove template for PD parameters


Mon, 02 Apr 2018 08:34:54 GMT gonzalezm [5501189]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	Simple editor without PD parameters


Tue, 27 Mar 2018 16:05:36 GMT krzywon [4a8d55c]
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* test/sasdataloader/test/test_data/TestExtensions (added)
	* test/sasdataloader/test/test_data/TestExtensions.asc (added)
	* test/sasdataloader/test/test_data/TestExtensions.notxml (added)
	* test/sasdataloader/test/test_data/TestExtensions.nxs (added)
	* test/sasdataloader/test/test_data/TestExtensions.xml (added)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (modified)

	Propagate through loader when errors are thrown regardless of the
	error. ...


Mon, 26 Mar 2018 08:57:13 GMT wojciech [2a24d55]
	* src/sas/sasgui/guiframe/report_dialog.py (modified)

	Removing report button from OSX


Mon, 19 Mar 2018 10:23:58 GMT GitHub <noreply@…> [85d98e2]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	Merge pull request #145 from SasView/ticket-930ChiSquaredDoc

	Ticket 930 ...