Commit Graph
223 Commits
Author SHA1 Message Date
Zellweger Christof Ralf f61155e742 adding compression method which returns all compression values. needed
in the UI so that potential new compression methods are automatically
available when added later.
2016-07-07 10:00:04 +02:00
Fabian Märki 405c120a19 Fix javadoc issues. 2016-07-06 12:13:17 +02:00
Fabian Märki ed6ea89b7a There was another reload true. 2016-07-06 11:28:39 +02:00
maerki_f 79a936a7e1 Merge branch 'ATEST-472' into 'master'
Atest 472



See merge request !11
2016-07-06 11:08:40 +02:00
Zellweger Christof Ralf 67b5c6cec4 Merge branch 'master' into ATEST-472
Conflicts:
	src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
2016-07-06 10:27:02 +02:00
Fabian Märki ee43d775ea Explanation of channel status info. 2016-07-06 09:37:51 +02:00
Fabian Märki 596e2617a8 ATEST-344 2016-07-05 09:40:14 +02:00
maerki_f fd5388162b Update Readme.md 2016-06-14 15:04:37 +02:00
maerki_f ba53bbecb2 Update Readme.md 2016-06-14 15:03:12 +02:00
Fabian Märki fb327f7457 ATEST-442 -> Extrema 2016-06-10 17:43:34 +02:00
Fabian Märki 6638043102 Intermediate... 2016-06-09 12:48:45 +02:00
Fabian Märki 738d87bc16 ATEST-371 2016-06-09 10:15:02 +02:00
Fabian Märki 24daa85e0b ATEST-371 2016-06-08 15:43:40 +02:00
Fabian Märki b27b43a6f6 Check cast. 2016-06-08 08:46:42 +02:00
Fabian Märki 91d1b3c142 Make Responses HTTP specific. 2016-06-07 17:13:28 +02:00
Fabian Märki c62b44be0e ATEST-472 2016-06-07 16:35:54 +02:00
Fabian Märki 907637ad32 Config repo, restart, cleanup Cassandra dependencies. 2016-06-06 15:55:44 +02:00
Fabian Märki b61f21835a fix links 2016-06-02 10:56:38 +02:00
Fabian Märki 29fae85489 Prefix sf- to databuffer and archiverappliance 2016-06-02 10:49:03 +02:00
Fabian Märki 0845ddc81d ? 2016-05-04 14:19:36 +02:00
maerki_f 23cffd05fb Merge branch 'ATEST-316' into 'master'
Atest 316



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



See merge request !9
2016-04-14 14:57:33 +02:00
Fabian Märki 095348d405 ATEST-315 2016-04-14 14:54:22 +02:00
maerki_f 659c4d5f3a Merge branch 'ATEST-319' into 'master'
ATEST-319



See merge request !8
2016-04-12 12:04:01 +02:00
Fabian Märki 085816ec8f ATEST-319 2016-04-12 11:59:11 +02:00
Fabian Märki b6f49ffead Merge branch 'master' of git@git.psi.ch:sf_daq/ch.psi.daq.queryrest.git 2016-04-11 14:55:21 +02:00
Fabian Märki ecc4909bc9 Remove unneeded dependencies. 2016-04-11 14:54:53 +02:00
Zellweger Christof Ralf 9ca5ad0a52 add responseformat endpoint method 2016-04-07 10:51:59 +02:00
Fabian Märki 6a87141f9b Fix archiverappliance name querying. 2016-04-04 09:04:55 +02:00
Fabian Märki 279bb10fed ? 2016-03-30 10:35:36 +02:00
Fabian Märki f09b2baf75 Fix javadoc 2016-03-21 16:29:54 +01:00
Fabian Märki 3b308eb517 fix javadoc 2016-03-21 16:17:39 +01:00
Fabian Märki 3336842e8d Merge branch 'master' of git@git.psi.ch:sf_daq/ch.psi.daq.queryrest.git 2016-03-21 15:35:03 +01:00
Fabian Märki 419f97f429 Refactoring 2016-03-21 15:34:32 +01:00
Zellweger Christof Ralf d5c8846759 - replacing old CORS solution with spring-provided mechanisms 2016-03-17 16:05:34 +01:00