Commit Graph

77 Commits

Author SHA1 Message Date
reynisson
2f42da485d Fixed imports so that the class builds 2021-11-12 13:30:16 +01:00
julius.lautz
74a51cfcf6 changed deadline to timestamp and the logic to schedule an auction 2021-11-10 11:03:57 +00:00
f2fb945064 naming error fixes 2021-11-08 15:16:26 +01:00
6855ef6f2a Merge remote-tracking branch 'upstream/main' into dev 2021-11-08 15:03:01 +01:00
ee06c0b80e error fixes 2021-11-08 14:48:12 +01:00
6f87b18248
Merge pull request #52 from SCS-ASSE-FS21-Group1/common
Common library + roster service updates
2021-11-08 14:35:38 +01:00
31234a10d1 Merge remote-tracking branch 'origin/dev' into common 2021-11-08 14:33:59 +01:00
80be41d486 Merge branch 'common' of https://github.com/SCS-ASSE-FS21-Group1/tapas into common 2021-11-08 14:30:54 +01:00
2905850943 Merge remote-tracking branch 'origin/dev' into common 2021-11-08 14:30:50 +01:00
5c445a2f66 rename assignment to roster & added executor registry to roster 2021-11-08 14:23:27 +01:00
7c4fa20c2a
Merge pull request #50 from SCS-ASSE-FS21-Group1/renaming-executors
Renaming executors
2021-11-08 14:21:24 +01:00
6c15664377 Merge remote-tracking branch 'origin/dev' into renaming-executors 2021-11-08 14:19:10 +01:00
615fb0cec0
Merge pull request #33 from SCS-ASSE-FS21-Group1/executor1_input_arguments
executor 2 change
2021-11-08 14:05:46 +01:00
5de7942272
Merge pull request #32 from SCS-ASSE-FS21-Group1/task-list
Task list
2021-11-08 14:05:16 +01:00
rahimiankeanu
a96c8b2d23 renaming executors 2021-11-05 11:32:22 +01:00
5606de7c26 Change type of ExecutorURI value to URI 2021-11-04 17:23:49 +01:00
rahimiankeanu
dacb5605d7 executor 2 change 2021-11-02 21:21:52 +01:00
06172b34cd code improvements & delete task endpoint 2021-11-02 20:58:59 +01:00
julius.lautz
7af2b6df66 cleaned up task list + started implementation of deleteTask 2021-11-01 22:18:00 +01:00
julius.lautz
3184ab3389 cleaned up task list + started implementation of deleteTask 2021-11-01 22:07:21 +01:00
6752454838 added common lib and added service uri's to properties file 2021-10-27 13:15:29 +02:00
Andrei Ciortea
5c82dd84b4 Add instructions for setting up a local WebSub hub and MQTT broker 2021-10-22 12:39:50 +02:00
Andrei Ciortea
06b418da8e Fix redirect for tapas-auction-house 2021-10-21 14:58:20 +02:00
d08a6d0b67 merge everything from main project 2021-10-18 11:45:52 +02:00
Andrei Ciortea
061a76288d Update project template for Auction House 2021-10-18 09:45:52 +02:00
33497a1993
Merge pull request #30 from SCS-ASSE-FS21-Group1/dev
ADRs
2021-10-18 07:32:31 +02:00
Andrei Ciortea
52ff8e5cc0 Update docker-compose.yml 2021-10-18 01:36:28 +02:00
Andrei Ciortea
34fb3c682f Add Auction House; Extend uniform HTTP API for TAPAS-Tasks 2021-10-18 01:19:42 +02:00
reynisson
941e4d7f20 Added the ADRs from last submission. These still need to be revised to reflect more recent design choices 2021-10-18 00:26:20 +02:00
86702e3195 bugfixes 2021-10-17 17:43:55 +02:00
174ff9f605 deployment fix 2021-10-17 17:08:34 +02:00
e260df0de2 fixes 2021-10-17 16:51:28 +02:00
009e4b219d
Merge pull request #29 from SCS-ASSE-FS21-Group1/dev
fixes
2021-10-17 16:32:06 +02:00
0cdaf9b830 fixes 2021-10-17 16:31:02 +02:00
59971fc4b0
Merge pull request #28 from SCS-ASSE-FS21-Group1/dev
fixes?
2021-10-17 16:21:16 +02:00
25bf4efefd fixes? 2021-10-17 16:20:21 +02:00
30acea3df8
Merge pull request #27 from SCS-ASSE-FS21-Group1/dev
naming fixes
2021-10-17 15:57:53 +02:00
c414a4c1dd naming fixes 2021-10-17 15:57:01 +02:00
20db6dfe1d
Merge pull request #26 from SCS-ASSE-FS21-Group1/dev
naming fixes
2021-10-17 15:54:58 +02:00
7f76bf43e4 naming fixes 2021-10-17 15:53:36 +02:00
3a15756faf
Merge pull request #25 from SCS-ASSE-FS21-Group1/dev
Deployment 0.0.1
2021-10-17 15:49:10 +02:00
bb1ffb8bfd bugfixes 2021-10-17 15:44:09 +02:00
f461c5f3cb integration + fixes 2021-10-17 15:38:04 +02:00
8b0eea1270
Merge pull request #22 from SCS-ASSE-FS21-Group1/executor-pool
Implemented all issues regarding Executor Pool. Did not complete the …
2021-10-17 14:08:33 +02:00
e3c45d6d85
Merge branch 'dev' into executor-pool 2021-10-17 14:08:18 +02:00
reynisson
c6cb30af0c
Merge pull request #21 from SCS-ASSE-FS21-Group1/task-list
Changes to task list
2021-10-17 13:58:16 +02:00
reynisson
94766b6fd4
Merge pull request #23 from SCS-ASSE-FS21-Group1/assignment
assignment service + executor-base improvements
2021-10-17 13:57:43 +02:00
71d69112fd
Merge pull request #20 from SCS-ASSE-FS21-Group1/Executor1
Implementation of Executor1
2021-10-17 12:35:01 +02:00
bdad0914c7
Merge pull request #24 from SCS-ASSE-FS21-Group1/executor1
Added missing class and chaged port
2021-10-17 12:31:56 +02:00
4ee640e688 Added missing class and chaged port 2021-10-17 12:29:18 +02:00