 守矢諏訪子
|
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 |
|
dragon1211
|
8e64360357
|
add withdrawal and profile
|
2021-11-08 00:25:42 +09:00 |
|
dragon1211
|
390a0429d1
|
add c-account/parent spa&api
|
2021-11-07 19:56:58 +09:00 |
|
dragon1211
|
55fbfe55fd
|
modified c-account/meeting/detail
|
2021-11-07 18:40:10 +09:00 |
|
dragon1211
|
6e04da6fa6
|
modified css-loader
|
2021-11-07 17:03:29 +09:00 |
|
dragon1211
|
e4497c65b8
|
modified css-loader
|
2021-11-07 17:01:36 +09:00 |
|
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
|
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 |
|
守矢諏訪子
|
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 |
|
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 |
|
守矢諏訪子
|
901d05dbb4
|
パスワードのアラートを日本語に翻訳
|
2021-11-02 10:43:59 +09:00 |
|
dragon1211
|
1cef943289
|
remove console.log()
|
2021-11-02 01:36:41 +09:00 |
|
dragon1211
|
9dabee5c33
|
「全員に送信」及び「選んで送信」は、radioになります。
|
2021-11-02 00:23:43 +09:00 |
|
dragon1211
|
d9c1ade8fd
|
「メモアイコン」を押すと少し横にずれているので、修正をお願いいたします。
|
2021-11-01 23:57:34 +09:00 |
|
dragon1211
|
b0063dd524
|
Merge branch 'pdfsyusei' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-01 23:26:00 +09:00 |
|
dragon1211
|
1863990c4c
|
画像が何もない場合は正方形です。画像はbackground-size:contain;と同じ挙動になります。
|
2021-11-01 23:24:42 +09:00 |
|
守矢諏訪子
|
9cd7f43959
|
a
|
2021-11-01 23:17:07 +09:00 |
|
守矢諏訪子
|
10b57b20ea
|
a
|
2021-11-01 23:15:48 +09:00 |