Commit Graph

472 Commits

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