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 |
|
守矢諏訪子
|
98ecd60338
|
、
|
2021-11-03 19:54:52 +09:00 |
|
守矢諏訪子
|
58a941e184
|
。
|
2021-11-03 19:49:05 +09:00 |
|
守矢諏訪子
|
2ff208734d
|
。
|
2021-11-03 18:25:32 +09:00 |
|
dragon1211
|
5c061e4f66
|
bugfixed admin-meeting-edit-approval
|
2021-11-03 17:47:21 +09:00 |
|
dragon1211
|
cc1ed0d82f
|
Merge branch 'meetingapproval' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 17:24:05 +09:00 |
|
守矢諏訪子
|
4e69719d72
|
、、、
|
2021-11-03 17:21:47 +09:00 |
|
dragon1211
|
58ba292165
|
Merge branch 'meetingapproval' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 16:23:25 +09:00 |
|
守矢諏訪子
|
7fb399e028
|
approval_at == nullって消す
|
2021-11-03 16:18:35 +09:00 |
|
dragon1211
|
63022c6760
|
Merge branch 'meetingapproval' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 02:51:32 +09:00 |
|
dragon1211
|
d179ee727f
|
add validation
|
2021-11-03 02:51:24 +09:00 |
|
守矢諏訪子
|
e02124efe9
|
detailに配列の追加
|
2021-11-03 02:30:46 +09:00 |
|
dragon1211
|
5dda13c8f5
|
Merge branch 'oyakotoroku' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 02:04:28 +09:00 |
|
守矢諏訪子
|
8104f6204a
|
親子丼
|
2021-11-03 01:59:03 +09:00 |
|
dragon1211
|
9794557730
|
Merge branch 'fakerhenkou' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-02 22:57:47 +09:00 |
|
dragon1211
|
071529fccd
|
a
|
2021-11-02 22:53:26 +09:00 |
|
守矢諏訪子
|
39e94546d0
|
fakerでランダムIDに
|
2021-11-02 22:40:03 +09:00 |
|
守矢諏訪子
|
9e521cfdd2
|
ミーティング許可のAPIの変更
|
2021-11-02 14:15:58 +09:00 |
|
守矢諏訪子
|
5cee41f059
|
親子の場合、-は_に変換は必要です
|
2021-11-02 11:24:32 +09:00 |
|
守矢諏訪子
|
72df0a09f7
|
親子ログインルート
|
2021-11-02 11:19:00 +09:00 |
|
dragon1211
|
c744bf1a14
|
pull develop
|
2021-11-02 11:14:46 +09:00 |
|
chankan77
|
01250eafde
|
Merge pull request #65 from nakazawakan/nihongomoji
パスワードのアラートを日本語に翻訳
|
2021-11-02 10:56:25 +09:00 |