Commit Graph

169 Commits

Author SHA1 Message Date
6ed0708e49 Merge pull request 'SES-77' (#12) from SES-77 into master
Reviewed-on: #12
2020-12-05 21:32:04 +01:00
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
8ccdcb955e Merge pull request 'SES-74' (#8) from SES-74 into master
Reviewed-on: #8
2020-12-05 19:00:58 +01:00
Łukasz Góreczny
a53f35a90a SES-74 Rebase 2020-12-05 18:59:14 +01:00
ngawron
ceb836d734 deleted unused files, added changes after PR, fixed database property 2020-12-05 18:58:47 +01:00
ngawron
b5c37e40e4 SES-74 created master-page with - select role 2020-12-05 18:58:04 +01:00
ngawron
b2387e0cc0 SES-74 added basic structure to the code 2020-12-05 18:58:03 +01:00
Łukasz Góreczny
561b688519 SES-77 SignalR base config 2020-12-05 18:55:35 +01:00
ngawron
6cb742caa2 deleted unused files, added changes after PR, fixed database property 2020-12-05 18:50:48 +01:00
21710903ed Merge pull request 'SES-67' (#11) from SES-67 into master
Reviewed-on: #11
2020-12-05 16:40:08 +01:00
Łukasz Góreczny
4793312858 Merge branch 'SES-67' of git.wmi.amu.edu.pl:s426135/session-companion into SES-67 2020-12-05 16:39:04 +01:00
e53d87416b Fix some weird bug with Visualstudio 2020-12-05 16:35:55 +01:00
53c2d7cfcc added repositories 2020-12-05 16:35:54 +01:00
f0c14da49c Merge pull request 'added ViewModels' (#10) from SES-68 into master
Reviewed-on: #10
2020-12-05 16:17:35 +01:00
0196595df2 Merge branch 'master' into SES-68 2020-12-05 14:02:50 +01:00
cd63f5e402 Again bug with vs 2020-12-05 14:01:46 +01:00
18fe024fd1 Merge branch 'SES-68' of git.wmi.amu.edu.pl:s426135/session-companion into SES-68 2020-12-05 14:01:03 +01:00
333283443e Change ViewModels to 5.0 2020-12-05 13:55:07 +01:00
b242455a88 Fix some weird bug with Visualstudio 2020-12-05 12:34:23 +01:00
d6c7107915 Fixed errors with not merging and bad project version 2020-12-05 12:32:30 +01:00
9dfac7d081 Merge branch 'master' of git.wmi.amu.edu.pl:s426135/session-companion into SES-67 2020-12-05 12:29:51 +01:00
553232acf7 added repositories 2020-12-05 11:33:34 +01:00
7860c1d535 added ViewModels 2020-12-04 21:34:30 +01:00
84616f3344 Merge pull request 'dodano tabele atrybutow postaci' (#9) from SES-65 into master
Reviewed-on: #9
2020-12-04 17:04:25 +01:00
a303a7da7e dodano tabele atrybutow postaci 2020-12-04 15:49:51 +01:00
422d794d79 Merge pull request 'SES-67' (#6) from SES-67 into master
Reviewed-on: #6
2020-12-03 22:35:20 +01:00
501738f247 Merged but i think its not as good as you think 2020-12-03 22:32:42 +01:00
ngawron
afe73424df SES-74 created master-page with - select role 2020-12-03 22:31:43 +01:00
ebb250bd88 Merge pull request 'SES-68 Added Basic ViewModels' (#7) from SES-68 into master
Reviewed-on: #7
2020-12-03 22:21:45 +01:00
850ae8e610 SES-68 Changes to csproj 2020-12-03 21:30:34 +01:00
ngawron
bdeca6efbe SES-74 added basic structure to the code 2020-12-03 21:03:58 +01:00
f123ef65eb SES-68 Added Basic ViewModels 2020-12-03 19:22:35 +01:00
dfc3cdac98 SES-67 Add config to repositories 2020-12-03 18:52:53 +01:00
e3bcf28f46 SES-67 Add repostitories 2020-12-03 18:52:19 +01:00
d2d8bd8cab Merge pull request 'SES-65' (#5) from SES-65 into master
Reviewed-on: #5
2020-12-03 18:36:38 +01:00
f455c985d2 Add migration usage 2020-12-03 17:58:52 +01:00
50a11e0434 Add new class to have cleaner code 2020-12-03 17:50:11 +01:00
13e0e77b52 SES-65 Working database 2020-12-03 17:13:17 +01:00
d59c20bd0b Fix bug with bad intending 2020-12-03 17:00:04 +01:00
294372a2e6 Merge pull request 'configurated material and cdk' (#4) from SES-71 into master
Reviewed-on: #4
2020-12-03 08:39:55 +01:00
7e15254cc1 Added Some based tables and new project 2020-12-02 23:05:06 +01:00
2830b8541b Merge branch 'master' into SES-71 2020-12-02 21:04:19 +01:00
ngawron
be1e856f3a configurated material and cdk 2020-12-02 20:48:24 +01:00
f9cc6273fb Merge pull request 'SES-79' (#3) from SES-79 into master
Reviewed-on: #3
2020-12-02 20:39:21 +01:00
6f7737baa6 Merge branch 'master' into SES-79 2020-12-02 20:39:04 +01:00
8293935bff SES-79 Delete unnecessary code 2020-12-02 20:35:22 +01:00
234b8ef490 Merge pull request 'SES-73 Added routing and removed unnecessary pages' (#2) from SES-73 into master
Reviewed-on: #2
2020-12-02 20:09:10 +01:00
f1d906c1b1 SES-79 Small fix to Jenkinsfile 2020-12-02 20:01:41 +01:00