RomanGolienko
/
Roman_applicant-site
forked from aslan/applicant-site
1
1
Fork 0
Code Pull Requests 2 Activity

prodV1 #2

Open
RomanGolienko wants to merge 309 commits from prodV1 into main
pull from: prodV1
merge into: RomanGolienko:main
Conversation 0 Commits 309 Files Changed 373 +17735 -2997

309 Commits

Author SHA1 Message Date
ROMANGOLIENKO ca2c92f4fe fixing green circle button 2024-04-22 14:23:08 +03:00
aslan 933b0f7e99 Merge pull request 'adding news to inostran and magistr pages' (#49) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/49
 2024-04-17 14:36:33 +03:00
ROMANGOLIENKO ab0d2db731 adding news to inostran and magistr pages 2024-04-17 14:23:57 +03:00
aslan a1e936f156 Merge pull request 'adding news section' (#48) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/48
 2024-04-16 14:35:39 +03:00
ROMANGOLIENKO bdf4e7b64c fixing news section, adding adaptive 2024-04-16 14:22:45 +03:00
ROMANGOLIENKO 3057579f9e adding news section 2024-04-15 16:28:08 +03:00
aslan aca13d134d fix ci 2024-04-09 16:13:17 +03:00
aslan dd859d0ebf Merge pull request 'minor design fixes, adding magistr and inostran pages' (#47) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/47
 2024-04-09 15:55:29 +03:00
ROMANGOLIENKO 31339e6b29 minor design fixes, adding magistr and inostran pages 2024-04-09 15:53:43 +03:00
aslan c6986b6c74 Merge pull request 'minor design changes' (#46) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/46
 2024-04-08 11:34:56 +03:00
ROMANGOLIENKO 1ca14c903c minor design changes 2024-04-08 11:14:48 +03:00
aslan 03b895e32c Merge pull request 'adding video, fixing adaptive' (#45) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/45
 2024-04-08 10:14:02 +03:00
ROMANGOLIENKO a3819e02a1 adding video, fixing adaptive 2024-04-05 16:37:10 +03:00
aslan 0c16dc960e Merge pull request 'fixing main page' (#44) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/44
 2024-04-04 15:01:46 +03:00
ROMANGOLIENKO 48faac8771 fixing main page 2024-04-04 14:15:10 +03:00
aslan dce51c638d fix lint 2024-04-03 15:24:41 +03:00
aslan 432b3d0c5d Merge pull request 'new-calculator' (#43) from new-calculator into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/43
 2024-04-03 15:22:03 +03:00
aslan 4ccd7b651e Merge pull request 'minor design changes' (#42) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/42
 2024-04-03 15:21:33 +03:00
aslan 5547d00565 fix logic new calculator 2024-04-03 15:21:10 +03:00
ROMANGOLIENKO 859a94be84 minor design changes 2024-04-03 15:16:50 +03:00
aslan 0e65ddaed0 add new calculator 2024-04-03 14:46:35 +03:00
aslan ddf218bbf7 fix ci 2024-04-03 12:40:05 +03:00
aslan 9a205d06f5 Merge pull request 'adding news block and yandex maps api' (#41) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/41
 2024-04-03 12:32:04 +03:00
ROMANGOLIENKO 66ae948c6e adding news block and yandex maps api 2024-04-02 15:53:26 +03:00
aslan a8d0774aea Merge pull request 'direction offcanvas minor changes' (#40) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/40
 2024-04-02 13:17:32 +03:00
ROMANGOLIENKO bc0cd7989c direction offcanvas minor changes 2024-04-01 15:57:19 +03:00
aslan 61defaaf37 Merge pull request 'adaptive design fixes' (#39) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/39
 2024-03-27 15:50:32 +03:00
ROMANGOLIENKO 794b0db6a1 adaptive design fixes 2024-03-27 15:50:03 +03:00
aslan d7430e13ee fix ci 2024-03-27 15:35:58 +03:00
aslan edb4a2b383 fix ci 2024-03-27 15:20:38 +03:00
aslan ceef0fe966 fix lint && prodV1 #38 2024-03-27 14:47:06 +03:00
aslan 1a9cdae6e2 fix ci 2024-03-27 14:28:30 +03:00
aslan 97522fd6de fix ci 2024-03-27 14:18:58 +03:00
aslan 6f50c7ff07 fix lint 2024-03-27 14:03:46 +03:00
aslan bd897c90f5 merge pull request - direction view completed, favicon changed #37 2024-03-27 13:57:45 +03:00
ROMANGOLIENKO 22e6a16c32 Merge branch 'prodV1' of http://172.17.254.104/RomanGolienko/Roman_applicant-site into prodV1 2024-03-27 13:45:50 +03:00
ROMANGOLIENKO dd8db9dc4b small design fixes 2024-03-27 13:31:43 +03:00
aslan 742d604f07 fix CI add php8.3-gd 2024-03-27 10:14:39 +03:00
aslan 484038d9c5 fix CI add php8.3-gd 2024-03-27 10:02:28 +03:00
aslan c45bbe4a77 fix CI deleted JIT 2024-03-27 09:52:54 +03:00
aslan b47d800d19 fix lint 2024-03-27 09:47:12 +03:00
aslan 4ff59c8d11 Merge pull request 'redesign of direction card' (#35) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/35
 2024-03-27 09:21:32 +03:00
ROMANGOLIENKO 2f7474d311 direction view completed, favicon changed 2024-03-25 16:59:21 +03:00
ROMANGOLIENKO a9f9a8f0fe fixing budget_places button 2024-03-22 16:33:16 +03:00
ROMANGOLIENKO 1f207a427d redesign of direction card 2024-03-21 16:29:10 +03:00
aslan e435e5c7dd fix lint 2024-03-21 15:23:07 +03:00
aslan e42910067b fix groupedDirections array to main page - add information for faculty 2024-03-21 15:21:44 +03:00
aslan bb262c66f4 fix groupedDirections array to main page - add branches 2024-03-21 15:12:12 +03:00
aslan 09f4ed38f8 Merge remote-tracking branch 'origin/main' 2024-03-21 14:57:14 +03:00
aslan ba9f268ff7 add groupedDirections array to main page 2024-03-21 14:57:08 +03:00
aslan 9bd1c03580 Merge pull request 'design changes' (#34) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/34
 2024-03-21 14:50:13 +03:00
ROMANGOLIENKO 3bf100ed74 design changes 2024-03-21 14:48:08 +03:00
aslan 8667765396 Merge pull request 'new-design' (#33) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/33
 2024-03-20 16:48:16 +03:00
ROMANGOLIENKO 8520384aa3 Merge remote-tracking branch 'origin/new-design' into new-design 2024-03-20 16:44:57 +03:00
ROMANGOLIENKO 560679316d design changes 2024-03-20 16:44:31 +03:00
aslan d5ace86b61 add news 2024-03-20 13:09:39 +03:00
ROMANGOLIENKO 419ec63dde Merge remote-tracking branch 'origin/new-design' into new-design 2024-03-20 11:43:55 +03:00
ROMANGOLIENKO 56662905a9 calculator design fix 2024-03-20 11:43:15 +03:00
ROMANGOLIENKO 4fc8a80a04 fixing directions 2024-03-18 15:22:29 +03:00
ROMANGOLIENKO 303f4e59a0 adding to gitignore 2024-03-18 15:22:29 +03:00
aslan c3eed199ac add directionsWithInstitution to new-design.bakalavr-special 2024-03-18 15:22:06 +03:00
aslan 16785b5698 add queryBuilder and add filter to name for Direction 2024-03-18 14:41:12 +03:00
ROMANGOLIENKO 7fe4d05252 Merge remote-tracking branch 'origin/new-design' into new-design 2024-03-18 13:04:02 +03:00
ROMANGOLIENKO 116c949f45 fixing directions 2024-03-18 13:03:50 +03:00
ROMANGOLIENKO f93404d996 adding to gitignore 2024-03-18 12:26:14 +03:00
ROMANGOLIENKO c2616e8713 adding to gitignore 2024-03-18 12:24:44 +03:00
aslan 9fcd049173 fix new logic to calculator with required and optional subjects 2024-03-18 11:56:03 +03:00
aslan 75870ab2fd fix new logic to calculator with required and optional subjects 2024-03-18 11:55:25 +03:00
aslan 8a94e7a750 fix new logic to calculator with required and optional subjects 2024-03-18 11:36:14 +03:00
aslan 68ccbf2910 fix new logic to calculator with required and optional subjects 2024-03-18 11:21:48 +03:00
aslan 077eda117f fix new logic to calculator with required and optional subjects 2024-03-18 09:49:38 +03:00
aslan 1bd362180e fix lint 2024-03-18 09:44:42 +03:00
aslan b37a1225c4 fix new logic to calculator with required and optional subjects 2024-03-18 09:43:58 +03:00
aslan 08bc93ad2d add new logic to calculator with required and optional subjects 2024-03-15 16:55:58 +03:00
aslan c13f5f38c2 fix lint 2024-03-15 16:15:42 +03:00
aslan 5202545724 Merge pull request 'adding logic to direction view' (#32) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/32
 2024-03-15 16:10:00 +03:00
ROMANGOLIENKO 8e8b16d540 adding logic to direction view 2024-03-15 16:09:19 +03:00
aslan 18c703f931 Merge pull request 'direction show logic change' (#31) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/31
 2024-03-15 10:39:03 +03:00
ROMANGOLIENKO c91ae889a3 direction show logic change 2024-03-15 10:38:26 +03:00
aslan 1155f2c34a Merge remote-tracking branch 'origin/main' 2024-03-14 16:12:49 +03:00
aslan b5951c2d34 add import xls 2024-03-14 16:12:44 +03:00
aslan 056452b137 Merge pull request 'direction offcanvas design change' (#30) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/30
 2024-03-14 13:12:01 +03:00
ROMANGOLIENKO 242d498685 direction offcanvas design change 2024-03-14 13:11:18 +03:00
aslan 00ae3b8938 add gitea host to CI deploy 2024-03-14 11:57:33 +03:00
aslan dcac3ed4a9 add gitea host to CI deploy 2024-03-14 11:49:05 +03:00
aslan 0996ea3b8c add gitea host to CI deploy 2024-03-14 11:46:38 +03:00
aslan 339b4bfb83 add gitea host to CI deploy 2024-03-14 11:46:17 +03:00
aslan dbb3e4190b add gitea host to CI deploy 2024-03-14 11:44:50 +03:00
aslan 8723cc7594 add gitea host to CI deploy 2024-03-14 11:44:07 +03:00
aslan 9496a627fd add gitea host to CI deploy 2024-03-14 11:42:02 +03:00
aslan 51f313b85a add gitea host to CI deploy 2024-03-14 11:21:42 +03:00
aslan 93a54c12fd add gitea host to CI deploy 2024-03-14 11:10:35 +03:00
aslan e93ffe4705 add gitea host to CI deploy 2024-03-14 11:07:16 +03:00
aslan c6742d7d5e delete unique to department in requests 2024-03-14 11:00:35 +03:00
aslan 03b8fa831d add faculty to department field in edit direction 2024-03-14 10:19:46 +03:00
aslan 8304fb438d fix type field to create Educational Institution 2024-03-14 10:16:44 +03:00
aslan cf8cbe5670 install maatwebsite/excel 2024-03-14 10:03:46 +03:00
aslan 61ed53e348 add no cache to header 2024-03-14 10:03:33 +03:00
aslan 8d1078e8d5 add direction profile to direction index 2024-03-14 09:30:46 +03:00
aslan 48767bbf27 add faculty to department 2024-03-13 16:14:27 +03:00
aslan c35a3cefcb delete negative destroy test direction 2024-03-13 15:43:27 +03:00
aslan f1ffe64ef3 update logic for delete direction 2024-03-13 15:40:26 +03:00
aslan 04d596b0eb fix table departments field name not unique 2024-03-13 15:16:41 +03:00
aslan 99f6e2afde Merge pull request 'fix' (#29) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/29
 2024-03-13 15:07:07 +03:00
aslan 2cfca44edc fix lint 2024-03-13 15:06:56 +03:00
ROMANGOLIENKO ef1524b96e fix 2024-03-13 15:06:45 +03:00
aslan 1aded8007b Merge pull request '1' (#28) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/28
 2024-03-13 15:05:01 +03:00
ROMANGOLIENKO 5fc547803c 1 2024-03-13 15:04:18 +03:00
aslan b9ad413fbb fix calculator 2024-03-13 15:02:39 +03:00
aslan ac72d0d562 fix calculator 2024-03-13 14:48:21 +03:00
aslan 1743d10289 fix calculator 2024-03-13 14:44:54 +03:00
aslan 27cbb5d8cf desc sort to direction 2024-03-13 14:29:58 +03:00
aslan 858492cd2e fix cost_paid_place table directions field name 2024-03-13 14:08:40 +03:00
aslan f5638722a6 fix unique table directions field name 2024-03-13 14:06:50 +03:00
aslan 6187bf360e fix cost paid 200 000 2024-03-13 13:57:20 +03:00
aslan 3d71cdde17 any fix 2024-03-13 13:49:37 +03:00
aslan 490f720850 Merge pull request 'adding white logo, fixing' (#27) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/27
 2024-03-13 13:45:54 +03:00
ROMANGOLIENKO f7b5773c4d adding white logo, fixing 2024-03-13 13:45:21 +03:00
aslan a0ce271215 Merge pull request 'fixing professor' (#26) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/26
 2024-03-13 13:22:43 +03:00
ROMANGOLIENKO 7c904cec0e fixing professor 2024-03-13 13:15:29 +03:00
aslan 919bfca236 fix tooltips 2024-03-13 13:10:59 +03:00
aslan 45143e541f add edit direction validation bootstrap 2024-03-13 13:04:36 +03:00
aslan e397d4b46a fix slug deparment 2024-03-13 12:33:48 +03:00
aslan 78c5d7700e fix messages valdation and any fix 2024-03-13 11:57:15 +03:00
aslan 54901c7ed5 add Logging to DirectionController 2024-03-13 11:41:33 +03:00
aslan ec57a7bd02 fix slug store in Educational Institution 2024-03-13 11:28:12 +03:00
aslan f3c98e1548 Merge branch 'main' of gitea.mkgtu.ru:aslan/applicant-site 2024-03-13 11:24:13 +03:00
aslan 7f2f24ca59 add bootstrap validation and Logging for Educational Institution 2024-03-13 11:24:10 +03:00
aslan 4cb1422b09 Merge pull request 'fixing professor' (#25) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/25
 2024-03-13 11:20:27 +03:00
ROMANGOLIENKO be5eb8fa82 fixing professor 2024-03-13 11:19:55 +03:00
aslan 8a6e1bea3d fix lint and test 2024-03-13 11:04:38 +03:00
aslan ebe604293f Merge branch 'main' of gitea.mkgtu.ru:aslan/applicant-site 2024-03-13 10:56:35 +03:00
aslan 5fa4b20ec7 add bootstrap validation and Logging for Department 2024-03-13 10:56:14 +03:00
aslan 6230a15d17 Merge pull request 'cross-browser code added' (#24) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/24
 2024-03-13 10:43:10 +03:00
ROMANGOLIENKO 4af0da1984 cross-browser code added 2024-03-13 10:38:59 +03:00
aslan 4e2d8bec4b add bootstrap validation and Logging for Entrance Examination 2024-03-13 10:26:59 +03:00
aslan 2104362d4e add bootstrap validation and Logging for Education Form 2024-03-12 15:45:48 +03:00
aslan 299817069e add bootstrap validation and Logging for Education Level 2024-03-12 15:32:18 +03:00
aslan 4eee38fea3 add bootsrtap validation and Logging for Examination type 2024-03-12 14:36:35 +03:00
aslan db7704df6e fix to Faculty 2024-03-12 14:36:06 +03:00
aslan 59d2e38110 fix logging level to Faculty 2024-03-12 13:51:06 +03:00
aslan 5cf8061fd5 add bootstrap validated and logging to Subject 2024-03-12 13:50:42 +03:00
aslan ed47971981 disable phpcs for html code in services 2024-03-12 13:09:48 +03:00
aslan 9e689c8b68 Merge branch 'RomanGolienko-new-design' 2024-03-12 12:59:08 +03:00
aslan 08c6632aec Merge branch 'new-design' of http://172.17.254.104/RomanGolienko/Roman_applicant-site into RomanGolienko-new-design 2024-03-12 12:57:25 +03:00
ROMANGOLIENKO 15c6dcc5bc Merge remote-tracking branch 'origin/new-design' into new-design 
# Conflicts:
#	resources/views/new-design/bakalavr-special.blade.php
 2024-03-12 12:48:43 +03:00
ROMANGOLIENKO 1ef21ae943 calculator 2024-03-12 12:47:12 +03:00
aslan 2c32dd8667 any fix direction profile 2024-03-12 12:45:22 +03:00
aslan 66fdb9d7b0 add Slug Helper 2024-03-12 12:40:40 +03:00
aslan 40414f6da8 add bootstrap validated and logging to Subject Type Profile 2024-03-12 12:40:05 +03:00
aslan 64ad13f96f add bootstrap validated and logging to Direction Profile and fix faculty Logging 2024-03-12 11:22:37 +03:00
aslan e2a7b2ec98 fix scenario for deploy CI 2024-03-12 10:05:06 +03:00
aslan ad97ed8a43 add setup scenario for CI 2024-03-12 09:43:22 +03:00
aslan 2eca5776b9 fix lint & tests errors 2024-03-12 09:38:42 +03:00
aslan 54e3706dd0 Merge pull request 'new-design changes' (#22) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/22
 2024-03-12 09:33:27 +03:00
aslan bbd706bd82 add logging to faculty 2024-03-12 09:32:57 +03:00
aslan 3c37c2b903 add logging to faculty 2024-03-11 14:34:23 +03:00
aslan b9c143bab5 add Logging to project with route admin/logs 2024-03-11 14:31:45 +03:00
ROMANGOLIENKO f15fc3f7f7 new-design changes 2024-03-11 13:27:40 +03:00
aslan 09b7c8cbe3 add faculty bootstrap validate to faculty update 2024-03-11 13:07:01 +03:00
aslan 6ac6c8436b update composer 2024-03-11 13:06:26 +03:00
ROMANGOLIENKO f1cefa1184 new-design changes 2024-03-07 16:27:19 +03:00
aslan d0abc35a07 fix calculator 2024-03-07 15:09:01 +03:00
aslan 5d7863a655 Merge pull request 'new-design' (#21) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/21
 2024-03-07 14:02:33 +03:00
ROMANGOLIENKO f68e22fa9f new-design changes 2024-03-07 14:01:54 +03:00
aslan 730573b1fe fix CI 2024-03-07 14:00:45 +03:00
aslan b43e602fab Merge pull request 'new-design' (#20) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/20
 2024-03-07 13:59:39 +03:00
aslan 19b075c755 add api calculator 2024-03-07 13:58:54 +03:00
ROMANGOLIENKO b372f14c37 new-design changes 2024-03-07 13:08:28 +03:00
aslan cc89ecabe8 add bootstrap validation for Direction 2024-03-06 17:11:35 +03:00
ROMANGOLIENKO 471d02aac5 adding logic in views 2024-03-06 15:50:09 +03:00
ROMANGOLIENKO 50be5bfd70 adding logic in views 2024-03-06 15:49:43 +03:00
aslan 2c209f5ddc add unique field for faculty and bootstrap validation for Faculty 2024-03-06 15:22:07 +03:00
aslan d3c6a8336a add localize for tooltips for Faculty create 2024-03-06 15:21:09 +03:00
aslan 6fa24915be add api route for calculator 2024-03-06 15:20:16 +03:00
aslan b095a0f51b fix tests errors 2024-03-06 10:31:27 +03:00
aslan 98e7687d72 composer update 2024-03-05 16:54:26 +03:00
aslan 7f98a7edc5 merge roman 2024-03-05 16:52:52 +03:00
aslan 19ea529eb2 fix tests errors 2024-03-05 16:51:29 +03:00
aslan 1163f5e007 Merge pull request 'adding logic in views' (#19) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/19
 2024-03-05 16:33:03 +03:00
ROMANGOLIENKO 33b803472d adding logic in views 2024-03-05 16:31:27 +03:00
aslan 6ae42fafe8 fix DirectionProfile store and update 2024-03-05 15:38:09 +03:00
aslan b3d4231ec8 for view faculty 2024-03-05 14:29:18 +03:00
aslan c4caf84226 add rules message and active class to main menu 2024-03-05 11:23:18 +03:00
aslan 3dc4b84357 Merge branch 'main' of gitea.mkgtu.ru:aslan/applicant-site 2024-03-04 17:25:06 +03:00
aslan 0a9f7ab004 add locale for requests and position helper 2024-03-04 17:24:12 +03:00
aslan a8c6394684 Merge pull request 'variations added' (#18) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/18
 2024-03-04 15:28:23 +03:00
ROMANGOLIENKO f24aa19877 variations added 2024-03-04 15:26:53 +03:00
aslan 8109381611 Merge pull request 'modal added' (#17) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/17
 2024-03-04 13:40:07 +03:00
ROMANGOLIENKO 68dddc98fe modal added 2024-03-04 13:39:38 +03:00
ROMANGOLIENKO e7aba8b09c modal added 2024-03-04 13:26:17 +03:00
aslan d0a9dcae2b lint fix 2024-03-04 09:54:14 +03:00
aslan 435ad06dca add duplication at Direction 2024-03-04 09:53:33 +03:00
aslan 86597ad075 refactoring Direction edit, add firstOrNew in add entrance-examination 2024-03-04 08:56:42 +03:00
aslan 44fdacb9e4 Merge branch 'main' of gitea.mkgtu.ru:aslan/applicant-site 2024-02-29 18:01:43 +03:00
aslan 9d7f531ac8 reorganization DirectionProfile and Direction to many to many 2024-02-29 18:01:23 +03:00
aslan bd8bb7e059 reorganization direction resource 2024-02-29 18:00:50 +03:00
aslan ade2422a4b reorganization resource Cost, Places, Placetype, Period 2024-02-29 17:58:02 +03:00
aslan 022d8cc0ec Merge pull request 'main page completed' (#16) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/16
 2024-02-29 16:44:08 +03:00
ROMANGOLIENKO 727d273d97 main page completed 2024-02-29 16:42:44 +03:00
aslan f482d036e1 any fix 2024-02-28 15:05:54 +03:00
aslan 422a5872c9 add entrance Examination to store Direction 2024-02-28 15:05:41 +03:00
aslan 3cb9ec4a08 add jquery to project 2024-02-28 15:04:10 +03:00
aslan c1dbcc82b3 add quota at Places Resource 2024-02-28 15:03:46 +03:00
aslan 4ed8dabb19 add Period resource 2024-02-26 14:21:23 +03:00
aslan 74d0c8f678 add Period resource 2024-02-26 14:20:16 +03:00
aslan afcdd940dd add Period resource 2024-02-26 13:10:16 +03:00
aslan cc64e20ad5 add Period resource 2024-02-26 11:34:33 +03:00
aslan 88cf25014c lint fix 2024-02-26 10:58:36 +03:00
aslan 5f5c3135d8 add Direction Profile resource 2024-02-26 10:58:02 +03:00
aslan 1e804e1161 fix rename methods in PlaceController.php 2024-02-26 09:38:17 +03:00
aslan 115f49ea53 add Cost resource 2024-02-26 09:37:27 +03:00
aslan d8dbf40445 lint fix 2024-02-26 08:46:18 +03:00
aslan 52dd465532 add Place and PlaceType resources 2024-02-19 18:55:44 +03:00
aslan 75452eff7d any fix in Subject type resource 2024-02-19 11:00:44 +03:00
aslan 7d08fb0e12 Merge remote-tracking branch 'github/main' 
# Conflicts:
#	app/Http/Controllers/admin/Catalog/Direction/EntranceExaminationController.php
 2024-02-19 10:55:31 +03:00
aslan 566087919b add EntranceExamination resource 2024-02-19 10:53:17 +03:00
aslan 881c0c63b7 add EntranceExamination resource 2024-02-19 10:51:20 +03:00
aslan be385af496 fix deploy crash 2024-02-17 13:08:01 +03:00
aslan 1ae23bc31c fix deploy crash 2024-02-17 13:04:41 +03:00
aslan 5b1e4cab99 fix SubjectType recourse 2024-02-17 12:31:22 +03:00
aslan 84061c6c95 fix structure files 2024-02-17 11:31:19 +03:00
aslan 1462d70800 add Subject resource 2024-02-17 11:30:32 +03:00
aslan 5f3c4449c0 add ExaminationTypeTest.php 2024-02-17 10:24:21 +03:00
aslan f5d69e9c7f fix tests error show view on examination type 2024-02-17 10:10:57 +03:00
aslan 1e0cf9a9e0 fix lint 2024-02-17 09:24:45 +03:00
aslan e86a93d3d4 add refresh 2024-02-16 16:28:30 +03:00
aslan a78f2bdef5 add faker to required 2024-02-16 16:23:35 +03:00
aslan c34ba769dd add faker to required 2024-02-16 16:19:38 +03:00
aslan 0fc9053675 add dev to install docker 2024-02-16 16:12:50 +03:00
aslan 8b2736e785 add comand db-prepare and start-app 2024-02-16 16:04:44 +03:00
aslan f8f6d4b3d3 add fix in appservice provider 2024-02-16 15:59:29 +03:00
aslan 65d9b41197 add php 8.3 2024-02-16 15:55:04 +03:00
aslan 96e2e4270c add php 8.3 2024-02-16 15:53:07 +03:00
aslan 4b154e1160 add php 8.3 2024-02-16 15:51:13 +03:00
aslan 90488e5d99 add php 8.3 2024-02-16 15:47:08 +03:00
aslan 46d984b49b add php 8.3 2024-02-16 15:38:13 +03:00
aslan 00271923b1 add xdebud.ini 2024-02-16 15:25:30 +03:00
aslan 6e7ed94654 add Docker for deploy 2024-02-16 15:20:54 +03:00
aslan 7d149e8845 Merge pull request 'new design (blue) font added in public/fonts' (#15) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/15
 2024-02-16 14:40:47 +03:00
ROMANGOLIENKO 7b6db05648 new design (blue) font added in public/fonts 2024-02-16 14:40:04 +03:00
aslan 33bf946ab2 Merge pull request 'new-design' (#14) from RomanGolienko/Roman_applicant-site:new-design into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/14
 2024-02-16 14:21:22 +03:00
ROMANGOLIENKO 88919c251d Merge remote-tracking branch 'origin/new-design' into new-design 2024-02-16 13:40:13 +03:00
ROMANGOLIENKO 4e5d567720 new design (blue) 2024-02-16 13:39:57 +03:00
aslan 1070d543c5 add ExaminationType resource 2024-02-16 10:43:55 +03:00
aslan d9362477c2 refactoring move to directory Direction 2024-02-16 09:06:48 +03:00
aslan 23033cbb1f refactoring fix unique field slug in Requests 2024-02-15 14:46:35 +03:00
ROMANGOLIENKO c4d11de8ad design variations 2024-02-15 11:33:49 +03:00
ROMANGOLIENKO dc54ec6b74 design changes for admin-layout.blade.php and reception-screen.blade.php 2024-02-15 11:33:49 +03:00
aslan 9beeeb4edb add field education form to show Direction 2024-02-15 10:19:35 +03:00
aslan 8cf5631f5a add Education Form resource 2024-02-15 09:58:01 +03:00
aslan 17625fd0d4 fix lint delete comments 2024-02-14 17:12:33 +03:00
aslan 454a4a6d96 fix lint 2024-02-14 16:41:51 +03:00
aslan e7818471db refactoring Requests max characters and numeric field 2024-02-14 16:41:19 +03:00
aslan 6954e296d6 refactoring migrations nullable or not 2024-02-14 16:19:31 +03:00
aslan 639a8c92af add Education Level test 2024-02-14 16:16:44 +03:00
aslan 75899051c7 add Education Level resource 2024-02-14 15:00:28 +03:00
aslan 295d7a5711 fix update unique name 2024-02-14 14:08:28 +03:00
aslan d9b8f8be33 delete unused element 2024-02-14 13:54:18 +03:00
aslan 6a4c2253d1 move views from menu to pages 2024-02-14 13:31:15 +03:00
aslan 52d3d7af09 fix lint 2024-02-14 10:29:17 +03:00
aslan 83a398c5bc fix lint 120 char per line 2024-02-14 10:22:04 +03:00
aslan 0cdc43d547 refactoring User resource 2024-02-14 10:20:40 +03:00
aslan a5f8751f94 refactoring User resource 2024-02-14 10:18:45 +03:00
aslan fc706fce82 refactoring User resource 2024-02-14 09:54:11 +03:00
aslan 2a21e25200 fix field description from string to text 2024-02-14 09:49:56 +03:00
aslan 1659980a2e refactoring Admission and Document resource 2024-02-14 09:46:41 +03:00
aslan 5a462a0823 add field URL to show views from department, direction, documents 2024-02-14 09:45:55 +03:00
aslan 4b094339f0 refactoring Document and Admission resource 2024-02-14 09:44:53 +03:00
aslan fffd4c3310 refactoring views, rename routes 2024-02-13 16:01:03 +03:00
aslan 968a4b06c8 refactoring requests rules 2024-02-13 15:38:30 +03:00
aslan 3e50dee628 refactoring Reception screen to Admission 2024-02-13 15:37:41 +03:00
ROMANGOLIENKO e15ff69e01 design variations 2024-02-12 15:47:19 +03:00
aslan 551864fbb8 refactoring rename admin view 2024-02-12 15:02:31 +03:00
aslan 94300bee31 refactoring Service Layer 2024-02-12 14:56:24 +03:00
aslan 1f67f437f3 refactoring EducationalInstitution resource 2024-02-12 14:55:17 +03:00
aslan 173a744f79 refactoring routes 2024-02-12 14:52:55 +03:00
aslan f391a26b7d refactoring Faculty resource 2024-02-12 12:15:46 +03:00
aslan 54765f6202 refactoring Departments and Directions 2024-02-12 11:25:00 +03:00
aslan 07cb065e1c add FOREIGN KEY direction and department 2024-02-12 11:05:45 +03:00
aslan c5abf73eb0 refactoring fix lint Direction resource 2024-02-12 10:58:48 +03:00
aslan 1091847227 refactoring fix lint Department resource 2024-02-12 10:39:46 +03:00
aslan 7d4461e231 add tests to Department resource 2024-02-12 10:27:08 +03:00
aslan 35104455c2 refactoring Department resource 2024-02-12 09:19:08 +03:00
aslan abfa800707 refactoring regroup requests 2024-02-10 15:45:23 +03:00
aslan b07fb7648f refactoring delete not used elements 2024-02-10 15:14:02 +03:00
aslan afebc7ea6c fix CI 2024-02-10 15:01:57 +03:00
aslan 559d925c51 fix CI 2024-02-10 14:47:45 +03:00
aslan b75c784cdf fix CI 2024-02-10 14:46:03 +03:00
aslan 8e18821812 fix CI 2024-02-10 14:36:40 +03:00
aslan 447f8f5552 fix CI 2024-02-10 14:32:50 +03:00
aslan caafa73a1b fix CI 2024-02-10 14:30:32 +03:00
aslan eb4206e86d fix CI 2024-02-10 14:26:16 +03:00
aslan 023dba341a fix CI 2024-02-10 14:21:43 +03:00
aslan 3d14987fcb fix CI 2024-02-10 14:10:57 +03:00
aslan 03690516f5 fix CI 2024-02-10 14:10:13 +03:00
aslan 95f2c72231 fix CI 2024-02-10 14:06:34 +03:00
aslan 98a2dd92f8 fix CI 2024-02-10 14:06:05 +03:00
aslan 3da2646052 fix CI 2024-02-10 12:43:55 +03:00
aslan 9ebb8e8372 fix CI 2024-02-10 12:42:09 +03:00
aslan 887d946558 fix CI 2024-02-10 12:38:00 +03:00
aslan a2a00831ad fix CI 2024-02-10 12:22:06 +03:00
aslan 490c04f772 fix CI 2024-02-10 12:20:06 +03:00
aslan f1442e66d8 fix CI 2024-02-10 12:04:50 +03:00
aslan 4cbf0cadda fix CI 2024-02-10 11:58:47 +03:00
aslan 56d4f387b8 add Direction resource 2024-02-10 11:23:38 +03:00
aslan fe8e9c94c0 rename fileController to DocumentController 2024-02-09 14:31:12 +03:00
aslan de6b83d675 refactoring routes 2024-02-09 14:30:42 +03:00
ROMANGOLIENKO 63441e5ef7 design changes for admin-layout.blade.php and reception-screen.blade.php 2024-02-09 11:05:45 +03:00