Commit Graph

83 Commits

Author SHA1 Message Date
dccf769477 Merge pull request 'school-stage stubs' (#24) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/24
2024-06-02 20:31:21 +03:00
d088ef7af8 school-stage stubs 2024-06-02 20:30:51 +03:00
fad8cdfe08 Merge pull request 'school-stage stubs' (#23) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/23
2024-06-02 20:26:27 +03:00
a55e6d2ab2 school-stage stubs 2024-06-02 20:25:51 +03:00
eb6da8aa1b Merge pull request 'school-stage stubs' (#22) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/22
2024-06-02 20:16:40 +03:00
19a55f57c0 school-stage stubs 2024-06-02 20:15:01 +03:00
b649e86a43 Merge pull request 'stubs-kazan-explore' (#21) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/21
2024-06-02 15:28:00 +03:00
guzelkha
c53f016eec Merge branch 'stubs-kazan-explore' of ssh://85.143.175.152:222/bro-students/multy-stub into stubs-kazan-explore 2024-06-02 15:23:45 +03:00
guzelkha
0a7cbc3434 stubs-kazan-explore change 2024-06-02 15:23:16 +03:00
Liliya Vasilova
279650db25 change stubs kazan-explore 2024-06-02 15:15:34 +03:00
2d45b4af72 Change trip schedule stub 2024-06-02 14:15:35 +03:00
bd4de9d7ba Merge pull request 'Add trip schedule stubs kazan-explore' (#20) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/20
2024-06-02 13:20:37 +03:00
10dbe5c147 Add trip schedule stubs kazan-explore 2024-06-02 13:18:35 +03:00
435f17ee22 Merge pull request 'Add stubs kazan-explore' (#19) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/19
2024-06-01 20:40:27 +03:00
677dc3dc29 Add stubs kazan-explore 2024-06-01 20:37:32 +03:00
88e3fe4172 Merge pull request 'Add stubs kazan-explore' (#18) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/18
2024-06-01 20:34:05 +03:00
21dcc8bbec Add stubs kazan-explore 2024-06-01 20:32:45 +03:00
4778dba7ed Merge pull request 'stubs-kazan-explore' (#17) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/17
2024-06-01 20:25:16 +03:00
07a02ade1f Add stubs kazan-explore 2024-06-01 20:22:43 +03:00
311846f92d Add stubs kazan-explore 2024-06-01 19:53:28 +03:00
ebd561098f Merge pull request 'small changes' (#16) from dhs-testing into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/16
2024-06-01 14:14:00 +03:00
b4372eb53a small changes 2024-06-01 14:12:54 +03:00
bdb6b4ca3e Merge pull request 'schoo;-stage stubs' (#15) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/15
2024-06-01 09:54:28 +03:00
426cb70eb6 schoo;-stage stubs 2024-06-01 09:53:26 +03:00
61441e21b8 Merge pull request 'school-stage stubs' (#14) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/14
2024-06-01 09:51:42 +03:00
a6f61ba033 school-stage stubs 2024-06-01 09:51:14 +03:00
8588a7fa38 Merge pull request 'school-stage stubs' (#13) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/13
2024-06-01 00:40:16 +03:00
c35185ea32 school-stage stubs 2024-06-01 00:39:43 +03:00
78a332732d Merge pull request 'api' (#12) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/12
2024-06-01 00:01:29 +03:00
5f54355b97 api 2024-06-01 00:00:00 +03:00
4efbb56905 Merge pull request 'school-stage stubs' (#10) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/10
2024-05-31 23:56:37 +03:00
50c6286190 Merge pull request 'edit tests data' (#11) from dhs-testing into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/11
2024-05-31 23:32:50 +03:00
de29da93ba edit tests data 2024-05-31 23:31:21 +03:00
7cdd7e790f school-stage stubs 2024-05-31 22:04:23 +03:00
569b1b0d9e Merge pull request 'school-stage stubs' (#9) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/9
2024-05-31 18:03:52 +03:00
272961c583 school-stage stubs 2024-05-31 18:01:50 +03:00
63284d6c08 Merge pull request 'school-stage-branch' (#8) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/8
2024-05-31 16:49:59 +03:00
cb56e2dd2c school-stage stubs 2024-05-31 16:38:40 +03:00
325e2f125b school-stage stubs 2024-05-31 16:28:05 +03:00
786085d4d0 Merge pull request 'dhs-testing stubs' (#7) from dhs-testing into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/7
2024-05-30 18:51:51 +03:00
c95a00fb19 fixed json 2024-05-30 18:29:26 +03:00
95373069da dhs-testing stubs 2024-05-30 17:39:33 +03:00
b8275a4c8f Merge pull request 'add-dogsitters-finder' (#6) from add-dogsitters-finder into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/6
Reviewed-by: primakov <primakovpro@gmail.com>
2024-05-27 18:12:19 +03:00
fb868bfefc Change path to json 2024-05-26 16:29:12 +03:00
086c94c58a Update json/users.json 2024-05-26 16:28:54 +03:00
812a95dd85 Merge pull request 'my-project stubs' (#4) from my into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/4
Reviewed-by: primakov <primakovpro@gmail.com>
2024-05-25 12:50:19 +03:00
85ee64e92b Merge pull request 'back add' (#5) from edateam_branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/5
Reviewed-by: primakov <primakovpro@gmail.com>
2024-05-25 12:50:05 +03:00
nothingnowhere1
eb87f400ee edit json files 2024-05-25 12:44:44 +03:00
92cabfa048 Add dogsitters-finder to server/index.json and server/routers 2024-05-25 11:12:21 +03:00
NewPerson
b2a853e183 back add 2024-05-25 00:10:46 +03:00