444 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	130f3d2e6f	Merge branch '3.0.1' into developer	2017-11-28 11:18:43 +01:00
Dhanya Maliakal	4825ace129	switching from black to white background for receiver	2017-11-28 11:18:22 +01:00
Dhanya Maliakal	ab93835ce2	merge conflict to include datastreaming in client comment	2017-11-23 10:29:08 +01:00
Dhanya Maliakal	3b292bdeb6	need to enable data streaming for client	2017-11-23 10:27:59 +01:00
Dhanya Maliakal	43140811bd	one measurement in users class	2017-11-23 10:25:35 +01:00
Dhanya Maliakal	29f3387d73	Merge branch '3.0.1' into developer	2017-11-23 09:34:22 +01:00
Dhanya Maliakal	4749e8c4e4	modified users client to work without config and better print out	2017-11-23 09:34:12 +01:00
Dhanya Maliakal	a1d325a115	Merge branch '3.0.1' into developer	2017-11-23 09:20:22 +01:00
Dhanya Maliakal	3034cf87d0	changes that might be reverted in detser	2017-11-23 09:20:20 +01:00
Dhanya Maliakal	447451231c	modified users client to work without config and better print out	2017-11-22 18:09:16 +01:00
Dhanya Maliakal	c0bfe46aa1	enabling client in developer user api	2017-11-22 18:00:41 +01:00
Dhanya Maliakal	26829585dc	Merge branch '3.0.1' into developer	2017-11-22 17:47:28 +01:00
Dhanya Maliakal	ea3c722552	made a bin in manual api to be able to compile here	2017-11-22 17:47:16 +01:00
Dhanya Maliakal	c0a1f83691	Merge branch '3.0.1' into developer	2017-11-22 17:43:49 +01:00
Dhanya Maliakal	4ecbfada5b	Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1	2017-11-22 17:43:12 +01:00
Dhanya Maliakal	d47abb140f	removed detreceivernocall	2017-11-22 17:43:00 +01:00
Gemma Tinti	f2f00fec06	Merge branch '3.0.1' into developer	2017-11-21 15:35:19 +01:00
Gemma Tinti	e023cb186f	manual	2017-11-21 15:34:56 +01:00
Gemma Tinti	11c9ab16f9	Merge branch '3.0.1' into developer	2017-11-20 16:44:21 +01:00
Gemma Tinti	d1d530f0e7	manual	2017-11-20 16:43:39 +01:00
Dhanya Maliakal	dcf4d98a75	show warnings, update binaries conflict from merge	2017-11-17 11:33:52 +01:00
Dhanya Maliakal	b020270734	edited cmake to show warnings	2017-11-17 08:46:59 +01:00
Dhanya Maliakal	bf89dd44f3	updated binaries	2017-11-16 12:34:12 +01:00
Dhanya Maliakal	875ca44c0b	updated server hotfix binary	2017-11-16 12:30:41 +01:00
Dhanya Maliakal	bee751cebb	updated binaries	2017-11-15 09:31:49 +01:00
Dhanya Maliakal	90fb8258ca	updated binaries	2017-11-14 17:52:51 +01:00
Gemma Tinti	4f74f6d08f	Merge branch '3.0.1' into developer	2017-11-14 15:19:14 +01:00
Gemma Tinti	a3a30d9b50	manual	2017-11-14 15:18:39 +01:00
Gemma Tinti	2d962dfead	Merge branch '3.0.1' into developer	2017-11-14 12:43:19 +01:00
Gemma Tinti	b814515d0a	manual	2017-11-14 12:42:30 +01:00
Dhanya Maliakal	e33ba2cd76	merge from 3.0.1 compiling with rpath and updating detector binaries	2017-11-13 12:32:08 +01:00
Dhanya Maliakal	dedc00f1bd	compiling with rflag	2017-11-13 12:28:27 +01:00
Dhanya Maliakal	c0ec315b04	Merge branch 'developer' into gappixels	2017-11-10 16:53:14 +01:00
Dhanya Maliakal	e12229633c	update binaries	2017-10-27 16:18:21 +02:00
Dhanya Maliakal	acfd9acc6c	update binaries	2017-10-27 16:09:46 +02:00
Dhanya Maliakal	1881cb0010	updated binaries	2017-10-27 16:07:42 +02:00
Dhanya Maliakal	fde4194f9b	merged with developer, receiver call back merged with no call back	2017-10-23 17:12:00 +02:00
Dhanya Maliakal	16a939c0c0	Merge branch '3.0.1' into developer	2017-10-23 17:08:12 +02:00
Dhanya Maliakal	f4f03f659a	color code in user example depending on modID, instead of xcoord	2017-10-23 17:07:45 +02:00
Dhanya Maliakal	4084e2c31e	updated release doc	2017-10-23 17:06:12 +02:00
Dhanya Maliakal	e417885459	merge conflict in release, merged incorporating no call back and call back into one user example	2017-10-23 15:30:00 +02:00
Dhanya Maliakal	65fd5a3057	merged without call back and call back into one user example	2017-10-23 15:26:04 +02:00
Dhanya Maliakal	387b4ef457	updated release with patches notes	2017-10-19 17:09:50 +02:00
Dhanya Maliakal	673b7f1652	merge conflict fixed with developer	2017-10-19 15:36:28 +02:00
Dhanya Maliakal	c755a5b602	bug fix to release.txt from the merge	2017-10-19 14:41:46 +02:00
Dhanya Maliakal	4aa0c8e24e	Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1	2017-10-17 12:14:40 +02:00
Dhanya Thattil	91588ecc21	Merge branch 'developer' into gappixels	2017-10-12 14:58:25 +02:00
Gemma Tinti	40cb2993fb	eiger manual	2017-10-12 12:15:43 +02:00
Dhanya Maliakal	948eb455e2	editing release text, in between, need to still fix eiger server with new eror status functionality	2017-10-10 12:15:04 +02:00
Dhanya Maliakal	fc025bd28b	conflict resolution with developer	2017-10-03 15:12:35 +02:00