コミットグラフ

394 コミット

作成者 SHA1 メッセージ 日付
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
dragon1211 f9bd58e3cd modified register error&complete route. 2021-11-10 02:50:23 +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
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 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
dragon1211 5b47602cfb c-account/meeting/detail 2021-11-08 20:18:31 +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 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 ace447249f /c-account/meeting完成しました。 2021-11-05 23:52:29 +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 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
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 ca833e037c modified child auth path and name 2021-11-04 15:38:36 +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 48f2d327eb completed admin-meeting-edit-approval 2021-11-03 20:21:01 +09:00
dragon1211 5c061e4f66 bugfixed admin-meeting-edit-approval 2021-11-03 17:47:21 +09:00
dragon1211 d179ee727f add validation 2021-11-03 02:51:24 +09:00
dragon1211 071529fccd a 2021-11-02 22:53:26 +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 1863990c4c 画像が何もない場合は正方形です。画像はbackground-size:contain;と同じ挙動になります。 2021-11-01 23:24:42 +09:00
dragon1211 44674d8188 画像が何もない場合は正方形です。 2021-11-01 22:45:08 +09:00
dragon1211 c51b076c6d show login success modal in admin-meeting-index 2021-11-01 22:38:21 +09:00
dragon1211 e1f0249af6 add user-avatar-image object-fit 2021-11-01 21:59:30 +09:00
dragon1211 8c91f765fd add user-avatar-image object-fit 2021-11-01 21:40:07 +09:00
dragon1211 5bd1cc4f94 pull frontend 2021-11-01 12:40:12 +09:00
dragon1211 a846032499 bugfixed admin-meeting-edit.jsx 2021-11-01 12:04:37 +09:00
dragon1211 c42ff28f6f bugfixed admin-meeting API&SPA 2021-11-01 02:08:30 +09:00
dragon1211 c1516e9801 Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend 2021-11-01 01:11:44 +09:00
守矢諏訪子 b14d1fa77a ... 2021-11-01 01:08:02 +09:00
dragon1211 6e306ce749 . 2021-10-31 01:07:33 +09:00
dragon1211 6802533c48 bugfixed admin-meeting-edit.jsx upload image 2021-10-30 23:55:19 +09:00
dragon1211 a8c065ce9a completed pdf view 2021-10-30 20:07:24 +09:00
dragon1211 4e750d7a96 add pdf viewer 2021-10-30 16:20:41 +09:00
dragon1211 981ed2a635 fixed user-avatar 2021-10-30 16:01:05 +09:00
dragon1211 e21f8054b6 fixed admin-meeting-edit 2021-10-30 13:38:25 +09:00
dragon1211 3616592991 completed admin child&parent API - SPA 2021-10-29 22:13:09 +09:00
dragon1211 e983e54fbf bugfixed admin child jsx 2021-10-29 21:49:12 +09:00
dragon1211 fb3895e81e bugfixed admin SPA 2021-10-29 20:27:22 +09:00
dragon1211 3ab669a0c7 bugfixed admin-child-detail.jsx 2021-10-29 17:37:38 +09:00
守矢諏訪子 ea578a18b1 DRAGONさんに依頼した修正+画像アップロード機能性 2021-10-28 17:12:12 +09:00
dragon1211 131c1ad169 pull develop 2021-10-28 15:25:03 +09:00