コミットグラフ

625 コミット

作成者 SHA1 メッセージ 日付
dragon1211
b15eb7e3aa bugfixed child-side.jsx 2021-11-07 16:41:47 +09:00
dragon1211
cbd52f45fb bugfixed infiniteScoll of meeting and search. 2021-11-07 16:05:48 +09:00
dragon1211
b82fe14287 c-accountログイン機能、meeting、search完成しました。 2021-11-07 03:13:31 +09:00
dragon1211
cb0aa727e3 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search 2021-11-06 23:41:53 +09:00
e7c2b4d841 Merge branch 'c_account' of github.com:nakazawakan/kikikanri into backend 2021-11-06 23:18:15 +09:00
5c91e533b4 2021-11-06 23:17:15 +09:00
dragon1211
f957dd0ae2 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search 2021-11-06 23:11:11 +09:00
91d2d6d922 色々 2021-11-06 23:09:48 +09:00
dragon1211
03610f2130 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search 2021-11-06 21:35:59 +09:00
a77fd797c0 meeting_approvals→approvals 2021-11-06 19:31:17 +09:00
dragon1211
0cc75540e7 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search 2021-11-06 19:14:40 +09:00
b908d2d21a 2021-11-06 19:11:25 +09:00
dragon1211
009fe6890d Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search 2021-11-06 18:25:39 +09:00
26f2d6ec60 2021-11-06 18:24:18 +09:00
dragon1211
7c54c6e827 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search 2021-11-06 17:37:29 +09:00
5829ef86de 自分の親だけを見える様に 2021-11-06 14:33:19 +09:00
319da650af fathers→father 2021-11-06 14:22:12 +09:00
dragon1211
81524b3984 c-account/search機能を完成しました。 2021-11-06 03:08:05 +09:00
dragon1211
9e0f05a858 remove console.log c_account/meeting/detail 2021-11-06 00:42:14 +09:00
dragon1211
51415a80e5 remove console.log c_account/meeting/detail 2021-11-06 00:41:43 +09:00
dragon1211
e059cdbc30 remove console.log in child/meeting/index 2021-11-06 00:35:40 +09:00
dragon1211
dd8018c2ff add login-success-alert in c-acount/meeting 2021-11-06 00:26:20 +09:00
dragon1211
113a813db7 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account 2021-11-06 00:00:43 +09:00
c2c7dad063 ごめん 2021-11-05 23:57:27 +09:00
dragon1211
ace447249f /c-account/meeting完成しました。 2021-11-05 23:52:29 +09:00
dragon1211
9c265c74a0 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account 2021-11-05 19:37:17 +09:00
16271a70ca いい 2021-11-05 19:34:36 +09:00
dragon1211
5834a64dd9 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account 2021-11-05 18:54:41 +09:00
1ec50700f7 meetings/detailで親のデータ(子画面限定) 2021-11-05 18:51:10 +09:00
dragon1211
ba71a34f07 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account 2021-11-05 18:29:57 +09:00
dragon1211
9375aae7f4 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account 2021-11-05 18:28:51 +09:00
c419cef180 親のオブジェクト化 2021-11-05 18:27:55 +09:00
c812727653 SMSと本登録 2021-11-05 18:20:36 +09:00
dragon1211
5712e4677b Merge branch 'fixfordragon' of https://github.com/nakazawakan/kikikanri into c_account 2021-11-05 18:02:12 +09:00
0cdc85245a ごめん 2021-11-05 18:01:37 +09:00
dragon1211
04cdd328e6 Merge branch 'fixfordragon' of https://github.com/nakazawakan/kikikanri into c_account 2021-11-05 17:55:35 +09:00
58a8da9ede 子供側の受取の修正 2021-11-05 17:07:47 +09:00
dragon1211
ffbe02034d add avatar in child side 2021-11-05 15:50:22 +09:00
dragon1211
ca7bdea67d Childログイン、ログアウト完了しました。 2021-11-05 15:44:41 +09:00
dragon1211
f5df8daa92 add child logout 2021-11-05 15:29:17 +09:00
dragon1211
7ea57fbe63 add c_account id&image 2021-11-05 15:09:14 +09:00
dragon1211
d90d45da69 Merge branch 'fixfordragon' of https://github.com/nakazawakan/kikikanri into c_account 2021-11-05 13:42:50 +09:00
dragon1211
15c0466cc0 Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into c_account 2021-11-05 13:30:36 +09:00
c856c0801e 本登録の修正 2021-11-05 12:50:00 +09:00
b57d8c91cc ログイン機能性は子供でも機能様にする 2021-11-05 12:01:23 +09:00
dragon1211
5c2ec9800c . 2021-11-05 11:48:29 +09:00
9acd934aa8 Merge branch 'c_account' of github.com:nakazawakan/kikikanri into fixfordragon 2021-11-05 11:18:33 +09:00
dragon1211
8e156805af bugfixed scroll 2021-11-05 02:38:59 +09:00
dragon1211
ab5e8d1bc4 modified identify to identify 2021-11-05 00:39:40 +09:00
chankan77
2d2a311528
Merge pull request #73 from nakazawakan/c_account
Child Auth APIをリンクしました。
2021-11-05 00:25:07 +09:00