dragon1211
|
e4919b7309
|
Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into p_account_auth
|
2021-11-11 16:03:34 +09:00 |
dragon1211
|
8887148fb6
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account_auth
|
2021-11-11 16:02:55 +09:00 |
dragon1211
|
72e9ff2f4b
|
add notification in c-account
|
2021-11-11 14:33:17 +09:00 |
守矢諏訪子
|
c57e410f34
|
おまたせ
|
2021-11-11 14:00:41 +09:00 |
守矢諏訪子
|
40f11dcef0
|
response試す
|
2021-11-11 12:47:26 +09:00 |
守矢諏訪子
|
e96e36534a
|
バカだよ、僕は…
|
2021-11-11 10:02:28 +09:00 |
守矢諏訪子
|
80398a2dd4
|
逆だ
|
2021-11-11 08:44:17 +09:00 |
dragon1211
|
57492b6e9f
|
completed p-account-auth api&spa
|
2021-11-11 00:03:05 +09:00 |
dragon1211
|
0bba8385c7
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 23:04:45 +09:00 |
dragon1211
|
9cc0d78057
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account_auth
|
2021-11-10 23:03:39 +09:00 |
dragon1211
|
bfc034fc80
|
add p-account forgot-password
|
2021-11-10 23:03:15 +09:00 |
守矢諏訪子
|
f20bb9a569
|
ミドルウェア
|
2021-11-10 23:01:50 +09:00 |
守矢諏訪子
|
72cceb6fd4
|
countNonApproval
|
2021-11-10 22:38:28 +09:00 |
dragon1211
|
4dd0ce2f71
|
add logout in p-account side.jsx
|
2021-11-10 22:28:37 +09:00 |
守矢諏訪子
|
5ca17f1c8a
|
もうちょっとの親APIの修正
|
2021-11-10 22:13:09 +09:00 |
dragon1211
|
9928eddead
|
add notification in c-account jsxes
|
2021-11-10 21:51:53 +09:00 |
守矢諏訪子
|
1b83c5b417
|
リクエスト化
|
2021-11-10 21:51:31 +09:00 |
守矢諏訪子
|
a7e3d4977a
|
通知数
|
2021-11-10 21:29:07 +09:00 |
守矢諏訪子
|
cfd2ba2134
|
json
|
2021-11-10 21:13:21 +09:00 |
守矢諏訪子
|
cb3eced9a7
|
ごめん
|
2021-11-10 20:58:28 +09:00 |
守矢諏訪子
|
20993339cd
|
NoticeNonApprovalミドルウェア
|
2021-11-10 20:50:23 +09:00 |
守矢諏訪子
|
3b30014ce3
|
親のルート
|
2021-11-10 20:36:04 +09:00 |
dragon1211
|
0deb08afc6
|
delete console.log in child
|
2021-11-10 19:32:24 +09:00 |
dragon1211
|
f1b5a7aceb
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 19:25:18 +09:00 |
守矢諏訪子
|
60034986b5
|
ごめん
|
2021-11-10 16:41:29 +09:00 |
dragon1211
|
a88164f8f9
|
bugfixed c_account/forgot-passwor alert
|
2021-11-10 16:28:56 +09:00 |
dragon1211
|
1b1a33cc9c
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 16:04:30 +09:00 |
守矢諏訪子
|
a86854ca9f
|
ミーティング
|
2021-11-10 15:59:55 +09:00 |
dragon1211
|
a41ec1dd4c
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 15:51:50 +09:00 |
守矢諏訪子
|
add35b132e
|
sa
|
2021-11-10 15:45:09 +09:00 |
dragon1211
|
49c49ebe8e
|
bugfixed forgot-password
|
2021-11-10 15:26:10 +09:00 |
dragon1211
|
98c9569a2c
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 15:08:46 +09:00 |
守矢諏訪子
|
bce98ab4e2
|
パスワード
|
2021-11-10 14:59:40 +09:00 |
dragon1211
|
1ee8197677
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 14:47:55 +09:00 |
守矢諏訪子
|
306ca54a22
|
sa
|
2021-11-10 14:47:19 +09:00 |
dragon1211
|
33daaa8b20
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 14:20:16 +09:00 |
守矢諏訪子
|
0de9556138
|
s
|
2021-11-10 14:19:24 +09:00 |
dragon1211
|
42cacb8af3
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 14:01:14 +09:00 |
守矢諏訪子
|
91f6acdbdf
|
updatePassword
|
2021-11-10 13:53:01 +09:00 |
dragon1211
|
d7d18a36e5
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 13:38:01 +09:00 |
守矢諏訪子
|
e52c56dc6c
|
さ
|
2021-11-10 13:37:26 +09:00 |
dragon1211
|
140bafffb9
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 13:24:42 +09:00 |
守矢諏訪子
|
60a50243f1
|
ファイル
|
2021-11-10 13:18:46 +09:00 |
dragon1211
|
2eeb416b0c
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 12:50:13 +09:00 |
守矢諏訪子
|
e4604d2c09
|
sa
|
2021-11-10 12:42:11 +09:00 |
dragon1211
|
d5db946d67
|
Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 12:42:04 +09:00 |
dragon1211
|
b32e0b7667
|
bugfixed c-account/register
|
2021-11-10 12:38:57 +09:00 |
dragon1211
|
a1711fad3e
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 11:53:43 +09:00 |
守矢諏訪子
|
6a3523ca7a
|
ログインも
|
2021-11-10 11:53:07 +09:00 |
dragon1211
|
9fe1fd4bb2
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 11:44:31 +09:00 |
守矢諏訪子
|
d898bedfe5
|
電話番号の確認
|
2021-11-10 11:42:07 +09:00 |
dragon1211
|
7367b392f4
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 11:35:25 +09:00 |
守矢諏訪子
|
896d951299
|
画像
|
2021-11-10 11:34:43 +09:00 |
dragon1211
|
4a0d4ed451
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 11:32:26 +09:00 |
守矢諏訪子
|
d2ad868d48
|
updatePasswordはauth外に
|
2021-11-10 11:31:16 +09:00 |
dragon1211
|
093ebd11ac
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-10 11:08:20 +09:00 |
守矢諏訪子
|
80152c6cef
|
ルート
|
2021-11-10 10:30:16 +09:00 |
守矢諏訪子
|
71b5102126
|
s
|
2021-11-10 10:22:33 +09:00 |
dragon1211
|
8c9c6666ef
|
p-accountログインを完了しました。
|
2021-11-10 04:48:39 +09:00 |
dragon1211
|
873e260165
|
add p-account auth.blade.php
|
2021-11-10 04:36:29 +09:00 |
dragon1211
|
79e43a9b1c
|
add p-account auth
|
2021-11-10 04:34:59 +09:00 |
dragon1211
|
b8aa0d7ce7
|
modified c-account/forgot-password
|
2021-11-10 03:49:19 +09:00 |
dragon1211
|
f9bd58e3cd
|
modified register error&complete route.
|
2021-11-10 02:50:23 +09:00 |
守矢諏訪子
|
03d43a1d1c
|
s
|
2021-11-10 01:57:53 +09:00 |
守矢諏訪子
|
e7e1477938
|
register/completeとerrorにトークンを付く
|
2021-11-10 01:48:59 +09:00 |
守矢諏訪子
|
08db09b017
|
ごめん?
|
2021-11-10 01:45:59 +09:00 |
dragon1211
|
9aa8d67888
|
.
|
2021-11-09 22:28:44 +09:00 |
守矢諏訪子
|
d2eb848ded
|
register error/completeは不要(?)
|
2021-11-09 20:20:18 +09:00 |
守矢諏訪子
|
0672a15ad2
|
クリーンアップ
|
2021-11-09 19:14:43 +09:00 |
dragon1211
|
3385e32579
|
.
|
2021-11-09 18:19:25 +09:00 |
dragon1211
|
c2546f64ac
|
add c-account register
|
2021-11-09 17:15:04 +09:00 |
dragon1211
|
22619835aa
|
add c-account main
|
2021-11-09 16:53:39 +09:00 |
守矢諏訪子
|
f1a6cd162f
|
画像とトークンの問題の修正
|
2021-11-09 14:45:36 +09:00 |
dragon1211
|
79b11b0a08
|
modified app.js
|
2021-11-09 14:15:20 +09:00 |
dragon1211
|
beb635d010
|
add token in c-account/auth
|
2021-11-09 13:55:07 +09:00 |
dragon1211
|
cf76785db1
|
add token in c-account/register
|
2021-11-09 13:53:01 +09:00 |
dragon1211
|
f0ec6292c0
|
modified c-account/register
|
2021-11-09 01:53:36 +09:00 |
dragon1211
|
b5eed5e530
|
modified c-account/register button height
|
2021-11-09 01:46:20 +09:00 |
dragon1211
|
a67e25869f
|
/c-account/profile/detail/{child_id}を削除しました。
|
2021-11-09 00:28:26 +09:00 |
dragon1211
|
c7d908192f
|
add token in c-account/regiter
|
2021-11-08 23:45:33 +09:00 |
dragon1211
|
7b3ab36c6a
|
modified button height
|
2021-11-08 23:20:48 +09:00 |
守矢諏訪子
|
b15e11a190
|
/withdrawal/completeはauth外に
|
2021-11-08 22:47:50 +09:00 |
守矢諏訪子
|
4c5f49cc56
|
withdrawalを実行すると、セッションも削除する
|
2021-11-08 22:10:31 +09:00 |
守矢諏訪子
|
8fa91648e3
|
date → approval_at
|
2021-11-08 21:53:56 +09:00 |
守矢諏訪子
|
0ef72b25ec
|
や
|
2021-11-08 21:02:25 +09:00 |
dragon1211
|
5b47602cfb
|
c-account/meeting/detail
|
2021-11-08 20:18:31 +09:00 |
dragon1211
|
ff557c6cca
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-08 19:41:58 +09:00 |
守矢諏訪子
|
181c07fc4a
|
s
|
2021-11-08 19:41:06 +09:00 |
dragon1211
|
5ddf2251bd
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-08 19:29:37 +09:00 |
守矢諏訪子
|
10c983a861
|
自分のfatherが送ったミーティングを検索すると思います。
|
2021-11-08 18:36:53 +09:00 |
dragon1211
|
52dd71b1e5
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-08 17:47:48 +09:00 |
守矢諏訪子
|
8c4f9f5f9b
|
,.
|
2021-11-08 17:45:56 +09:00 |
守矢諏訪子
|
96f43041d5
|
,.
|
2021-11-08 17:31:46 +09:00 |
dragon1211
|
3314da1c58
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-08 17:07:09 +09:00 |
守矢諏訪子
|
b7b32ea6fe
|
,
|
2021-11-08 17:06:15 +09:00 |
dragon1211
|
44ac403761
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-08 16:59:35 +09:00 |
守矢諏訪子
|
424418a737
|
.
|
2021-11-08 16:58:12 +09:00 |
dragon1211
|
37ac85fbaa
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-08 16:00:33 +09:00 |
守矢諏訪子
|
8495797769
|
.
|
2021-11-08 15:57:04 +09:00 |
dragon1211
|
7834a84910
|
bugfixed children/parent/index
|
2021-11-08 00:30:02 +09:00 |