コミットグラフ

394 コミット

作成者 SHA1 メッセージ 日付
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
dragon1211 9dedee02e2 admin API 2021-10-28 13:38:45 +09:00
dragon1211 c742e7a08b pull develop 2021-10-27 21:48:24 +09:00
dragon1211 3419e9af6e . 2021-10-27 21:41:53 +09:00
dragon1211 d733874665 add meeting detail api 2021-10-27 21:39:29 +09:00
chankan77 c234cbcd6d
Merge pull request #47 from nakazawakan/contactsmail
連絡メーラー
2021-10-27 11:14:47 +09:00
dragon1211 07a57ef6fd add child-meeting-detail API 2021-10-27 02:48:06 +09:00
dragon1211 c7d64855bb completed child_meeting_index.jsx API 2021-10-27 02:05:37 +09:00
dragon1211 b956b5d915 fixed child auth SPA 2021-10-26 13:03:16 +09:00
dragon1211 af9a772852 Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into c_account 2021-10-26 10:27:12 +09:00
dragon1211 b5fe98dcbb . 2021-10-26 10:25:58 +09:00
dragon1211 e2d3507d67 Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into c_account 2021-10-26 10:16:30 +09:00
dragon1211 435fda5064 . 2021-10-26 10:15:49 +09:00
dragon1211 e636c5c5f6 add loading button in admin SPA 2021-10-26 10:07:57 +09:00
dragon1211 54ed7e2ce2 add loading button in admin SPA 2021-10-26 09:44:31 +09:00
dragon1211 bfc419335c add loading button in child 2021-10-26 09:32:52 +09:00
dragon1211 0c71f1c0db fixed child registertempoary 2021-10-26 02:12:43 +09:00
dragon1211 d70c862c3a change c_account_login header 2021-10-26 01:41:43 +09:00
dragon1211 38dc7f12d4 contact page api 2021-10-26 01:34:36 +09:00
dragon1211 da44e75f10 modified search icon size admin 2021-10-24 20:21:50 +09:00
dragon1211 331fe7142c fixed admin-meeting-edit.jsx api 2021-10-24 20:13:29 +09:00
dragon1211 337d0edd91 add camera button 2021-10-24 18:42:54 +09:00
dragon1211 ae199925dd add remove button 2021-10-24 18:32:17 +09:00
dragon1211 d177c449ea completed admin-fathers-registerTemporary api 2021-10-24 10:29:11 +09:00
dragon1211 7241b95328 complete admin-api 2021-10-24 04:08:44 +09:00
dragon1211 b2eee356fd add admin parent detail api 2021-10-24 02:20:26 +09:00
dragon1211 15d9c33297 complete admin child api 2021-10-24 01:19:37 +09:00
dragon1211 f408f26320 fixed button color 2021-10-24 00:13:32 +09:00
dragon1211 e86edbe72b add admin-child-edit 2021-10-23 19:00:14 +09:00
dragon1211 a300509d1b api admin child index 2021-10-23 15:05:45 +09:00
dragon1211 ee9a7f9590 completed admin meeting detail 2021-10-23 11:56:59 +09:00
dragon1211 65daa9982b fixed meeting detail & index.jsx 2021-10-23 11:53:54 +09:00
dragon1211 7fd6395f7c add modal 2021-10-23 03:47:54 +09:00
dragon1211 58bd099ca2 admin components. 2021-10-23 03:34:35 +09:00
dragon1211 5fe9c5f04b modified admin login 2021-10-22 22:15:56 +09:00
dragon1211 b39feab005 modified admin login 2021-10-22 22:09:32 +09:00
dragon1211 af64845578 modified admin meeting delete 2021-10-22 22:03:05 +09:00
dragon1211 6a5c17d5f9 completed admin meeting detail api 2021-10-22 16:41:39 +09:00
dragon1211 48a9b06f0a add admin child detail icon 2021-10-22 10:06:03 +09:00
dragon1211 98b123fe0c remove admin notification 2021-10-22 09:35:32 +09:00
守矢諏訪子 9ccc1bc75d URLの修正 2021-10-21 19:10:03 +09:00
守矢諏訪子 ecd5482f97 連絡メーラー 2021-10-21 11:13:27 +09:00
守矢諏訪子 08c76cd978 親登録(親側) 2021-10-21 11:07:16 +09:00
守矢諏訪子 331476fde6 registerTemporary 2021-10-21 10:38:11 +09:00
dragon1211 f5e912f4f3 bugfix admin login 2021-10-20 21:22:46 +09:00
dragon1211 0fc8dc24e6 add admin logout 2021-10-20 20:25:21 +09:00
守矢諏訪子 304492d4aa URLのグルーピング 2021-10-20 16:12:18 +09:00
守矢諏訪子 08fec20431 ログインのルートはmiddlewareの外側に移動しました。便利ですので、FEでログアウトを作りました。 2021-10-20 15:40:16 +09:00
dragon1211 3529bc5927 delete admin & child blade 2021-10-18 18:15:53 +09:00
がる 671f2bb891
Merge pull request #38 from nakazawakan/feature/p_account_meeting
p_accountでは ミーティングの完了画面
2021-10-18 14:21:15 +09:00
がる 9e07f4040d
Merge pull request #34 from nakazawakan/feature/p_account_favorite
p_accountではお気に入りの完了画面
2021-10-18 14:21:09 +09:00
がる 216ebe129e
Merge pull request #33 from nakazawakan/feature/p_account_search
p_accountではミーティング検索の完了画面
2021-10-18 14:21:01 +09:00
がる b1c3f75d15
Merge pull request #32 from nakazawakan/feature/p_account_profile
p_accountではプロフィール、プロフィール編集、パスワード編集、退会確認、退会完了の完了画面
2021-10-18 14:20:55 +09:00
がる a9e2c32f2e
Merge pull request #29 from nakazawakan/applocale
日本語訳を使う様にします
2021-10-18 14:20:15 +09:00
がる c5aa944da8
Merge pull request #27 from nakazawakan/feature/p_account_child
p_accountでは子一覧、子詳細 、入社日変更、 子追加の完了画面
2021-10-18 14:20:07 +09:00
トランギャー 8f40c57e05 add modal pdf 2021-10-11 23:09:16 +07:00
トランギャー bf82b758e8 p_accountでは ミーティングの完了画面 2021-10-10 21:08:06 +07:00
dragon1211 d909ce98f8 add Admin SPA 2021-10-10 02:24:19 -07:00
dragon1211 71d7ad1f90 add admin blades 2021-10-09 15:41:50 -07:00
dragon1211 9b8b3e3d47 add admin web routes 2021-10-09 14:26:44 -07:00
dragon1211 d4bc07656a modified child SPA 2021-10-09 13:51:00 -07:00
dragon1211 372e1122d4 add admin meeting 2021-10-09 10:21:32 -07:00
dragon1211 3483b9b573 add admin/meeting 2021-10-08 13:26:42 -07:00
dragon1211 7f4de51779 modified admin login title font 2021-10-08 13:15:18 -07:00
トランギャー 13857cd560 update requirement 2021-10-08 23:16:45 +07:00
トランギャー 86f047c4a0 add link 2021-10-08 20:46:29 +07:00
トランギャー a16eda4162 p_accountではお気に入りの完了画面 2021-10-08 20:41:58 +07:00
トランギャー cce08e030b p_accountではミーティング検索の完了画面 2021-10-08 15:50:18 +07:00
トランギャー d5faaf8342 change path of Side 2021-10-08 11:20:41 +07:00
トランギャー 829bca2ee9 p_accountのプロフィール、プロフィール編集、パスワード編集、退会確認、退会完了を完了 2021-10-08 11:07:58 +07:00
dragon1211 0dbe2441fd modified sidebar tab 2021-10-08 12:33:43 -07:00
dragon1211 19e93537f3 modified child spa 2021-10-07 16:12:25 -07:00
dragon1211 62068ce709 Merge branch 'feature/p_account_child' of https://github.com/nakazawakan/kikikanri into feature_c_acc 2021-10-07 12:07:55 -07:00
dragon1211 dbe94d059c add admin login.js 2021-10-07 11:15:45 -07:00
トランギャー f2468270ad set value to blade 2021-10-07 12:54:28 +07:00
dragon1211 10dd5a1d27 Add admin login 2021-10-06 12:52:20 -07:00
守矢諏訪子 96ec8cc6a0 日本語訳を使う様にします 2021-10-06 14:53:58 +09:00
トランギャー 817de63751 Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into feature/p_account_child 2021-10-06 12:28:51 +07:00
トランギャー 3570e7f2e9 子一覧、子詳細 、入社日変更、 子追加の完了画面 2021-10-06 12:25:48 +07:00
dragon1211 ded94b2432 bugfixed in IconButton 2021-10-06 11:28:26 -07:00
トランギャー 09509f93a5 Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-10-05 23:19:34 +07:00
トランギャー ed4d501700 base revision for p_account 2021-10-05 23:16:41 +07:00
トランギャー b87ad63016 delete blade 2021-10-05 22:42:39 +07:00
dragon1211 fcf8e0f721 completed contact API & SPA integration 2021-10-05 19:40:39 -07:00
dragon1211 240643932b add contact api to contact SPA 2021-10-05 19:31:51 -07:00
dragon1211 00f2b14c55 fixed contact blade 2021-10-05 17:43:08 -07:00
dragon1211 3eefea1bc0 fixed contact 2021-10-05 17:41:19 -07:00
dragon1211 5054c134c5 add c-acc_register-temporary 2021-10-05 17:36:59 -07:00
dragon1211 0af929defd Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-05 16:51:26 -07:00
dragon1211 fb5023cd28 add react-router in child.js 2021-10-05 11:23:58 -07:00
トランギャー 69cad09f15 /p-account/search/のsearchOfIncompleteOfFather,searchOfCompleteOfFatherを追加 2021-10-05 18:28:19 +07:00
トランギャー 8823e21b19 js->jsx 2021-10-05 14:55:03 +07:00
トランギャー 78d5d1b19c merge with develop and frontend branch, add progress bar 2021-10-05 14:37:10 +07:00
トランギャー a6bdadd31a Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-10-05 14:31:20 +07:00
トランギャー e57938bb0a Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-10-05 14:05:25 +07:00
dragon1211 4902c1538a add modal_common.js 2021-10-04 12:11:31 -07:00
dragon1211 3cf2d91b4f fixed alert.scss 2021-10-04 11:15:10 -07:00
dragon1211 753c77b897 fixed alert.js 2021-10-04 11:07:23 -07:00
dragon1211 97e1e0a92b . 2021-10-04 09:17:54 -07:00
トランギャー 5ea7d4c171 integrate apis 2021-10-04 22:35:47 +07:00
dragon1211 50e1ecaed8 add modal_yesno.jsx 2021-10-04 04:42:30 -07:00