I love Github
|
7e96af90ff
|
Merge pull request #37 from nakazawakan/feature/admin
Feature/admin
|
2021-10-09 10:27:43 -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 |
|
I love Github
|
ba6d9f955c
|
Merge pull request #36 from nakazawakan/feature_c_acc
add admin web routes
|
2021-10-08 22:31:00 -07:00 |
|
dragon1211
|
9b8b3e3d47
|
add admin web routes
|
2021-10-09 14:26:44 -07:00 |
|
I love Github
|
6d58bc7d0a
|
Merge pull request #35 from nakazawakan/feature_c_acc
Feature c acc
|
2021-10-08 21:54:57 -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 |
|
dragon1211
|
7e1a8ab3c5
|
pull frontend
|
2021-10-08 12:39:03 -07:00 |
|
dragon1211
|
0c28929c31
|
.
|
2021-10-08 12:37:47 -07:00 |
|
I love Github
|
5d2ba14b61
|
Merge pull request #31 from nakazawakan/feature_c_acc
Feature c acc
|
2021-10-07 20:37:36 -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 |
|
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 |
|
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 |