Commit Graph

162 Commits

Author SHA1 Message Date
de5081e2b4 Merge remote-tracking branch 'origin/develop' into feature/xmlparser 2020-12-21 18:20:40 +01:00
94a211bb26 Maping data works with users.xml file 2020-12-21 18:19:23 +01:00
e26608858b Grading functionality added 2020-12-21 17:41:55 +01:00
322c3cf052 Classifier integrated on backend 2020-12-21 14:33:13 +01:00
818d2ff0da Minor fixes, graph working 2020-12-15 13:15:44 +01:00
578da20c84 Editing label now working 2020-12-15 11:43:18 +01:00
023f124e6f Merge branch 'feature/user-profile' into develop 2020-12-15 00:22:59 +01:00
c824e64bc7 Merge branch 'develop' into feature/user-profile 2020-12-15 00:22:42 +01:00
1c30635765 Minor fixing 2020-12-15 00:21:50 +01:00
80991d7448 Fixed labels issues 2020-12-14 23:55:05 +01:00
9dbc42c809 Edit dimension fully working 2020-12-14 21:52:52 +01:00
d4c299afc1 Merge branch 'develop' into feature/user-profile 2020-12-14 18:27:11 +01:00
4c5b4ae70f Fixed file endpoint 2020-12-14 18:24:29 +01:00
67ddb0dca2 Merge branch 'develop' into feature/user-profile 2020-12-14 17:53:41 +01:00
5882c19ea9 Discussion viewer partially working, maping id to name working 2020-12-14 01:07:49 +01:00
bbbe829d56 Option for selecting dimension for current file 2020-12-13 18:39:29 +01:00
f34b82309b Updated delete methods, file title update added 2020-12-13 14:05:35 +01:00
b2c8bd766c My profile - edit dimensions, new storage service, hydrate state on refresh 2020-12-13 12:40:03 +01:00
a720e80dd9 Add & list dimensions 2020-12-10 23:34:22 +01:00
c0f0196153 Merge branch 'develop' into feature/user-profile 2020-12-10 19:36:39 +01:00
8b8bb8a5ce GET discussions endpoint updated 2020-12-10 02:31:31 +01:00
6b08d9003e [WIP] Add dialog for adding dimensions 2020-12-09 20:18:33 +01:00
691db83658 Add front for dimension manager 2020-12-08 22:45:01 +01:00
8c10ff9459 Prepare components for future API 2020-12-08 19:05:08 +01:00
c24ce9a546 Add file choosing from profile 2020-12-06 23:59:25 +01:00
08fd74918b Merge branch 'develop' into feature/user-profile 2020-12-06 14:08:24 +01:00
da0994c21c Add manage-dimensions component 2020-12-06 14:07:40 +01:00
kushiji
2e25adf61d Merge branch 'feature/backend-last-endpoints' into develop 2020-12-06 13:42:02 +01:00
25213e4f19 Annotation module implementation 2020-12-06 04:59:04 +01:00
7e6f7a90d9 Annotation module implementation 2020-12-06 01:01:28 +01:00
cc3c435bcc Fix buttons positions 2020-11-17 14:27:56 +01:00
c402f6246f Merge branch 'feature/user-profile' into develop 2020-11-17 13:43:01 +01:00
3659515be9 Add option to delete file & dialog for it 2020-11-17 13:42:45 +01:00
94601dd6c8 Merge branch 'feature/user-profile' into develop 2020-11-17 00:41:18 +01:00
8e87184208 add CORS_ALLOW_HEADERS 2020-11-17 00:41:07 +01:00
8dccdea89a Add option to add xml files for user, add listing of availalble files 2020-11-17 00:39:33 +01:00
253e61b2a1 User logout endpoint + token blacklisting 2020-11-15 21:12:00 +01:00
kushiji
e2951b4fa4 Merge branch 'feature/backend-manage-files' into develop 2020-11-14 23:48:41 +01:00
cf6abfdb3a Missing files added 2020-11-14 23:47:52 +01:00
d8c49b1bd7 Token authentication + send file endpoint 2020-11-14 23:43:40 +01:00
81c83e3313 Add MyProfile Module 2020-11-09 21:56:46 +01:00
1c168ad6e5 Merge branch 'feature/ngrx' into develop 2020-11-09 20:58:34 +01:00
6f292023d9 Most of features now works with NgRx 2020-11-09 20:56:37 +01:00
1e690204fa Discussion Menu bar now works with store 2020-11-09 17:49:17 +01:00
f28c73fdd4 Discussion Choser now works on Store 2020-11-08 23:47:12 +01:00
e87e10ce62 Merge branch 'feature/login-register' into develop 2020-11-08 21:53:43 +01:00
8bdd4781d2 _services/ -> services/, login & register now works 2020-11-08 21:52:30 +01:00
16210a01fc Merge remote-tracking branch 'origin/develop' into feature/login-register 2020-11-08 21:30:32 +01:00
258d0f33ae Hotfix: JSON parse on POST method 2020-11-08 21:20:13 +01:00
c587183350 Merge branch 'develop' into feature/login-register 2020-11-08 20:55:04 +01:00