Commit Graph

304 Commits

Author SHA1 Message Date
0845ddc81d ? 2016-05-04 14:19:36 +02:00
23cffd05fb Merge branch 'ATEST-316' into 'master'
Atest 316



See merge request !10
2016-04-22 17:01:33 +02:00
479f2bf06f ATEST-316 2016-04-22 16:53:36 +02:00
1c2c5a801c ATEST-316 2016-04-19 08:24:17 +02:00
7f7ec554ac Readme 2016-04-15 16:33:09 +02:00
7b3f76d24a Readme 2016-04-15 16:26:47 +02:00
564402134d Readme 2016-04-15 16:18:43 +02:00
b612802088 Readme 2016-04-15 16:16:52 +02:00
9c94f6c3a6 Readme 2016-04-15 16:08:42 +02:00
643f4089db Readme 2016-04-15 16:01:40 +02:00
8efbd05d11 Readme 2016-04-15 15:56:42 +02:00
9fe181f335 Readme 2016-04-15 15:49:23 +02:00
2dc33d8161 Readme 2016-04-15 15:46:29 +02:00
ef9cad3b9f Readme 2016-04-15 15:06:20 +02:00
cfb327006f Readme 2016-04-15 14:39:04 +02:00
1d1643c73c Cleanup Readme. 2016-04-15 14:31:05 +02:00
62d8f64a80 Cleanup Readme. 2016-04-15 14:30:41 +02:00
45ad51a28c Merge branch 'ATEST-315' into 'master'
ATEST-315



See merge request !9
2016-04-14 14:57:33 +02:00
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