|
|
0a1c4992e2
|
Merge branch 'main-rc' into b4.1.1
4.1.1
|
2020-11-30 17:12:26 +01:00 |
|
|
|
59b56c764f
|
Merge branch 'main-rc' into b4.1.0
4.1.0
|
2020-11-30 17:09:23 +01:00 |
|
|
|
ff7afd0de7
|
Merge branch 'main-rc' into b4.0.2
4.0.2
|
2020-11-30 17:05:39 +01:00 |
|
|
|
835e62425f
|
Merge branch 'main-rc' into b4.0.1
4.0.1
|
2020-11-30 17:03:16 +01:00 |
|
|
|
c8cdbfc488
|
Merge branch 'main-rc' into b4.0.0
4.0.0
|
2020-11-30 17:00:57 +01:00 |
|
|
|
2f75143245
|
Merge branch 'main-rc' into b3.1.5
3.1.5
|
2020-11-30 16:58:53 +01:00 |
|
|
|
6f7c31b747
|
Merge branch 'main-rc' into b3.1.4
3.1.4
|
2020-11-30 16:57:17 +01:00 |
|
|
|
75c2d987c4
|
Merge branch 'main-rc' into b3.1.3
3.1.3
|
2020-11-30 16:56:01 +01:00 |
|
|
|
726f5eba29
|
Merge branch 'main-rc' into b3.1.2
3.1.2
|
2020-11-30 16:54:56 +01:00 |
|
|
|
4404ee717a
|
Merge branch 'main-rc' into b3.1.1
3.1.1
|
2020-11-30 16:52:52 +01:00 |
|
|
|
54530ab103
|
Merge branch 'main-rc' into b3.1.0
3.1.0
|
2020-11-30 16:50:15 +01:00 |
|
|
|
6126780660
|
Merge branch 'main-rc' into b3.0.1
3.0.1
|
2020-11-30 16:45:00 +01:00 |
|
|
|
9b7f9b1be1
|
Merge branch 'main-rc' into b3.0.0
3.0.0
|
2020-11-30 16:42:35 +01:00 |
|
|
|
26c829d766
|
Merge branch 'main-rc' into b2.3.4
2.3.4
|
2020-11-30 16:38:04 +01:00 |
|
|
|
3fde5c5b55
|
Merge branch 'main-rc' into b2.3.3
2.3.3
|
2020-11-30 16:36:24 +01:00 |
|
|
|
3e5f546ebe
|
Merge branch 'main-rc' into b2.3.2
2.3.2
|
2020-11-30 16:26:44 +01:00 |
|
|
|
9833a7d330
|
Merge branch 'main-rc' into b2.3.1
2.3.1
|
2020-11-30 16:25:23 +01:00 |
|
|
|
8f9155e578
|
Merge branch 'main-rc' into b2.3.0
2.3.0
|
2020-11-30 16:23:50 +01:00 |
|
|
|
9df1eac3c1
|
Merge branch 'main-rc' into b2.2.0
2.2.0
|
2020-11-30 15:46:45 +01:00 |
|
|
|
5ededf9be4
|
Merge branch 'main-rc' into b2.1.1
2.1.1
|
2020-11-30 15:16:57 +01:00 |
|
|
|
3e8774798a
|
Merge branch 'main-rc' into b2.1.0
2.1.0
|
2020-11-30 15:13:43 +01:00 |
|
|
|
a5f0f6eb34
|
Merge branch 'main' into test
|
2020-11-20 14:28:29 +01:00 |
|
|
|
62c86f56b1
|
Merge branch 'main' into test
|
2020-11-20 14:27:25 +01:00 |
|
|
|
77080a524a
|
Merge branch 'main' into test
|
2020-11-20 14:26:37 +01:00 |
|
|
|
3dce1e46f9
|
Merge branch 'main' into test
|
2020-11-20 14:25:45 +01:00 |
|
|
|
08ecc1e52d
|
Merge branch 'main' into test
|
2020-11-20 14:24:14 +01:00 |
|
|
|
8c1974b34e
|
Merge branch 'main' into test
|
2020-11-20 14:13:20 +01:00 |
|
|
|
d89d349247
|
Merge branch 'main' into test
|
2020-11-20 14:10:35 +01:00 |
|
|
|
910961cf41
|
Merge branch 'main' into test
|
2020-11-20 14:05:53 +01:00 |
|
|
|
595b7aa5e8
|
Merge branch 'main' into test
|
2020-11-20 14:03:36 +01:00 |
|
|
|
f72ad4326f
|
Merge branch 'main' into test
|
2020-11-20 14:00:47 +01:00 |
|
|
|
2306e44ae3
|
Merge branch 'main' into test
|
2020-11-20 13:02:36 +01:00 |
|
Gemma Tinti
|
9649982932
|
sw trigger with acquire and parameter file understands submodules
|
2020-01-15 11:22:40 +01:00 |
|
Erik Frojdh
|
eca2836703
|
Merge branch '4.1.1' of github.com:slsdetectorgroup/slsDetectorPackage into 4.1.1
|
2020-01-14 16:25:57 +01:00 |
|
Erik Frojdh
|
d14c9600bb
|
conda version
|
2020-01-14 16:24:10 +01:00 |
|
|
|
42971c94b7
|
updated versioning
|
2020-01-14 16:16:45 +01:00 |
|
|
|
b0fd4f4c44
|
updated release doc
|
2020-01-14 16:11:24 +01:00 |
|
|
|
06473cfcb2
|
bug fix: software trigger using control connect
|
2020-01-14 13:59:08 +01:00 |
|
|
|
6f2aad3836
|
updated temporary versioning
|
2020-01-06 19:01:44 +01:00 |
|
|
|
38aad40fef
|
read/write of config/parameter file rewritten so that parameter file can take in slsdetector level commands
|
2020-01-06 18:16:41 +01:00 |
|
|
|
51c5520472
|
unregistering call back, detangling receiver streaming from callback
|
2020-01-06 11:51:19 +01:00 |
|
|
|
75838f77b3
|
unregistering call back, detangling receiver streaming from callback
|
2020-01-06 11:50:08 +01:00 |
|
|
|
54bedeaa0a
|
software trigger via stop server instead of control server for sls_detector_acquire
|
2020-01-06 11:31:05 +01:00 |
|
|
|
b33b2edbd0
|
bug fix: locks in acquire
|
2020-01-06 11:29:11 +01:00 |
|
Erik Frojdh
|
f7cb2b5dcd
|
conda pkg
|
2019-10-08 12:48:51 +02:00 |
|
Dhanya Thattil
|
9ea3cbc8f1
|
Update RELEASE.txt
|
2019-10-04 10:56:14 +02:00 |
|
|
|
53bb677f8c
|
eiger doc updated
|
2019-10-04 10:41:13 +02:00 |
|
|
|
663999a539
|
updated versions
|
2019-10-04 10:35:42 +02:00 |
|
|
|
98b45b32fd
|
added jungfrau virtual binaries
|
2019-10-04 10:29:57 +02:00 |
|
|
|
74c08cd742
|
updated binaries in sererbin
|
2019-10-04 09:42:07 +02:00 |
|
