Commit Graph

153 Commits

Author SHA1 Message Date
7124b457dc feat/documents (#61)
add get scan endpoint

add document scan endpoint

Co-authored-by: MaxchilKH <m.w.bohdanowicz@gmail.com>
2020-10-08 19:27:45 +02:00
b98ab42c4d fix/endpoints (#60)
add

Merge branch 'master' of http://git.kadet.net/system-praktyk/system-praktyk-api into fix/endpoints

fix

Co-authored-by: MaxchilKH <m.w.bohdanowicz@gmail.com>
2020-10-04 13:30:28 +02:00
28859a601c fix (#59)
fix

Co-authored-by: MaxchilKH <m.w.bohdanowicz@gmail.com>
2020-10-04 12:48:29 +02:00
7d8e51212a clean up api bit (#58)
clean up api  bit

Co-authored-by: MaxchilKH <m.w.bohdanowicz@gmail.com>
2020-10-04 12:12:11 +02:00
1b80f058dc Merge pull request 'InternshipTypeNextFixes' (#57) from InternshipTypeNextFixes into master 2020-10-03 22:33:21 +02:00
589b6a7a04 new migration 2020-10-03 22:32:10 +02:00
e5868e4f63 InternshipType changes + new migration 2020-10-03 22:31:53 +02:00
603358c4eb endpoints ... 2020-10-03 21:38:52 +02:00
5ae4b983bb fix/tytokurwaniepotrafisznicporzadniezrobic (#55)
Merge branch 'master' of http://git.kadet.net/system-praktyk/system-praktyk-api into fix/tytokurwaniepotrafisznicporzadniezrobic

KEK

Co-authored-by: MaxchilKH <m.w.bohdanowicz@gmail.com>
2020-10-03 00:36:49 +02:00
b4b05b7ef3 fix/tytokurwaniepotrafisznicporzadniezrobic (#55)
Merge branch 'master' of http://git.kadet.net/system-praktyk/system-praktyk-api into fix/tytokurwaniepotrafisznicporzadniezrobic

KEK

Co-authored-by: MaxchilKH <m.w.bohdanowicz@gmail.com>
2020-10-02 23:21:08 +02:00
3a2b9b64d5 KEK (#54)
KEK

Co-authored-by: MaxchilKH <m.w.bohdanowicz@gmail.com>
2020-10-02 21:27:58 +02:00
8514e593fa doroboty (#53)
XDDDEEEE

gtfo

Merge branch 'master' of http://git.kadet.net/system-praktyk/system-praktyk-api into doroboty

finaly

Co-authored-by: MaxchilKH <m.w.bohdanowicz@gmail.com>
2020-10-02 19:56:53 +02:00
0b27330931 Merge pull request 'Revert' (#52) from MoreEndpoints into master 2020-09-27 14:40:48 +02:00
74e0665aed Revert 2020-09-27 14:39:40 +02:00
e24e7e7471 Merge pull request 'One context again' (#51) from MoreEndpoints into master 2020-09-27 14:18:32 +02:00
2576fda4c8 One context again 2020-09-27 14:17:47 +02:00
eee47200f2 Merge pull request 'get edition info by guid fix + add course info' (#50) from MoreEndpoints into master 2020-09-27 12:24:15 +02:00
a06811fc9f get edition info by guid fix + add course info 2020-09-27 12:23:50 +02:00
1899b934b0 Merge pull request 'SubmitRegistrationForm - fixes' (#49) from MoreEndpoints into master 2020-09-27 12:03:46 +02:00
058d6d30bf SubmitRegistrationForm - fixes 2020-09-27 12:03:13 +02:00
12a1081c8d Merge pull request 'Fixes + GetCurrentEditionInternship' (#48) from MoreEndpoints into master 2020-09-27 11:26:33 +02:00
0d62134963 Fixes + GetCurrentEditionInternship 2020-09-27 11:25:03 +02:00
4963c8cbc4 Merge pull request 'longer EXPIRATION time' (#47) from MoreEndpoints into master 2020-09-27 09:11:34 +02:00
9991e4df5f longer EXPIRATION time 2020-09-27 09:10:44 +02:00
50f65cfe09 Merge pull request 'Auto migration next vesrion' (#46) from MoreEndpoints into master 2020-09-26 18:39:03 +02:00
12e952b0ce Auto migration next vesrion 2020-09-26 18:32:55 +02:00
09289183ab Merge pull request 'Auto migration mechanism - first attempt' (#45) from MoreEndpoints into master 2020-09-26 16:47:13 +02:00
1443abc391 Auto migration mechanism - first attempt 2020-09-26 16:45:38 +02:00
94ef521625 Merge pull request 'CRUD internshipType' (#44) from MoreEndpoints into master 2020-09-24 20:52:09 +02:00
78ebdbe33d CRUD internshipType 2020-09-24 20:51:18 +02:00
6d6cf68fe2 Merge pull request 'New static pages endpoints' (#43) from MoreEndpoints into master 2020-09-24 18:15:37 +02:00
d0972673d8 New static pages endpoints 2020-09-24 18:14:24 +02:00
7115060ebd Merge pull request 'SearchQuery changes + new student endpoints' (#41) from AnotherDbSet into master 2020-09-24 17:23:12 +02:00
02be2f9f2e SearchQuery changes + new student endpoints 2020-09-24 17:23:12 +02:00
0c58248d2a Merge pull request 'New DbContext and crud for companies' (#40) from AnotherDbSet into master 2020-09-23 12:40:42 +02:00
da052c19aa Student update current data and get current data 2020-09-23 12:38:44 +02:00
fa0448bef6 New DbContext and crud for companies 2020-09-23 09:18:54 +02:00
54dfcaa7e7 feat/authorization (#39)
move client

merge

add Gut authentication and authorization

merge

dummy

Co-authored-by: MaxchilKH <m.w.bohdanowicz@gmail.com>
2020-09-13 01:07:40 +02:00
5884a444a9 eng static pages fill 2020-09-12 17:23:51 +02:00
c89229d1a9 Rewrite Nip and PhoneNumber 2020-09-12 17:18:35 +02:00
7b7998f408 fixes 2020-09-12 16:49:44 +02:00
a06991a318 Rewrite InternshipType 2020-09-12 16:03:05 +02:00
a508f9f4a8 static pages 2020-09-12 14:17:57 +02:00
cb2afcb897 Resolve InternshipType List in Edition problem 2020-09-05 20:51:42 +02:00
c401081dc8 add IntetnshipService 2020-09-05 20:51:42 +02:00
d81ebc98fb Merge pull request 'InternshipRegistration - EndPoint implementation' (#34) from InternshipRegistration into master 2020-09-04 20:44:15 +02:00
203a6a597d cancellationToken 2020-08-31 18:21:16 +02:00
5054330f29 cleanign 2020-08-31 18:13:30 +02:00
35bc61676f sync master
# Conflicts:
#	src/InternshipSystem.Api/Controllers/EditionController.cs
#	src/InternshipSystem.Core/Entity/Edition.cs
#	src/InternshipSystem.Core/Entity/Internship/InternshipRegistration.cs
#	src/InternshipSystem.Core/Entity/Report.cs
2020-08-31 17:22:02 +02:00
4549d31b6e whatever 2020-08-29 17:25:48 +02:00