コミットグラフ

131 コミット

作成者 SHA1 メッセージ 日付
トランギャー
f2468270ad set value to blade 2021-10-07 12:54:28 +07:00
トランギャー
684169cac3 routerを追加
This reverts commit b87ad63016.
2021-10-07 11:33:39 +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
chankan77
b316365e82
Merge pull request #25 from nakazawakan/frontend
bugfixed in IconButton
2021-10-06 11:39:21 +09: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
chankan77
4902a53b5b
Merge pull request #22 from nakazawakan/frontend
お問い合わせのapi接続を完了 - Frontend.
2021-10-06 00:29:11 +09:00
dragon1211
77a4a4d4ee Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-06 00:06:27 -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
トランギャー
dc05063a33 Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-10-05 21:52:38 +07:00
chankan77
db238b476f
Merge pull request #21 from nakazawakan/ContactsErrHand
try-catch化
2021-10-05 21:53:46 +09:00
0ae86a0359 try-catch化 2021-10-05 21:51:22 +09: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
chankan77
e2bcf8d15a
Merge pull request #18 from nakazawakan/childupde
子供のDBのアップデート
2021-10-05 14:25:00 +09:00
chankan77
cbade22e12
Merge pull request #17 from nakazawakan/contactsregister
連絡コントローラー
2021-10-05 14:24:52 +09:00
35250c0f2d Merge branch 'develop' of github.com:nakazawakan/kikikanri into contactsregister 2021-10-05 14:24:05 +09:00
chankan77
83b7f2e5ef
Merge pull request #14 from nakazawakan/meetingspost
MeetingsのPOSTの全部
2021-10-05 14:04:26 +09:00
chankan77
455d3ae52a
Merge pull request #13 from nakazawakan/meetingimagehenko
MeetingImagesをちょっと変更しました
2021-10-05 14:04:17 +09:00
chankan77
1c73b61036
Merge pull request #12 from nakazawakan/loginlimitshenko
LoginLimitsをちょっと変更しました
2021-10-05 14:04:07 +09:00
chankan77
440034572f
Merge pull request #11 from nakazawakan/fatherrelationspostput
Fatherrelationspostput
2021-10-05 14:03:58 +09:00
chankan77
a48ca84dc3
Merge pull request #10 from nakazawakan/modelchange
Modelchange
2021-10-05 14:03:48 +09:00
871698a382 子供のDBのアップデート 2021-10-05 13:45:59 +09:00
f2876cdf68 連絡コントローラー 2021-10-05 13:33:50 +09: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
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
18cbe94d6d add profile route. 2021-10-04 01:01:11 -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