327353d96d
Merge pull request #14 in ST/ch.psi.daq.queryrest from atest259 to master
...
# By Zellweger Christof Ralf
# Via Zellweger Christof Ralf
* commit 'fe8277df5e18007643fe6fb2b1bbfca68e8bfe84':
ATEST-259: - clean up, improving naming
ATEST-259: - removing unused test dependencies
ATEST-259: - adding tests, re-implementing a simpler CORS filter than previously used
ATEST-259: - adding simple CORS filter which includes some standard cors headers
ATEST-259: - fixing QueryRestController tests before adding the CORS filter
ATEST-259: - trying to implement dummy cassandra reader - fixing some of the tests
2015-10-29 07:18:36 +01:00
fe8277df5e
Merge remote-tracking branch 'origin/master' into atest259
2015-10-28 13:27:23 +01:00
00e181c8aa
ATEST-259:
...
- clean up, improving naming
2015-10-28 13:03:18 +01:00
e7467aeea1
ATEST-259:
...
- removing unused test dependencies
2015-10-28 12:53:32 +01:00
cd72af733a
ATEST-259:
...
- adding tests, re-implementing a simpler CORS filter than previously
used
2015-10-28 12:52:32 +01:00
1aa5b86b94
ATEST-246
2015-10-28 11:31:15 +01:00
6aa5801491
ATEST-259:
...
- adding simple CORS filter which includes some standard cors headers
2015-10-27 18:14:54 +01:00
001e093623
ATEST-259:
...
- fixing QueryRestController tests before adding the CORS filter
2015-10-27 18:00:05 +01:00
8488541282
ATEST-259:
...
- trying to implement dummy cassandra reader
- fixing some of the tests
2015-10-27 15:41:42 +01:00
1819283622
Java doc.
2015-10-21 10:41:03 +02:00
a61fddf699
Reformatting.
2015-10-21 10:01:00 +02:00
c894bb5939
ATEST-249:
...
- provide a channel search method with with the user can define all or
part of the channel name
2015-10-20 11:49:12 +02:00
9030776f61
Merge pull request #13 in ST/ch.psi.daq.queryrest from ATEST-242 to master
...
# By Fabian Märki
# Via Fabian Märki
* commit '1c1ddf773ae355eb27444881556eb70293c397e5':
ATEST-242
2015-10-13 14:35:30 +02:00
1c1ddf773a
ATEST-242
2015-10-13 13:18:04 +02:00
e9a60664de
Merge pull request #12 in ST/ch.psi.daq.queryrest from ATEST-206 to master
...
# By Fabian Märki
# Via Fabian Märki
* commit 'cc0639432ac80a75791454b787bad640dd662f9b':
ATEST-206
2015-09-30 11:16:58 +02:00
cc0639432a
ATEST-206
2015-09-30 11:11:34 +02:00
010c818f21
Whatever?
2015-09-16 15:00:31 +02:00
9b77c5538d
ATEST-221
2015-09-11 13:55:55 +02:00
610fbaa0e0
Change DBMode wording.
2015-09-07 13:28:48 +02:00
645aa5883a
Progress
2015-08-21 12:10:46 +02:00
af11abce75
progress.
2015-08-21 12:08:05 +02:00
38ca06b154
Progress
2015-08-21 12:05:06 +02:00
ea18618596
in progress.
2015-08-21 12:01:56 +02:00
eb1bdee425
Progress
2015-08-21 11:06:58 +02:00
3886bd4c77
Progress
2015-08-21 10:58:09 +02:00
a7c38186aa
In progress...
2015-08-21 10:46:51 +02:00
c567a442f6
in progress...
2015-08-21 10:43:56 +02:00
fe3cd931b0
query docu in progress...
2015-08-21 10:31:48 +02:00
0d4d6aa279
inline image.
2015-08-21 10:30:38 +02:00
5d0282ae4e
Images
2015-08-21 10:29:07 +02:00
cbe2bef4c0
Docu
2015-08-21 10:28:42 +02:00
9a6b9de4d9
provide shape too.
2015-08-21 08:42:40 +02:00
1e44d2dc2b
Only log info messages.
2015-08-20 15:05:05 +02:00
a3965fb093
- Add iocMillis, iocNanos to default response
...
- Set correct response type
- Serialize byte[] as byte[] and not String
2015-08-11 15:59:47 +02:00
776c8135e5
Log loaded values in config
...
Add/remove / in REST interface.
2015-08-10 17:28:15 +02:00
c751aab8de
ATEST-205
2015-08-10 11:44:08 +02:00
a1cb60c56f
Merge pull request #11 in ST/ch.psi.daq.queryrest from ATEST-128 to master
...
# By Fabian Märki
# Via Fabian Märki
* commit '6ce4d1553bbd36e55f8c2f2071377d5a208bf0ec':
ATEST-128
ATEST-128 First working impl.
ATEST-128
2015-08-07 10:30:55 +02:00
6ce4d1553b
Merge branch 'master' into ATEST-128
2015-08-07 08:43:59 +02:00
c5b8c55970
ATEST-128
2015-08-07 08:38:37 +02:00
2dc1b4bfb6
ATEST-128 First working impl.
2015-08-05 14:06:06 +02:00
fb244d95b7
- switching back from @Autowired to @Resource
2015-07-31 16:21:45 +02:00
46c1406d57
Merge branch 'master' into ATEST-128
2015-07-31 14:36:26 +02:00
83613f883f
Merge pull request #10 in ST/ch.psi.daq.queryrest from ATEST-129 to master
...
# By Fabian Märki
# Via Fabian Märki
* commit 'f1587230a64e253775a494283da651cdae5c19f7':
ATEST-129
2015-07-31 14:34:37 +02:00
f1587230a6
ATEST-129
2015-07-31 14:32:57 +02:00
47d921e1a4
ATEST-128
2015-07-31 12:50:29 +02:00
fbab668184
Merge pull request #9 in ST/ch.psi.daq.queryrest from atest124 to master
...
* commit 'e4ad14bb3f9f051723b1bef1010157351ac48250':
ATEST-124: - implement the QueryValidator class - adjust / fix tests
ATEST-124: - implement the query validator
2015-07-31 11:36:48 +02:00
e4ad14bb3f
Merge remote-tracking branch 'origin/master' into atest124
...
Conflicts:
src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
2015-07-31 11:27:05 +02:00
22c2adf7cc
ATEST-124:
...
- implement the QueryValidator class
- adjust / fix tests
2015-07-31 10:17:11 +02:00
2f24e95303
ATEST-123
2015-07-31 10:14:01 +02:00
ebb904009d
ATEST-123
2015-07-31 10:12:52 +02:00
