コミットグラフ

158 コミット

作成者 SHA1 メッセージ 日付
がる
c5aa944da8
Merge pull request #27 from nakazawakan/feature/p_account_child
p_accountでは子一覧、子詳細 、入社日変更、 子追加の完了画面
2021-10-18 14:20:07 +09:00
がる
1dcc4d8deb
Merge pull request #26 from nakazawakan/frontend
Add  admin login
2021-10-18 14:20:00 +09:00
nakazawakan
8f256afddb gitignoreテスト 2021-10-15 16:04:55 +09:00
nakazawakan
55d19b1ee5 テスト 2021-10-15 15:47:15 +09:00
nakazawakan
448bc5ccbe gitignore追加 2021-10-15 15:45:58 +09:00
nakazawakan
2ea3f3d85c docker-compose.yml 修正 2021-10-15 15:31:02 +09:00
nakazawakan
103e398965 docker-compose.yml SSL化準備 2021-10-15 15:29:31 +09:00
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
トランギャー
13857cd560 update requirement 2021-10-08 23:16:45 +07:00
トランギャー
d5faaf8342 change path of Side 2021-10-08 11:20:41 +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
トランギャー
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
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