095348d405
ATEST-315
2016-04-14 14:54:22 +02:00
659c4d5f3a
Merge branch 'ATEST-319' into 'master'
...
ATEST-319
See merge request !8
2016-04-12 12:04:01 +02:00
085816ec8f
ATEST-319
2016-04-12 11:59:11 +02:00
b6f49ffead
Merge branch 'master' of git@git.psi.ch:sf_daq/ch.psi.daq.queryrest.git
2016-04-11 14:55:21 +02:00
ecc4909bc9
Remove unneeded dependencies.
2016-04-11 14:54:53 +02:00
9ca5ad0a52
add responseformat endpoint method
2016-04-07 10:51:59 +02:00
6a87141f9b
Fix archiverappliance name querying.
2016-04-04 09:04:55 +02:00
279bb10fed
?
2016-03-30 10:35:36 +02:00
f09b2baf75
Fix javadoc
2016-03-21 16:29:54 +01:00
3b308eb517
fix javadoc
2016-03-21 16:17:39 +01:00
3336842e8d
Merge branch 'master' of git@git.psi.ch:sf_daq/ch.psi.daq.queryrest.git
2016-03-21 15:35:03 +01:00
419f97f429
Refactoring
2016-03-21 15:34:32 +01:00
d5c8846759
- replacing old CORS solution with spring-provided mechanisms
2016-03-17 16:05:34 +01:00
9f56e9e8ad
Merge branch 'Logging' into 'master'
...
Logging
See merge request !7
2016-03-17 09:44:34 +01:00
9fe84bfe5a
Logging config and new spring version stuff.
2016-03-17 09:02:51 +01:00
652f900e86
Logging
2016-03-15 16:47:48 +01:00
b4235a7a66
Merge branch 'ATEST-311' into 'master'
...
ATEST-311
See merge request !6
2016-03-10 12:12:09 +01:00
d50425082a
ATEST-311
2016-03-08 18:05:09 +01:00
80cc0acc2d
Provide info when no Backend was loaded.
2016-02-25 17:57:37 +01:00
49711921eb
Change warning.
2016-02-23 10:51:17 +01:00
d23291b7cd
Some bug fixes.
2016-02-23 09:35:22 +01:00
898f27b7df
Merge branch 'ATEST-302' into 'master'
...
Atest 302
See merge request !5
2016-02-19 14:13:34 +01:00
a5973438b9
sf_daq/ch.psi.daq.web#28
2016-02-17 14:41:26 +01:00
b74ee6c8c5
Fix javadoc
2016-02-02 15:34:27 +01:00
84740559f9
ATEST-302
2016-02-02 15:18:10 +01:00
8d39b70f64
Merge branch 'ATEST-304' into 'master'
...
Atest 304
See merge request !4
2016-01-26 12:25:23 +01:00
faab4fb439
Fix tests.
2016-01-26 11:20:47 +01:00
e4651fcb4d
Merge remote-tracking branch 'origin/master' into ATEST-304
2016-01-25 17:06:15 +01:00
3730bf84d9
ATEST-304
2016-01-25 09:38:58 +01:00
b5f80f2ba7
updating old link
2016-01-20 15:58:53 +01:00
d3d7949b19
Merge branch 'daqweb15' into 'master'
...
sf_daq/ch.psi.daq.web#15
merge request: create a method which allows a GET request with the JSON object
stringified as request parameter
See merge request !3
2016-01-20 11:55:34 +01:00
df948be2ea
sf_daq/ch.psi.daq.web#15
...
create a method which allows a GET request with the JSON object
stringified as request parameter
2016-01-20 11:50:20 +01:00
79a350b9e5
ATEST-304 ChannelEvent with Statistics
2016-01-19 16:23:07 +01:00
61c4efed11
Whatever
2016-01-15 14:29:32 +01:00
a90ececbe0
ATEST-304
2016-01-15 10:04:02 +01:00
b55015ab59
resolve javadoc issues.
2015-12-22 15:03:19 +01:00
abff626983
typo
2015-12-22 13:37:25 +01:00
a963ef6efd
Fix links.
2015-12-22 13:29:07 +01:00
da61882fa5
Merge branch 'queryrest_1' into 'master'
...
sf_daq/ch.psi.daq.queryrest#1
- implementing compression of result streams
- allowing for different responseFormats (JSON, CSV)
See merge request !1
2015-12-22 13:22:24 +01:00
84c66ad73f
sf_daq/ch.psi.daq.queryrest#1 :
...
- adjustments after moving classes
2015-12-22 13:20:47 +01:00
d9158a8868
sf_daq/ch.psi.daq.queryrest#1
2015-12-22 13:12:03 +01:00
09d1b2f8f8
Merge branch 'ATEST-224' into 'master'
...
ATEST-224
@Value does not seem to work with daqlocal test cases (problem due to our hirarchical property overload structure?).
See merge request !2
2015-12-22 09:40:51 +01:00
461f656337
ATEST-224
2015-12-22 09:34:47 +01:00
c6f2010d67
sf_daq/ch.psi.daq.queryrest#1 :
...
- updating docs, rearranging a little
2015-12-22 08:22:32 +01:00
a2ffcab637
sf_daq/ch.psi.daq.queryrest#1
...
- implementing logic to implement the 'compression' attribute
- adjusting tests
- updating readme.md
2015-12-21 15:14:50 +01:00
01a74f9e6b
sf_daq/ch.psi.daq.queryrest#1
...
- implementing compression of result streams
- allowing for different responseFormats (JSON, CSV)
2015-12-21 10:09:26 +01:00
04583789cb
Add cast since older csv version.
2015-12-17 10:46:51 +01:00
99a0f5a67c
ATEST-299
2015-12-15 11:42:13 +01:00
eb589217d9
Merge pull request #20 in ST/ch.psi.daq.queryrest from ATEST-296 to master
...
# By Fabian Märki
# Via Fabian Märki
* commit 'bc1ecb312df3a2f7518e6679897d183b2423f130':
ATEST-296
2015-12-14 11:28:52 +01:00
bc1ecb312d
ATEST-296
2015-12-14 11:27:08 +01:00
