Commit Graph

Select branches

Hide Pull Requests

develop

feature/task-1

feature/task-10

feature/task-11

feature/task-2

feature/task-3

feature/task-4

feature/task-5

feature/task-6

feature/task-7

feature/task-8

feature/task-9

feature/task-fixes

master

#1

#10

#11

#12

#13

#14

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• d157d40747 Merge pull request 'prod' (#14) from develop into master master klllst 2024-06-25 21:58:28 +04:00
• ac5d318cef Merge pull request 'Add password mail' (#13) from feature/task-fixes into develop #14 develop ksenia_nevaeva 2024-06-25 21:40:05 +04:00
• c6676bd6d1 Add password mail #13 feature/task-fixes ksenianeva 2024-06-25 21:38:21 +04:00
• 780a12581f Fix m.zargarov 2024-06-25 10:04:46 +04:00
• 733bb76122 Export average scores to PDF m.zargarov 2024-06-25 01:42:23 +04:00
• c7fefd138a Fix m.zargarov 2024-06-25 00:52:48 +04:00
• 321ce81ff0 Add export to excel m.zargarov 2024-06-24 22:04:44 +04:00
• ecec8b176c Merge pull request 'Task-11' (#12) from feature/task-11 into develop klllst 2024-06-24 17:36:54 +04:00
• 769760f414 Fix #12 feature/task-11 m.zargarov 2024-06-24 01:28:58 +04:00
• d4cabb23b7 Fix m.zargarov 2024-06-24 00:51:05 +04:00
• b088c3d624 Fix m.zargarov 2024-06-23 20:26:00 +04:00
• 2e3d757a53 Merge pull request 'Task-10 (Journal)' (#11) from feature/task-10 into develop klllst 2024-06-23 17:03:04 +04:00
• 6fb18f6949 Add mnogo chego #11 feature/task-10 m.zargarov 2024-06-23 17:02:18 +04:00
• 36cb0c700a Rebase m.zargarov 2024-06-23 01:02:03 +04:00
• 5395261084 hz m.zargarov 2024-06-23 00:51:15 +04:00
• bcdec4dcc7 Rebase m.zargarov 2024-06-23 00:58:31 +04:00
• 1216f6b81b Rebase m.zargarov 2024-06-23 00:57:29 +04:00
• bd0aca1ff5 Merge pull request 'Task-8 (Authorization)' (#10) from feature/task-8 into develop klllst 2024-06-23 00:06:35 +04:00
• fb8a8a3fa5 merge conflict #10 feature/task-8 m.zargarov 2024-06-23 00:06:14 +04:00
• 50b4ebda71 add authoriztion m.zargarov 2024-06-22 23:59:16 +04:00
• 2255a901be Fix m.zargarov 2024-06-20 15:57:12 +04:00
• 24b5683090 Add journal m.zargarov 2024-06-20 12:27:05 +04:00
• f63535f0d3 Merge pull request 'feature/task-9 (PDF)' (#9) from feature/task-9 into develop klllst 2024-06-17 17:40:02 +04:00
• 95a39eefb8 Added export subjects to pdf #9 feature/task-9 m.zargarov 2024-06-17 17:38:29 +04:00
• 63fce9309c Merge pull request 'feature/task-7 (Authentication)' (#8) from feature/task-7 into develop klllst 2024-06-16 12:26:56 +04:00
• 2214c533d0 Merge pull request 'feature/task-7 (Authentication)' (#7) from feature/task-7 into master klllst 2024-06-16 12:25:51 +04:00
• 48b191e345 Fix #8 #7 feature/task-7 m.zargarov 2024-06-16 12:24:07 +04:00
• b33b694547 Change service and fix filters m.zargarov 2024-06-16 12:20:48 +04:00
• 67c2e366c5 Add auth m.zargarov 2024-06-16 00:41:31 +04:00
• b3b3e2b8ee Merge pull request 'task-6 (Factories and seeders)' (#6) from feature/task-6 into develop klllst 2024-06-15 20:57:03 +04:00
• ba38b9b1d8 Add factories and seeder #6 feature/task-6 m.zargarov 2024-06-15 20:55:20 +04:00
• 3068ef2994 Merge pull request 'task-5 (Lessons and Scores)' (#5) from feature/task-5 into develop klllst 2024-05-27 18:42:11 +04:00
• 65c47fe151 Fixed #5 feature/task-5 m.zargarov 2024-05-27 18:40:22 +04:00
• 92efb4498d Fixed m.zargarov 2024-05-27 16:57:28 +04:00
• 25d3463182 Added show scores + some fixes m.zargarov 2024-05-17 18:46:12 +04:00
• c269765c39 changed views m.zargarov 2024-05-13 16:44:00 +04:00
• 2de4f3ca82 Remake many-to-many for scores m.zargarov 2024-05-13 14:43:49 +04:00
• 619254a204 added filter to lessons m.zargarov 2024-05-13 14:23:21 +04:00
• 6ad697924a Added lesson's views m.zargarov 2024-05-08 16:55:32 +04:00
• d6778d1455 added routes desciption to Lesson m.zargarov 2024-05-08 13:34:54 +04:00
• a9ed0e58fd added enum m.zargarov 2024-05-08 12:59:44 +04:00
• 85d7aacb02 added controller and service m.zargarov 2024-05-08 12:59:29 +04:00
• 08f5909a9f changed models m.zargarov 2024-05-08 12:15:55 +04:00
• 1a0cf48515 changed migrations m.zargarov 2024-05-08 12:03:55 +04:00
• 7a80e52d3c relationship between lesson and score m.zargarov 2024-05-08 11:39:35 +04:00
• 4cdbe1ab92 added Lesson model m.zargarov 2024-05-07 17:16:34 +04:00
• c632489cf3 added Pivot model m.zargarov 2024-05-07 17:15:58 +04:00
• 8b708ab597 Added score's migration m.zargarov 2024-05-07 15:19:07 +04:00
• 239860d551 Merge pull request 'task-4 (many-to-many)' (#4) from feature/task-4 into develop klllst 2024-05-07 15:09:02 +04:00
• 2b7f8cf2df Added binding grade with teachers #4 feature/task-4 m.zargarov 2024-05-07 15:05:10 +04:00
• 2ccf102e5e Correction code style m.zargarov 2024-05-07 12:18:02 +04:00
• 622b359e1f Added binding grade with subjects m.zargarov 2024-05-07 12:14:18 +04:00
• fb2fda38bb Correction code style m.zargarov 2024-05-06 17:51:16 +04:00
• 67a02034f1 Added binding teacher with subjects m.zargarov 2024-05-06 17:47:25 +04:00
• fd6e0d967b Merge pull request 'feature/task-3 (Users)' (#3) from feature/task-3 into develop klllst 2024-05-06 12:01:32 +04:00
• f13fb375e7 Added cascade to students #3 feature/task-3 m.zargarov 2024-05-03 13:13:42 +04:00
• b63b97e54d Changed views m.zargarov 2024-05-03 12:42:37 +04:00
• 3ed3475e6a Fixes m.zargarov 2024-04-27 15:10:21 +04:00
• e8fe978d42 Added Telescope m.zargarov 2024-04-24 13:40:11 +04:00
• 2807140c65 Added views, controllers, services m.zargarov 2024-04-23 14:52:49 +04:00
• 0485df95cf Added polymorphic relationships m.zargarov 2024-04-17 13:02:44 +04:00
• b49a8f33f6 Added models and migrations m.zargarov 2024-04-17 11:16:08 +04:00
• 49660c51a2 Merge pull request 'task-2(Subjects)' (#2) from feature/task-2 into develop klllst 2024-04-17 10:13:20 +04:00
• ec75dfed5d Added Subjects #2 feature/task-2 m.zargarov 2024-04-17 10:11:31 +04:00
• ad825f534f Merge pull request 'task-1 (Grades)' (#1) from feature/task-1 into develop klllst 2024-04-16 13:53:33 +04:00
• 85c982e8aa Added Grades #1 feature/task-1 m.zargarov 2024-04-16 13:27:51 +04:00
• 02560e4b6f create project m.zargarov 2024-04-15 16:23:05 +04:00