コミットグラフ

317 コミット

作成者 SHA1 メッセージ 日付
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
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
がる 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 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
トランギャー 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 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 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
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
トランギャー 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
dragon1211 879555dff4 completed child-spa-1 2021-10-04 04:13:39 -07:00
dragon1211 85159f4cfd completed profile.js 2021-10-04 02:22:19 -07:00
dragon1211 9b1f212f66 . 2021-10-04 00:54:32 -07:00
dragon1211 7594d5af8b completed parent-detail 2021-10-04 00:49:03 -07:00
dragon1211 eaf2a3a0f0 fixed structure of child auth 2021-10-03 21:37:25 -07:00
dragon1211 d1fc9055ba add meeting-search 2021-10-03 18:52:35 -07:00
dragon1211 03d1e35aca add meeting-detail 2021-10-03 18:13:33 -07:00
dragon1211 3f48405aca add meeting 2021-10-03 08:18:11 -07:00
dragon1211 927600bd32 modified layout.blade.php 2021-10-02 23:26:02 -07:00
dragon1211 a9aeb9dc88 . 2021-10-02 10:53:14 -07:00
dragon1211 d4ac6f97b3 modified err_msg 2021-10-02 10:49:31 -07:00
トランギャー d537b99309 p-accountのSPAを追加、プロフィールのAPIを追加 2021-10-03 00:08:39 +07:00
トランギャー 6d96cedd3c Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-10-02 23:57:06 +07:00
dragon1211 71b0aa43fc fixed alert.scss 2021-10-02 05:16:16 -07:00
dragon1211 d3aa76972e fix login.js 2021-10-02 04:49:05 -07:00
dragon1211 ead8766ffc add login.js 2021-10-02 01:21:23 -07:00
dragon1211 6fa4dda619 modified sass folder name 2021-10-02 00:15:31 -07:00
dragon1211 61299cd86f completed register 2021-10-01 20:19:28 -07:00
トランギャー 12aef65e3d Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-10-02 09:20:17 +07:00
dragon1211 28978acd4b add c_acc_register 2021-10-01 11:45:08 -07:00
トランギャー da26d72d66 Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-10-01 20:54:33 +07:00
dragon1211 9d2730d58a completed contact 2021-10-01 03:37:18 -07:00
dragon1211 854de113e8 completed 2021-10-01 02:50:43 -07:00
トランギャー 72d018a454 p-account html 2021-10-01 15:45:39 +07:00
dragon1211 804e95eaef add c_acc & admin blade 2021-09-30 17:29:20 -07:00
トランギャー 1ca558e390 Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-10-01 07:15:21 +07:00
dragon1211 09d98abf4f . 2021-09-30 12:14:26 -07:00
dragon1211 ee218186d1 add contact.js 2021-09-30 04:54:09 -07:00
トランギャー 3be115e099 Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-09-30 16:53:53 +07:00
dragon1211 3dd7433efc add contact-complete page 2021-09-30 00:50:44 -07:00
トランギャー b9ebe83901 p_accountのrouterおよびbladeを追加 2021-09-30 13:32:48 +07:00
dragon1211 789e89ed2e add scss 2021-09-29 21:38:14 -07:00
dragon1211 1c8fec9ce2 . 2021-09-29 07:52:07 -07:00
dragon1211 4f6302a0bc add complete compo 2021-09-29 07:38:39 -07:00
dragon1211 94546eff81 contact us 2021-09-29 06:23:02 -07:00
nakazawakan 89b9091d52 テンプレート 2021-08-03 15:34:15 +09:00