コミットグラフ

158 コミット

作成者 SHA1 メッセージ 日付
トランギャー
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
dragon1211
ef13b1411f . 2021-10-03 08:19:21 -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
b2253f240e integrated layout.blade 2021-10-02 10:57:35 -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
dragon1211
ade131b336 Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-01 09:28:22 -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
トランギャー
09d3a593eb Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into frontend_p-account 2021-10-01 15:46:23 +07:00
トランギャー
72d018a454 p-account html 2021-10-01 15:45:39 +07:00
b3ee0c2d33 インデントは4つ 2021-10-01 14:26:48 +09:00
ff63da6b73 インデントは4つ 2021-10-01 14:22:07 +09:00