032301c7a8
ATEST-285
2015-11-27 17:21:29 +01:00
aa907f6856
Due to newest packages.
2015-11-27 11:44:15 +01:00
763c12a96b
Merge pull request #18 in ST/ch.psi.daq.queryrest from ATEST-285 to master
...
# By Fabian Märki
# Via Fabian Märki
* commit 'aebb77a61e07b4d4355879144d9620490a21119f':
ATEST-285
2015-11-27 07:59:16 +01:00
aebb77a61e
ATEST-285
2015-11-27 07:58:27 +01:00
5e1f5ad42d
use global version
2015-11-26 17:08:56 +01:00
d2ea89e632
- removing temporary fix which was necessary because there was a bug in
...
the iron-ajax Polymer component
2015-11-18 09:05:15 +01:00
044a23f27c
ATEST-266:
...
- adding a method for returning all dbmodes
- temporary fix for ajax CORS call issue (see comment)
2015-11-10 14:47:34 +01:00
67598da153
Merge pull request #17 in ST/ch.psi.daq.queryrest from ATEST-267-2 to master
...
# By Fabian Märki
# Via Fabian Märki
* commit '095087a478ceb3fe9634d9922c4db89f1c8a6807':
ATEST-267
2015-11-09 16:07:01 +01:00
095087a478
ATEST-267
2015-11-09 16:04:05 +01:00
47a1237bb8
Merge pull request #16 in ST/ch.psi.daq.queryrest from ATEST-261 to master
...
# By Fabian Märki
# Via Fabian Märki
* commit '7fb24f830e85848096ea5bc0a0b7fe8912a8385e':
ATEST-261
2015-11-02 09:18:11 +01:00
7fb24f830e
ATEST-261
2015-11-02 09:17:46 +01:00
e463716858
ATEST-267
2015-10-30 16:16:28 +01:00
9179f78905
Resolve javadoc generation issue.
2015-10-30 13:40:06 +01:00
3f6f2f2801
Merge pull request #15 in ST/ch.psi.daq.queryrest from ATEST-246 to master
...
# By Fabian Märki
# Via Fabian Märki
* commit 'e54e811b83607a80044d830d5adeceabc8904a1c':
Use correct content.
Use correct content.
Remove renamed test.
ATEST-246
2015-10-30 11:49:45 +01:00
e54e811b83
Merge branch 'ATEST-246' of
...
ssh://git@github.psi.ch:7999/st/ch.psi.daq.queryrest.git into ATEST-246
2015-10-30 11:49:23 +01:00
dd3ec01573
Use correct content.
2015-10-30 11:49:09 +01:00
52fae8d998
Use correct content.
2015-10-30 11:48:51 +01:00
3f60043416
Remove renamed test.
2015-10-30 11:46:46 +01:00
0b41016535
Merge branch 'master' into ATEST-246
...
Conflicts:
.settings/org.eclipse.jdt.core.prefs
src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
2015-10-30 11:46:30 +01:00
2f6a012abb
ATEST-246
2015-10-30 11:33:29 +01:00
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
