Merge remote-tracking branch 'upstream/master'
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- bin/12IDB/dm-12idb-daq 18 additions, 0 deletionsbin/12IDB/dm-12idb-daq
- bin/12IDB/dm-12idb-upload 18 additions, 0 deletionsbin/12IDB/dm-12idb-upload
- doc/RELEASE_NOTES.txt 14 additions, 0 deletionsdoc/RELEASE_NOTES.txt
- etc/daq-web-service.conf.template 4 additions, 3 deletionsetc/daq-web-service.conf.template
- sbin/11IDB/dm_11idb_system_test_daq.sh 1 addition, 1 deletionsbin/11IDB/dm_11idb_system_test_daq.sh
- sbin/11IDB/dm_11idb_system_test_upload.sh 1 addition, 1 deletionsbin/11IDB/dm_11idb_system_test_upload.sh
- sbin/11IDC/dm_11idc_system_test_daq.sh 1 addition, 1 deletionsbin/11IDC/dm_11idc_system_test_daq.sh
- sbin/11IDC/dm_11idc_system_test_upload.sh 1 addition, 1 deletionsbin/11IDC/dm_11idc_system_test_upload.sh
- sbin/12IDB/dm_12idb_system_test_daq.sh 6 additions, 0 deletionssbin/12IDB/dm_12idb_system_test_daq.sh
- sbin/12IDB/dm_12idb_system_test_upload.sh 6 additions, 0 deletionssbin/12IDB/dm_12idb_system_test_upload.sh
- sbin/17BM/dm_17bm_system_test_daq.sh 1 addition, 1 deletionsbin/17BM/dm_17bm_system_test_daq.sh
- sbin/17BM/dm_17bm_system_test_upload.sh 1 addition, 1 deletionsbin/17BM/dm_17bm_system_test_upload.sh
- sbin/dm_remove_catalog_duplicates.sh 3 additions, 3 deletionssbin/dm_remove_catalog_duplicates.sh
- sbin/dm_station_upgrade_stage4.sh 1 addition, 1 deletionsbin/dm_station_upgrade_stage4.sh
- src/python/dm/aps_beamline_tools/gui/dmStationUi.py 45 additions, 5 deletionssrc/python/dm/aps_beamline_tools/gui/dmStationUi.py
- src/python/dm/aps_beamline_tools/gui/images/settings.svg 63 additions, 0 deletionssrc/python/dm/aps_beamline_tools/gui/images/settings.svg
- src/python/dm/aps_beamline_tools/gui/settingsTab.py 106 additions, 0 deletionssrc/python/dm/aps_beamline_tools/gui/settingsTab.py
- src/python/dm/common/objects/daqInfo.py 2 additions, 1 deletionsrc/python/dm/common/objects/daqInfo.py
- src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py 0 additions, 5 deletions.../dm/common/processing/plugins/mongoDbFileCatalogPlugin.py
Loading
Please register or sign in to comment