Commit Graph

442 Commits

Author SHA1 Message Date
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