Commit Graph

264 Commits

Author SHA1 Message Date
Natalia Gawron e83bc3fa73 Merge branch 'master' into SES-87 2020-12-11 22:05:39 +01:00
Natalia Gawron 012c8828e1 SES-87 defined default style, created LoginUI component 2020-12-11 21:58:24 +01:00
Łukasz Góreczny 663b33e4a8 Merge pull request 'SES-81 Rozdzielenie back of front' (#23) from SES-81 into master
Reviewed-on: #23
2020-12-11 20:16:13 +01:00
Karol Górzyński fde1196069 Merge branch 'master' into SES-81 2020-12-11 19:20:39 +01:00
Karol Górzyński cd1a0af239 Merge pull request 'SES-91 Utworzenie modelu zwrotek AP oraz zajmowanie się domyślnymi exceptionami' (#22) from SES-91 into master
Reviewed-on: #22
2020-12-11 17:08:07 +01:00
Łukasz Góreczny b0e0e5c5f5 Merge branch 'SES-91' of git.wmi.amu.edu.pl:s426135/session-companion into SES-91 2020-12-11 11:11:06 +01:00
Łukasz Góreczny 81aebe44de SES-91 Added documentation and extra method 2020-12-11 11:10:51 +01:00
Karol Górzyński 3c57f7770e Merge branch 'master' into SES-91 2020-12-10 17:41:24 +01:00
Łukasz Góreczny db2de42824 końcowe poprawki 2020-12-10 17:34:46 +01:00
Łukasz Góreczny 8e59538db8 Utworzenie modeli success i error 2020-12-10 17:34:30 +01:00
kargor8 553a27a92a Useless commit to see if jenkins works 2020-12-10 17:32:32 +01:00
kargor8 712f87c696 Try npm cache clean 2020-12-10 17:30:06 +01:00
kargor8 0c0bdc70e5 Delete whats left and build npm, fix typo 2020-12-10 17:19:15 +01:00
kargor8 8530f3e940 Delete whats left and build npm 2020-12-10 17:18:02 +01:00
kargor8 c96dd4f567 Jenkins now lets build frontend and backend 2020-12-10 17:09:46 +01:00
Łukasz Góreczny 9efefd96fe SES-91 Added error middleware 2020-12-10 15:28:00 +01:00
Łukasz Góreczny 6131bbe706 New Type moved to different project and changed on of the profiles 2020-12-10 15:08:05 +01:00
Łukasz Góreczny bc6709e905 Small fix 2020-12-10 14:31:40 +01:00
Łukasz Góreczny 2cac5bd829 Fix mapper 2020-12-10 13:55:31 +01:00
Łukasz Góreczny 09b7db8aaf Added Either return type 2020-12-10 13:15:11 +01:00
Łukasz Góreczny 68200162da Merge pull request 'login endpoint SES-85' (#21) from SES-85 into master
Reviewed-on: #21
2020-12-10 12:52:32 +01:00
Kosma 572b48c15e UserService.cs edit 2020-12-09 23:09:57 +01:00
Kosma 4580c2fe17 login endpoint 2020-12-09 22:47:25 +01:00
Karol Górzyński 1dc09fae4e Merge pull request 'SES-82 Added description to view models' (#20) from SES-82 into master
Reviewed-on: #20
2020-12-09 17:20:09 +01:00
Łukasz Góreczny 544b8a1982 SES-82 Added description to view models 2020-12-09 09:44:52 +01:00
Łukasz Góreczny eefab76c50 Merge pull request 'added base service' (#19) from SES-76 into master
Reviewed-on: #19
2020-12-07 11:47:38 +01:00
ngawron 5d8f5578c3 added base service 2020-12-07 11:46:18 +01:00
Karol Górzyński 247ce78c2b Merge pull request 'SES-80 Added swagger base configuration' (#18) from SES-80 into master
Reviewed-on: #18
2020-12-06 17:04:12 +01:00
Łukasz Góreczny 31db5c9b73 Added swagger base configuration 2020-12-06 16:28:16 +01:00
Karol Górzyński e65ad753ad Merge pull request 'Changed method to check if GM is already logged' (#15) from SES-78 into master
Reviewed-on: #15
2020-12-06 15:42:00 +01:00
Karol Górzyński 8712191acc Resolve conflicts 2020-12-06 15:41:18 +01:00
Karol Górzyński 5ed3e025ec Merge pull request 'SES-70 Added Automapper and Profiles' (#16) from SES-70 into master
Reviewed-on: #16
2020-12-06 15:33:14 +01:00
Karol Górzyński 33a51eef3f Merge branch 'master' into SES-70 2020-12-06 15:33:08 +01:00
Karol Górzyński ccfdff6791 Merge pull request 'SES-69 Added controllers and comments' (#17) from SES-69 into master
Reviewed-on: #17
2020-12-06 15:29:12 +01:00
Łukasz Góreczny 46b2d54f26 Small fixes to prepare project for swagger 2020-12-06 14:34:56 +01:00
Łukasz Góreczny 6cc4ed74a9 SES-69 Added controllers and one method 2020-12-06 14:34:19 +01:00
Łukasz Góreczny a35e2ed567 Added AutoMapper 2020-12-06 11:28:57 +01:00
Łukasz Góreczny e6a6ac290a Dodanie profili 2020-12-06 11:21:33 +01:00
Łukasz Góreczny 71687cafad Changed method to check if GM is allready logged 2020-12-06 11:01:49 +01:00
Łukasz Góreczny b6a80a2e89 Merge pull request 'SES-75 added router into sign-in page' (#13) from SES-75 into master
Reviewed-on: #13
2020-12-06 08:59:07 +01:00
Łukasz Góreczny c55f504741 Merge pull request 'SES-66 Services' (#14) from SES-66 into master
Reviewed-on: #14
2020-12-06 08:58:31 +01:00
Karol Górzyński 2db796f3dc Add services and configruations for them 2020-12-05 21:59:32 +01:00
Karol Górzyński f957654596 Add interfaces 2020-12-05 21:47:12 +01:00
Karol Górzyński 4aea17277a Added base interface and service 2020-12-05 21:46:27 +01:00
Karol Górzyński e2b55ada11 Added project for services in .net 5.0 2020-12-05 21:35:31 +01:00
Karol Górzyński 6ed0708e49 Merge pull request 'SES-77' (#12) from SES-77 into master
Reviewed-on: #12
2020-12-05 21:32:04 +01:00
Karol Górzyński e27ccdd05d Merge branch 'master' into SES-77 2020-12-05 21:31:34 +01:00
ngawron 2d152df1b1 SES-75 added router into sign-in page 2020-12-05 20:24:34 +01:00
Łukasz Góreczny a88dfaa54f SES-77 Aded singlaR methods for register and override default disconnect 2020-12-05 19:18:45 +01:00
Łukasz Góreczny 8ccdcb955e Merge pull request 'SES-74' (#8) from SES-74 into master
Reviewed-on: #8
2020-12-05 19:00:58 +01:00