コミットグラフ

366 コミット

作成者 SHA1 メッセージ 日付
c382f28938 status → status_code 2021-10-31 22:26:12 +09:00
063f1f7f3a 2021-10-31 22:23:04 +09:00
dragon1211
c7ed82f978 Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-31 18:29:26 +09:00
1e17ab5b73 画像 2021-10-31 17:45:56 +09:00
fbb31a1399 APIルートも一致に 2021-10-31 16:43:52 +09:00
7248e4a1e0 meeting_id→image_id 2021-10-31 16:34:01 +09:00
dragon1211
4ab85c64d1 Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-31 14:04:23 +09:00
23ce9ebbd5 .. 2021-10-31 13:39:52 +09:00
4f1152e73e . 2021-10-31 13:38:12 +09:00
dragon1211
14d4a7854d Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-31 01:45:39 +09:00
bfa0c997ff ... 2021-10-31 01:42:13 +09:00
dragon1211
7127faa7f4 Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-31 01:18:45 +09:00
6a955fc917 取り消し 2021-10-31 01:13:53 +09:00
dragon1211
6e306ce749 . 2021-10-31 01:07:33 +09:00
063936da4a ひでぇやー 2021-10-31 00:50:35 +09:00
ac0f5f3a5f object化 2021-10-31 00:36:24 +09:00
8152766fad 画像アップ出来た 2021-10-31 00:15:02 +09:00
5d2da19a91 Merge branch 'frontend' of github.com:nakazawakan/kikikanri into adminkanryo 2021-10-30 23:56:57 +09:00
dragon1211
6802533c48 bugfixed admin-meeting-edit.jsx upload image 2021-10-30 23:55:19 +09:00
964f33b917 一致じゃないけど 2021-10-30 23:49:37 +09:00
dragon1211
b11bafe9f0 Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-30 23:37:43 +09:00
1601f17514 ちょっと修正(諏訪子の部分) 2021-10-30 23:32:36 +09:00
a9046ff597 ログインの問題の修正 2021-10-30 23:13:12 +09:00
dragon1211
a8c065ce9a completed pdf view 2021-10-30 20:07:24 +09:00
59a6273441 listOfFatherの変更 2021-10-30 19:02:09 +09:00
chankan77
492a4fe6cc
Merge pull request #58 from nakazawakan/fixmeetingdetail
小修正
2021-10-30 18:26:31 +09:00
905e98acbf 小修正 2021-10-30 18:21:15 +09:00
dragon1211
8f6c5fce09 Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-30 16:21:22 +09:00
dragon1211
4e750d7a96 add pdf viewer 2021-10-30 16:20:41 +09:00
chankan77
d5866cbfb3
Merge pull request #57 from nakazawakan/frontend
admin/meeting/edit/{meeting_id}を除くAdminのすべてのページのSPAおよびAPI接続の完了。
2021-10-30 16:19:17 +09:00
dragon1211
981ed2a635 fixed user-avatar 2021-10-30 16:01:05 +09:00
dragon1211
0da3c35d75 Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-30 15:23:08 +09:00
chankan77
091b9743d0
Merge pull request #56 from nakazawakan/apifixmore
子のAPIの修正
2021-10-30 14:43:21 +09:00
chankan77
4dedaada9a
Merge pull request #55 from nakazawakan/nexmo
SMS送信機能性
2021-10-30 14:43:09 +09:00
dragon1211
e21f8054b6 fixed admin-meeting-edit 2021-10-30 13:38:25 +09:00
dragon1211
9982f64768 Merge branch 'apifixmore' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-29 22:21:27 +09:00
e639fcacc3 削除 2021-10-29 22:19:12 +09:00
dragon1211
3616592991 completed admin child&parent API - SPA 2021-10-29 22:13:09 +09:00
dragon1211
dd832d0b10 Merge branch 'apifixmore' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-29 21:49:46 +09:00
dragon1211
e983e54fbf bugfixed admin child jsx 2021-10-29 21:49:12 +09:00
babbe74575 何で「->get()->toArray()」だったのか!? 2021-10-29 21:46:55 +09:00
dragon1211
1d4137ddc9 Merge branch 'apifixmore' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-29 20:27:36 +09:00
dragon1211
fb3895e81e bugfixed admin SPA 2021-10-29 20:27:22 +09:00
07517530cf パスワードの画像って何? 2021-10-29 19:32:04 +09:00
5ee90e897d 子のAPIの修正 2021-10-29 17:58:06 +09:00
58308829e2 SMS送信機能性 2021-10-29 17:51:41 +09:00
dragon1211
515d9ae39d Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into frontend 2021-10-29 17:38:45 +09:00
dragon1211
3ab669a0c7 bugfixed admin-child-detail.jsx 2021-10-29 17:37:38 +09:00
cebe882faf ごめん 2021-10-29 17:32:00 +09:00
chankan77
1c4c484ffc
Merge pull request #54 from nakazawakan/meetingimagesyusei
ミーティング画像の削除機能性を修正しました
2021-10-29 14:45:45 +09:00