|
|
80ddcdcf94
|
Merge branch 'develop' of github.com:nakazawakan/kikikanri into backend
|
2021-11-25 13:29:08 +09:00 |
|
|
|
cd1b8b5b0c
|
時差
|
2021-11-25 13:26:37 +09:00 |
|
Kan Nakazawa
|
62b3b12c55
|
タイムゾーンが間違っている
|
2021-11-25 13:23:29 +09:00 |
|
|
|
e19fe86877
|
ID
|
2021-11-25 13:14:50 +09:00 |
|
|
|
a0ce805ff1
|
no json_decode
|
2021-11-25 13:09:13 +09:00 |
|
|
|
c7d0f2e93f
|
json_decode
|
2021-11-25 12:24:00 +09:00 |
|
|
|
dbac7e912d
|
忘れた
|
2021-11-25 12:15:15 +09:00 |
|
|
|
e0c5f1e575
|
nullチェック＋画像の配列
|
2021-11-25 12:11:50 +09:00 |
|
|
|
583b11592c
|
nullチェック
|
2021-11-25 12:04:00 +09:00 |
|
|
|
e48b9fed54
|
会議の登録の問題
|
2021-11-25 11:11:21 +09:00 |
|
dragon1211
|
1dd17032ec
|
remove console.log
|
2021-11-25 07:31:54 -08:00 |
|
dragon1211
|
c1bb1fb6fa
|
fixed checkbox css
|
2021-11-25 07:27:43 -08:00 |
|
dragon1211
|
1cd5605163
|
Multiple Imageアップロード機能を追加しました。
|
2021-11-25 06:06:26 -08:00 |
|
dragon1211
|
b87cb71e66
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into frontend_fix
|
2021-11-25 05:09:23 -08:00 |
|
dragon1211
|
b788f29bba
|
fixed css
|
2021-11-25 04:29:01 -08:00 |
|
dragon1211
|
2595fe91c3
|
modified edit scss
|
2021-11-25 04:15:28 -08:00 |
|
dragon1211
|
66955b9a07
|
bugfixed text-icon
|
2021-11-25 03:28:40 -08:00 |
|
dragon1211
|
5ea23c07df
|
.
|
2021-11-24 20:09:48 -08:00 |
|
dragon1211
|
625a201e1f
|
Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend_fix
|
2021-11-24 20:08:12 -08:00 |
|
dragon1211
|
b8a690e50c
|
jp to xyz
|
2021-11-24 20:07:07 -08:00 |
|
dragon1211
|
6b301b8b76
|
modified 招待用URL to https://kikikan.jp/c-account/register-temporary
|
2021-11-24 20:01:06 -08:00 |
|
dragon1211
|
a77a328f48
|
add images
|
2021-11-24 13:13:46 -08:00 |
|
dragon1211
|
d72864dd8c
|
add sass files
|
2021-11-24 12:56:15 -08:00 |
|
|
|
9514daf7bc
|
TTLを超えたら、DBから削除する
|
2021-11-25 01:11:40 +09:00 |
|
chankan77
|
12fdba8192
|
Merge pull request #99 from nakazawakan/frontend_fix
招待URLをhttps://kikikan.jp/c-account/register-temporaryに変更しました。
|
2021-11-24 20:07:56 +09:00 |
|
chankan77
|
e560f10bdf
|
Merge pull request #98 from nakazawakan/backend
残り英語のバリデーションを日本語に変えました
|
2021-11-24 20:06:28 +09:00 |
|
|
|
f0123f8442
|
英語→日本語
|
2021-11-24 19:36:48 +09:00 |
|
|
|
5b55e768ad
|
先頭は「0」から始めてください。
|
2021-11-24 18:14:53 +09:00 |
|
dragon1211
|
4f07ac7b97
|
modified contact
|
2021-11-23 23:54:37 -08:00 |
|
dragon1211
|
22f2ac6b74
|
clipboard-copy
|
2021-11-23 23:42:56 -08:00 |
|
Kan Nakazawa
|
cf89c05222
|
AdminsTableSeederのメールアドレス間違いの修正
|
2021-11-23 21:39:58 +09:00 |
|
|
|
72a731e70b
|
SMSテンプレート
|
2021-11-23 15:12:22 +09:00 |
|
|
|
26047a6125
|
画像を削除するようにしておかないと、トランザクションに失敗した時に「不要な画像が溜まる」
|
2021-11-23 11:36:07 +09:00 |
|
|
|
de481fc33b
|
Merge branch 'frontend_fix' of github.com:nakazawakan/kikikanri into backend
|
2021-11-23 11:19:06 +09:00 |
|
dragon1211
|
54d445705d
|
father, childの本登録時password_confirmationフィールドを追加。
|
2021-11-23 01:50:55 -08:00 |
|
dragon1211
|
14db8d3e0c
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into frontend_fix
|
2021-11-23 00:59:08 -08:00 |
|
dragon1211
|
ff6b29a297
|
画像非表示です。
|
2021-11-22 22:37:07 -08:00 |
|
|
|
297901058a
|
確認用パスワード
|
2021-11-23 11:17:36 +09:00 |
|
dragon1211
|
3cc4059451
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into frontend_fix
|
2021-11-22 13:26:15 -08:00 |
|
dragon1211
|
b58b4b24fc
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into frontend_fix
|
2021-11-22 12:48:27 -08:00 |
|
dragon1211
|
9b81a8d6dc
|
rename png to jpg
|
2021-11-22 10:42:50 -08:00 |
|
dragon1211
|
85a56973a6
|
不要なimage、svgを削除しました。
|
2021-11-22 10:37:02 -08:00 |
|
|
|
2759ef5c33
|
サンプルPDFを変更しなければ、変更しないで
|
2021-11-23 00:47:15 +09:00 |
|
|
|
6f4bfaeadf
|
Merge branch 'develop' of github.com:nakazawakan/kikikanri into backend
|
2021-11-22 23:49:02 +09:00 |
|
|
|
1227359904
|
トークンは16→64文字に。そうして、バリデーションは一致に
|
2021-11-22 21:48:48 +09:00 |
|
|
|
71bc8125dd
|
「URLに設定をする時は「使う時にURLエンコードをしておく」ほうがセキュアかと思われます。」
|
2021-11-22 20:52:43 +09:00 |
|
|
|
30c143349a
|
「tokenのチェックは、registerMain の先頭でやるほうが効率的かと思われます。」
|
2021-11-22 20:45:19 +09:00 |
|
dragon1211
|
8644da111c
|
remove console.log
|
2021-11-22 03:26:57 -08:00 |
|
|
|
55603dc5f0
|
ごめん
|
2021-11-22 19:08:52 +09:00 |
|
|
|
77db918ded
|
子供の詳細の場合、md*→cd*。そうして、uniqid→uuidv4
|
2021-11-22 19:08:15 +09:00 |
|
chankan77
|
b1a2e7f36a
|
Merge pull request #90 from nakazawakan/frontend_fix
不要なimage、svg、fontsを削除しました。
|
2021-11-22 15:14:12 +09:00 |
|
|
|
98ae27cdb3
|
やはり、MeetingImageFactoryの場合はダミー画像ですね
|
2021-11-22 13:20:17 +09:00 |
|
|
|
662eb9cf6a
|
ここの1048576ですが、.envまたはconfigに切り出したほうがよいように思います。
|
2021-11-22 12:38:35 +09:00 |
|
|
|
684f62c434
|
「28800 の部分ですが、.envまたはconfigに切り出しておいたほうがよいように思います。」
|
2021-11-22 12:36:14 +09:00 |
|
|
|
57e1c7c41f
|
デフォルトの画像とPDFパス
|
2021-11-22 12:16:02 +09:00 |
|
|
|
202c6a5d54
|
nexmo
|
2021-11-21 22:45:31 +09:00 |
|
|
|
3df7bff4bc
|
attributeの翻訳
|
2021-11-21 22:34:58 +09:00 |
|
|
|
eecbb03217
|
Merge branch 'develop' of github.com:nakazawakan/kikikanri into backend
|
2021-11-21 20:57:41 +09:00 |
|
Kan Nakazawa
|
543ae95689
|
.evn.relase作成
|
2021-11-21 18:47:04 +09:00 |
|
chankan77
|
0af1e70522
|
Merge pull request #87 from nakazawakan/bugfix/amdmin-table-list
管理者のtableを特定のメールアドレスに修正
|
2021-11-21 16:39:41 +09:00 |
|
Kan Nakazawa
|
ceb93e94d6
|
管理者のtableを特定のメールアドレスに修正
|
2021-11-21 16:37:44 +09:00 |
|
Kan Nakazawa
|
597e6ebae2
|
bugfix .env for email
|
2021-11-21 16:07:56 +09:00 |
|
|
|
eb539f23f3
|
シーダーでidentityは１単語に
|
2021-11-20 11:54:30 +09:00 |
|
|
|
9bb99b570c
|
elequentはtransaction化
|
2021-11-20 11:49:20 +09:00 |
|
dragon1211
|
b5a37269fb
|
親追加ボタンを追加しました。
|
2021-11-19 16:07:19 -08:00 |
|
dragon1211
|
7eaab6cafd
|
modified admin login button height
|
2021-11-19 01:23:20 -08:00 |
|
dragon1211
|
e46dbf59e2
|
process 422errors in admin&child&parent profile
|
2021-11-18 23:46:18 -08:00 |
|
|
|
6407bc448a
|
プレースホルダー
|
2021-11-18 22:15:10 +09:00 |
|
|
|
db7237435f
|
シーダー
|
2021-11-18 21:55:34 +09:00 |
|
dragon1211
|
4866af21de
|
fixed auth css
|
2021-11-18 03:42:53 -08:00 |
|
dragon1211
|
62c1c9076c
|
add favorite event
|
2021-11-18 03:09:44 -08:00 |
|
dragon1211
|
e3003163f1
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-18 02:30:56 -08:00 |
|
dragon1211
|
198d5fae88
|
fixed location of alert
|
2021-11-18 02:04:25 -08:00 |
|
dragon1211
|
b0b5444ad0
|
add secure
|
2021-11-18 01:44:21 -08:00 |
|
dragon1211
|
2c04e730a5
|
add alert
|
2021-11-18 01:14:14 -08:00 |
|
dragon1211
|
5c50bf9281
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-18 01:14:03 -08:00 |
|
dragon1211
|
50a40b218e
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-18 00:35:04 -08:00 |
|
dragon1211
|
80149fcdfe
|
fix spell set400Error
|
2021-11-18 00:33:59 -08:00 |
|
|
|
9a56e127dc
|
f
|
2021-11-18 01:25:31 +09:00 |
|
|
|
73ebdab926
|
fav
|
2021-11-18 01:11:49 +09:00 |
|
|
|
97c3d35f70
|
複製
|
2021-11-18 00:31:39 +09:00 |
|
|
|
c06aa823d8
|
Merge branch 'p_account' of github.com:nakazawakan/kikikanri into backend
|
2021-11-18 00:00:27 +09:00 |
|
dragon1211
|
36fbb11ef1
|
fixed Infnite count
|
2021-11-17 23:46:31 -08:00 |
|
dragon1211
|
8773c282df
|
bugfixed p_account meeting add
|
2021-11-17 23:38:41 -08:00 |
|
|
|
e1a6fcbd63
|
ごめん
|
2021-11-17 23:51:07 +09:00 |
|
|
|
4d1c1594b9
|
m
|
2021-11-17 23:23:24 +09:00 |
|
|
|
3f9412c5b5
|
sa
|
2021-11-17 22:53:07 +09:00 |
|
|
|
bb692c9b06
|
id
|
2021-11-17 22:31:18 +09:00 |
|
|
|
ccbb619514
|
ｓｔｄ
|
2021-11-17 22:18:02 +09:00 |
|
|
|
d2bc70bef1
|
ds
|
2021-11-17 21:54:35 +09:00 |
|
|
|
7f49324b0d
|
２つのケース
|
2021-11-17 21:23:29 +09:00 |
|
dragon1211
|
aef4d85f76
|
bugfixed p_account
|
2021-11-17 21:11:14 -08:00 |
|
dragon1211
|
5638b8c888
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 20:41:49 -08:00 |
|
dragon1211
|
0907d84297
|
.
|
2021-11-17 20:01:50 -08:00 |
|
dragon1211
|
9144ed4bb1
|
fixed button height"
|
2021-11-17 19:51:24 -08:00 |
|
dragon1211
|
3399af4e75
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 19:44:58 -08:00 |
|
dragon1211
|
810b4a2c8b
|
fixed css&size in p_account
|
2021-11-17 19:34:24 -08:00 |
|
dragon1211
|
e53d9fa327
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 19:26:19 -08:00 |
|
dragon1211
|
95bc09c6eb
|
fixed size & color & css in child
|
2021-11-17 19:14:22 -08:00 |
|
dragon1211
|
9326f516bd
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 18:34:12 -08:00 |
|
dragon1211
|
12c23c0d42
|
fixed css & size & ... in admin
|
2021-11-17 18:04:35 -08:00 |
|
|
|
daf0b30600
|
a
|
2021-11-17 20:44:35 +09:00 |
|
|
|
84c1f13377
|
複数
|
2021-11-17 19:46:40 +09:00 |
|
|
|
6879b6b013
|
s
|
2021-11-17 19:42:21 +09:00 |
|
|
|
603f0ae1c5
|
あ
|
2021-11-17 19:19:21 +09:00 |
|
|
|
6addbf1527
|
未承認未完了
|
2021-11-17 18:36:56 +09:00 |
|
|
|
2704370049
|
idと画像
|
2021-11-17 16:58:01 +09:00 |
|
|
|
ed02f34471
|
管理者と子の場合、親関連は不要
|
2021-11-17 16:33:53 +09:00 |
|
dragon1211
|
606f83fdad
|
modified pre
|
2021-11-17 14:30:44 -08:00 |
|
dragon1211
|
e873d17623
|
fixed profile image upload
|
2021-11-17 14:07:18 -08:00 |
|
|
|
8204f6d29c
|
すでに追加されました
|
2021-11-17 14:01:08 +09:00 |
|
|
|
a2d8db36e5
|
もう少し
|
2021-11-17 13:51:32 +09:00 |
|
|
|
c17a793724
|
子のミドルウェア
|
2021-11-17 13:42:56 +09:00 |
|
|
|
656df20d02
|
しゅうせい
|
2021-11-17 13:09:21 +09:00 |
|
dragon1211
|
364075a879
|
bugfixed p_account meeting add
|
2021-11-17 09:21:55 -08:00 |
|
dragon1211
|
e128a1dc6f
|
completed p_account profile
|
2021-11-17 06:56:11 -08:00 |
|
dragon1211
|
89d8922981
|
add p_account profile index.jsx
|
2021-11-17 04:07:34 -08:00 |
|
dragon1211
|
14db22289a
|
remove console.log
|
2021-11-17 03:34:29 -08:00 |
|
dragon1211
|
59f6e7887e
|
bugfixed p_account child
|
2021-11-17 02:47:05 -08:00 |
|
dragon1211
|
502c0b378a
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 02:42:52 -08:00 |
|
dragon1211
|
2d420ff24e
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 02:34:25 -08:00 |
|
dragon1211
|
14777d0741
|
completed p_account child
|
2021-11-17 02:32:05 -08:00 |
|
dragon1211
|
c898e1e6b1
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 02:27:43 -08:00 |
|
dragon1211
|
d7382512db
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 02:15:37 -08:00 |
|
dragon1211
|
728ca31330
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 02:13:23 -08:00 |
|
dragon1211
|
1c0d13fba6
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 01:47:55 -08:00 |
|
dragon1211
|
4ebe219056
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-17 01:17:27 -08:00 |
|
dragon1211
|
cd6fd9f228
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-16 22:32:30 -08:00 |
|
dragon1211
|
dd4f961f1d
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-16 22:27:40 -08:00 |
|
dragon1211
|
64e890d93d
|
add pdf remove button
|
2021-11-16 21:47:53 -08:00 |
|
dragon1211
|
8218e4f43b
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-16 21:28:40 -08:00 |
|
dragon1211
|
be6e54ec29
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-16 19:58:37 -08:00 |
|
dragon1211
|
e44594d61d
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-16 18:55:00 -08:00 |
|
dragon1211
|
b293007f6a
|
completed p_account search
|
2021-11-16 17:26:03 -08:00 |
|
dragon1211
|
a3d97fe2f4
|
bugfixed p_account meeting_add
|
2021-11-16 17:20:50 -08:00 |
|
|
|
9430fd32be
|
子
|
2021-11-17 02:45:26 +09:00 |
|
|
|
23fc63fcd0
|
インポート
|
2021-11-17 02:37:02 +09:00 |
|
|
|
3ea7cb08c8
|
。
|
2021-11-17 02:29:26 +09:00 |
|
|
|
3b459e66fb
|
。
|
2021-11-17 02:18:36 +09:00 |
|
|
|
92cc9d275a
|
認可
|
2021-11-17 01:57:46 +09:00 |
|
|
|
34adbeda5f
|
ごめん
|
2021-11-17 01:50:51 +09:00 |
|
|
|
00c757c15e
|
親子丼
|
2021-11-17 01:20:01 +09:00 |
|
|
|
548f94ad5b
|
失礼
|
2021-11-16 22:34:46 +09:00 |
|
|
|
3fd89b495f
|
rは不要
|
2021-11-16 22:28:11 +09:00 |
|
|
|
745baf3a03
|
子
|
2021-11-16 22:07:18 +09:00 |
|
|
|
c78754f44f
|
画像＋PDF
|
2021-11-16 21:31:26 +09:00 |
|
|
|
3f5c0f6dab
|
param
|
2021-11-16 20:24:19 +09:00 |
|
|
|
58276bc4e5
|
気に入りのデータ
|
2021-11-16 19:28:11 +09:00 |
|
|
|
0e4298a245
|
incomplete のミーティング数です。
|
2021-11-16 19:24:36 +09:00 |
|
|
|
e90eabc542
|
説明書によって修正しました
|
2021-11-16 18:57:48 +09:00 |
|
|
|
8fb4ac36b8
|
パラメートル
|
2021-11-16 18:53:47 +09:00 |
|
|
|
661a7409a6
|
一覧、検索、気に入り
|
2021-11-16 18:02:03 +09:00 |
|
|
|
21e7cfc605
|
Merge branch 'p_account' of github.com:nakazawakan/kikikanri into backend
|
2021-11-16 16:05:23 +09:00 |
|
dragon1211
|
1cac82ac05
|
modified css-loader css
|
2021-11-16 15:13:17 -08:00 |
|
dragon1211
|
da6e42d766
|
completed p_account search
|
2021-11-16 07:33:14 -08:00 |
|
dragon1211
|
042bf4fd56
|
completed p-favorite
|
2021-11-16 06:32:58 -08:00 |
|
dragon1211
|
8070320e43
|
onclieck showsettingnotify p-meeting-detail
|
2021-11-16 05:35:08 -08:00 |
|
dragon1211
|
2a05a06976
|
add alert in p-meeting
|
2021-11-16 05:19:56 -08:00 |
|
dragon1211
|
140b660fed
|
complete p-meeting-edit
|
2021-11-16 03:08:46 -08:00 |
|
dragon1211
|
353401cd0e
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-16 02:32:59 -08:00 |
|
dragon1211
|
94a75c02f5
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-16 02:12:41 -08:00 |
|
dragon1211
|
2048fad7a3
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-16 01:58:05 -08:00 |
|
dragon1211
|
79e9b6181c
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-16 01:36:26 -08:00 |
|
dragon1211
|
b27cc81490
|
add child_id in listOFFather
|
2021-11-16 00:47:20 -08:00 |
|
dragon1211
|
ef30cc9d24
|
fixed p-meeting-edit
|
2021-11-16 00:46:42 -08:00 |
|
dragon1211
|
06a4fd2e86
|
add p-meeting-edit
|
2021-11-16 00:34:22 -08:00 |
|
dragon1211
|
590a56e4a2
|
modified approvals to approval in MeetingsController
|
2021-11-16 00:13:18 -08:00 |
|
|
|
a5e91c8963
|
検索は一覧と一致にする
|
2021-11-16 16:05:00 +09:00 |
|
dragon1211
|
786db4f002
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-15 21:42:07 -08:00 |
|
dragon1211
|
27f5b217d1
|
.
|
2021-11-15 21:41:14 -08:00 |
|
dragon1211
|
5d4a703d09
|
completed p-account meeting-detail
|
2021-11-15 21:36:47 -08:00 |
|
|
|
2626c98475
|
まぁいっかー
|
2021-11-16 02:32:48 +09:00 |
|
|
|
fb26e8f373
|
牛肉
|
2021-11-16 02:15:10 +09:00 |
|
|
|
530910f66d
|
apiルートは一致に
|
2021-11-16 02:01:02 +09:00 |
|
|
|
7d46fd816b
|
複数子供
|
2021-11-16 01:38:16 +09:00 |
|
|
|
9467ec0e6c
|
ごめん
|
2021-11-15 21:43:18 +09:00 |
|
|
|
ee1ea474f0
|
tel
|
2021-11-15 19:24:49 +09:00 |
|
dragon1211
|
80e94c932c
|
add api to modal_setting_notify
|
2021-11-15 18:59:25 -08:00 |
|
dragon1211
|
0026c8a4da
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-15 18:22:57 -08:00 |
|
dragon1211
|
0d399560ae
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-15 18:01:26 -08:00 |
|
dragon1211
|
09734d19fd
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-15 17:48:22 -08:00 |
|
dragon1211
|
963b185b9a
|
modified p-account meeting-detail
|
2021-11-15 17:29:32 -08:00 |
|
|
|
47a56a4d92
|
あ
|
2021-11-15 18:25:04 +09:00 |
|
|
|
5817537479
|
approvalNotification
|
2021-11-15 18:24:20 +09:00 |
|
|
|
fcd7425da4
|
sa
|
2021-11-15 18:04:03 +09:00 |
|
|
|
425caeb9d9
|
tel
|
2021-11-15 17:50:18 +09:00 |
|
|
|
e0ba0353be
|
sa
|
2021-11-15 17:35:40 +09:00 |
|
|
|
92aa39c54d
|
自分の子だけ
|
2021-11-15 17:31:40 +09:00 |
|
|
|
934b490ffc
|
ごめん
|
2021-11-15 17:18:04 +09:00 |
|
|
|
0a86adc8db
|
詳細
|
2021-11-15 17:06:11 +09:00 |
|
|
|
bd56414411
|
チキン
|
2021-11-15 12:42:00 +09:00 |
|
dragon1211
|
3c0e58e213
|
convert a to Link in modal_setting_notify
|
2021-11-15 09:36:35 -08:00 |
|
dragon1211
|
a1253c285e
|
remove component old modal_alert
|
2021-11-15 09:31:44 -08:00 |
|
dragon1211
|
d988727481
|
remove console.log in admin
|
2021-11-15 00:50:40 -08:00 |
|
dragon1211
|
9ce16a549c
|
add infinitescroll to admin
|
2021-11-15 00:45:32 -08:00 |
|
dragon1211
|
29a1ac4f23
|
add modal_confirm
|
2021-11-14 23:56:22 -08:00 |
|
dragon1211
|
d936a364d7
|
modified modal_memo font
|
2021-11-14 23:00:08 -08:00 |
|
dragon1211
|
6d9bc42e8c
|
modified component pdf path
|
2021-11-14 22:35:26 -08:00 |
|
dragon1211
|
b096fe5a7b
|
modified parent side¬ification
|
2021-11-14 05:13:34 -08:00 |
|
dragon1211
|
e7dc8c3102
|
modified c-account notification
|
2021-11-14 04:41:33 -08:00 |
|
dragon1211
|
3dfe7e6c4c
|
add parent-meeting-detail
|
2021-11-14 04:22:30 -08:00 |
|
dragon1211
|
9ac9560627
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account
|
2021-11-13 20:17:23 +09:00 |
|
dragon1211
|
d405e0fa39
|
add parent meeting detail
|
2021-11-13 20:17:15 +09:00 |
|
|
|
1e6c1df6ca
|
通知数字
|
2021-11-13 15:33:48 +09:00 |
|
|
|
ba1d837b1f
|
Merge branch 'develop' of github.com:nakazawakan/kikikanri into backend
|
2021-11-13 15:12:15 +09:00 |
|
|
|
68b6341c34
|
ごめん
|
2021-11-13 14:38:02 +09:00 |
|
|
|
f0fa618352
|
オブジェクト→配列
|
2021-11-13 13:16:03 +09:00 |
|
dragon1211
|
c9b2b122d5
|
add p-account view
|
2021-11-13 02:52:21 +09:00 |
|
dragon1211
|
7797daf625
|
add notification to p-account
|
2021-11-13 02:37:32 +09:00 |
|
dragon1211
|
6f255cc644
|
bugfixed child profile image upload
|
2021-11-12 18:10:44 +09:00 |
|
dragon1211
|
d282f1baa9
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_total
|
2021-11-12 17:55:13 +09:00 |
|
|
|
134873b115
|
画像を変更したら、セッションも変更します。
|
2021-11-12 17:47:44 +09:00 |
|
dragon1211
|
d3bcb540f6
|
add notification action c-account
|
2021-11-12 17:31:58 +09:00 |
|
|
|
c179f8fc81
|
やれやれ
|
2021-11-12 16:24:48 +09:00 |
|
|
|
3334e7011d
|
ログイン後の移転の修正
|
2021-11-12 11:35:15 +09:00 |
|
|
|
878b8d8aea
|
親の詳細APIのURL
|
2021-11-12 11:31:25 +09:00 |
|
|
|
81c865efaf
|
SMSもダイナミック化
|
2021-11-12 11:31:06 +09:00 |
|
dragon1211
|
4b0ebbba9e
|
remove console.log in p-account-auth
|
2021-11-11 19:52:33 +09:00 |
|
dragon1211
|
e49564923e
|
bugfixed p-account-register
|
2021-11-11 19:50:34 +09:00 |
|
|
|
6cb06e2f7d
|
通知
|
2021-11-11 18:49:09 +09:00 |
|
|
|
52255803b7
|
パスワードリセット
|
2021-11-11 18:49:02 +09:00 |
|
dragon1211
|
84eb3227c1
|
bugfixed p-account-auth c-account route
|
2021-11-11 18:03:02 +09:00 |
|
dragon1211
|
a19ca98a20
|
Merge branch 'c_account_total' of https://github.com/nakazawakan/kikikanri into p_account_auth
|
2021-11-11 17:24:50 +09:00 |
|
dragon1211
|
40c0600415
|
remove useEffect in profile password_edit
|
2021-11-11 17:22:19 +09:00 |
|
|
|
f7fea68d75
|
親の本登録
|
2021-11-11 16:13:22 +09:00 |
|
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 |
|
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 |
|
