コミットグラフ

362 コミット

作成者 SHA1 メッセージ 日付
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
d72864dd8c add sass files 2021-11-24 12:56:15 -08: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
72a731e70b SMSテンプレート 2021-11-23 15:12:22 +09:00
dragon1211
54d445705d father, childの本登録時password_confirmationフィールドを追加。 2021-11-23 01:50:55 -08:00
dragon1211
ff6b29a297 画像非表示です。 2021-11-22 22:37:07 -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
85a56973a6 不要なimage、svgを削除しました。 2021-11-22 10:37:02 -08:00
dragon1211
8644da111c remove console.log 2021-11-22 03:26:57 -08:00
3df7bff4bc attributeの翻訳 2021-11-21 22:34:58 +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
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
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
80149fcdfe fix spell set400Error 2021-11-18 00:33:59 -08: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
dragon1211
aef4d85f76 bugfixed p_account 2021-11-17 21:11:14 -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
810b4a2c8b fixed css&size in p_account 2021-11-17 19:34:24 -08:00
dragon1211
95bc09c6eb fixed size & color & css in child 2021-11-17 19:14:22 -08:00
dragon1211
12c23c0d42 fixed css & size & ... in admin 2021-11-17 18:04:35 -08: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
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
14777d0741 completed p_account child 2021-11-17 02:32:05 -08:00
dragon1211
64e890d93d add pdf remove button 2021-11-16 21:47:53 -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
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
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
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
dragon1211
80e94c932c add api to modal_setting_notify 2021-11-15 18:59:25 -08:00
dragon1211
963b185b9a modified p-account meeting-detail 2021-11-15 17:29:32 -08: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&notification 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
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
d3bcb540f6 add notification action c-account 2021-11-12 17:31:58 +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
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
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
dragon1211
57492b6e9f completed p-account-auth api&spa 2021-11-11 00:03:05 +09:00
dragon1211
bfc034fc80 add p-account forgot-password 2021-11-10 23:03:15 +09:00
dragon1211
4dd0ce2f71 add logout in p-account side.jsx 2021-11-10 22:28:37 +09:00
dragon1211
9928eddead add notification in c-account jsxes 2021-11-10 21:51:53 +09:00
a7e3d4977a 通知数 2021-11-10 21:29:07 +09:00
cfd2ba2134 json 2021-11-10 21:13:21 +09:00
dragon1211
0deb08afc6 delete console.log in child 2021-11-10 19:32:24 +09:00
dragon1211
a88164f8f9 bugfixed c_account/forgot-passwor alert 2021-11-10 16:28:56 +09:00
dragon1211
49c49ebe8e bugfixed forgot-password 2021-11-10 15:26:10 +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
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
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