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 |
|
chankan77
|
511541932e
|
Merge pull request #72 from nakazawakan/fatherapifix
残り親のAPIの追加又は修正
|
2021-11-05 00:24:53 +09:00 |
|
dragon1211
|
1fd2967493
|
start child api&spa
|
2021-11-05 00:07:08 +09:00 |
|
dragon1211
|
ab47ddeb36
|
modified child SPA path-2
|
2021-11-04 17:32:01 +09:00 |
|
dragon1211
|
0ea3e6ebc3
|
Merge branch 'childnoko' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-04 16:10:43 +09:00 |
|
|
|
5a66127e7f
|
、
|
2021-11-04 16:04:46 +09:00 |
|
|
|
6bec5c0100
|
。
|
2021-11-04 16:03:31 +09:00 |
|
|
|
3c0fa9a629
|
もう良いよ
|
2021-11-04 16:01:38 +09:00 |
|
dragon1211
|
ca833e037c
|
modified child auth path and name
|
2021-11-04 15:38:36 +09:00 |
|
dragon1211
|
6f1d9fdec5
|
Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-04 15:25:35 +09:00 |
|
dragon1211
|
7ef49a6b5d
|
.
|
2021-11-04 14:53:51 +09:00 |
|
chankan77
|
aa2ec94d3a
|
Merge pull request #71 from nakazawakan/oyakologin
親子のログイン可能ようになるため
|
2021-11-04 13:48:00 +09:00 |
|
|
|
561bbd920a
|
残り親のAPIの追加又は修正
|
2021-11-04 13:28:58 +09:00 |
|
|
|
e493a0baf2
|
Merge branch 'develop' of github.com:nakazawakan/kikikanri into oyakologin
|
2021-11-04 12:59:38 +09:00 |
|
|
|
806612fb78
|
忘れた
|
2021-11-04 12:51:42 +09:00 |
|
chankan77
|
65759b1107
|
Merge pull request #70 from nakazawakan/frontend
Admin修正および完了（approval API接続完了、テスト確認、親登録テストおよび確認を含む）しました。Frontend
|
2021-11-04 11:43:28 +09:00 |
|
chankan77
|
95c7fa58cf
|
Merge pull request #66 from nakazawakan/meetingapproval
ミーティング許可のAPIの変更
|
2021-11-04 11:43:15 +09:00 |
|
dragon1211
|
caf915f57a
|
Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-03 23:42:23 +09:00 |
|
dragon1211
|
9578e4ec08
|
Merge branch 'meetingapproval' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 20:58:58 +09:00 |
|
|
|
b535ff8c9c
|
子供
|
2021-11-03 20:46:48 +09:00 |
|
dragon1211
|
48f2d327eb
|
completed admin-meeting-edit-approval
|
2021-11-03 20:21:01 +09:00 |
|
