dragon1211
|
8e64360357
|
add withdrawal and profile
|
2021-11-08 00:25:42 +09:00 |
|
dragon1211
|
390a0429d1
|
add c-account/parent spa&api
|
2021-11-07 19:56:58 +09:00 |
|
dragon1211
|
55fbfe55fd
|
modified c-account/meeting/detail
|
2021-11-07 18:40:10 +09:00 |
|
dragon1211
|
6e04da6fa6
|
modified css-loader
|
2021-11-07 17:03:29 +09:00 |
|
dragon1211
|
e4497c65b8
|
modified css-loader
|
2021-11-07 17:01:36 +09:00 |
|
dragon1211
|
b15eb7e3aa
|
bugfixed child-side.jsx
|
2021-11-07 16:41:47 +09:00 |
|
dragon1211
|
cbd52f45fb
|
bugfixed infiniteScoll of meeting and search.
|
2021-11-07 16:05:48 +09:00 |
|
dragon1211
|
b82fe14287
|
c-accountログイン機能、meeting、search完成しました。
|
2021-11-07 03:13:31 +09:00 |
|
dragon1211
|
cb0aa727e3
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-06 23:41:53 +09:00 |
 守矢諏訪子
|
e7c2b4d841
|
Merge branch 'c_account' of github.com:nakazawakan/kikikanri into backend
|
2021-11-06 23:18:15 +09:00 |
|
守矢諏訪子
|
5c91e533b4
|
、
|
2021-11-06 23:17:15 +09:00 |
|
dragon1211
|
f957dd0ae2
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-06 23:11:11 +09:00 |
|
守矢諏訪子
|
91d2d6d922
|
色々
|
2021-11-06 23:09:48 +09:00 |
|
dragon1211
|
03610f2130
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-06 21:35:59 +09:00 |
|
守矢諏訪子
|
a77fd797c0
|
meeting_approvals→approvals
|
2021-11-06 19:31:17 +09:00 |
|
dragon1211
|
0cc75540e7
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-06 19:14:40 +09:00 |
|
守矢諏訪子
|
b908d2d21a
|
。
|
2021-11-06 19:11:25 +09:00 |
|
dragon1211
|
009fe6890d
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-06 18:25:39 +09:00 |
|
守矢諏訪子
|
26f2d6ec60
|
…
|
2021-11-06 18:24:18 +09:00 |
|
dragon1211
|
7c54c6e827
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search
|
2021-11-06 17:37:29 +09:00 |
|
守矢諏訪子
|
5829ef86de
|
自分の親だけを見える様に
|
2021-11-06 14:33:19 +09:00 |
|
守矢諏訪子
|
319da650af
|
fathers→father
|
2021-11-06 14:22:12 +09:00 |
|
dragon1211
|
81524b3984
|
c-account/search機能を完成しました。
|
2021-11-06 03:08:05 +09:00 |
|
dragon1211
|
9e0f05a858
|
remove console.log c_account/meeting/detail
|
2021-11-06 00:42:14 +09:00 |
|
dragon1211
|
51415a80e5
|
remove console.log c_account/meeting/detail
|
2021-11-06 00:41:43 +09:00 |
|
dragon1211
|
e059cdbc30
|
remove console.log in child/meeting/index
|
2021-11-06 00:35:40 +09:00 |
|
dragon1211
|
dd8018c2ff
|
add login-success-alert in c-acount/meeting
|
2021-11-06 00:26:20 +09:00 |
|
dragon1211
|
113a813db7
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-06 00:00:43 +09:00 |
|
守矢諏訪子
|
c2c7dad063
|
ごめん
|
2021-11-05 23:57:27 +09:00 |
|
dragon1211
|
ace447249f
|
/c-account/meeting完成しました。
|
2021-11-05 23:52:29 +09:00 |
|
dragon1211
|
9c265c74a0
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-05 19:37:17 +09:00 |
|
守矢諏訪子
|
16271a70ca
|
いい
|
2021-11-05 19:34:36 +09:00 |
|
dragon1211
|
5834a64dd9
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-05 18:54:41 +09:00 |
|
守矢諏訪子
|
1ec50700f7
|
meetings/detailで親のデータ（子画面限定）
|
2021-11-05 18:51:10 +09:00 |
|
dragon1211
|
ba71a34f07
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-05 18:29:57 +09:00 |
|
dragon1211
|
9375aae7f4
|
Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-05 18:28:51 +09:00 |
|
守矢諏訪子
|
c419cef180
|
親のオブジェクト化
|
2021-11-05 18:27:55 +09:00 |
|
守矢諏訪子
|
c812727653
|
SMSと本登録
|
2021-11-05 18:20:36 +09:00 |
|
dragon1211
|
5712e4677b
|
Merge branch 'fixfordragon' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-05 18:02:12 +09:00 |
|
守矢諏訪子
|
0cdc85245a
|
ごめん
|
2021-11-05 18:01:37 +09:00 |
|
dragon1211
|
04cdd328e6
|
Merge branch 'fixfordragon' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-05 17:55:35 +09:00 |
|
守矢諏訪子
|
58a8da9ede
|
子供側の受取の修正
|
2021-11-05 17:07:47 +09:00 |
|
dragon1211
|
ffbe02034d
|
add avatar in child side
|
2021-11-05 15:50:22 +09:00 |
|
dragon1211
|
ca7bdea67d
|
Childログイン、ログアウト完了しました。
|
2021-11-05 15:44:41 +09:00 |
|
dragon1211
|
f5df8daa92
|
add child logout
|
2021-11-05 15:29:17 +09:00 |
|
dragon1211
|
7ea57fbe63
|
add c_account id&image
|
2021-11-05 15:09:14 +09:00 |
|
dragon1211
|
15c0466cc0
|
Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-05 13:30:36 +09:00 |
|
守矢諏訪子
|
c856c0801e
|
本登録の修正
|
2021-11-05 12:50:00 +09:00 |
|
守矢諏訪子
|
b57d8c91cc
|
ログイン機能性は子供でも機能様にする
|
2021-11-05 12:01:23 +09:00 |
|
dragon1211
|
5c2ec9800c
|
.
|
2021-11-05 11:48:29 +09:00 |
|
守矢諏訪子
|
9acd934aa8
|
Merge branch 'c_account' of github.com:nakazawakan/kikikanri into fixfordragon
|
2021-11-05 11:18:33 +09:00 |
|
dragon1211
|
8e156805af
|
bugfixed scroll
|
2021-11-05 02:38:59 +09:00 |
|
dragon1211
|
ab5e8d1bc4
|
modified identify to identify
|
2021-11-05 00:39:40 +09:00 |
|
chankan77
|
2d2a311528
|
Merge pull request #73 from nakazawakan/c_account
Child Auth APIをリンクしました。
|
2021-11-05 00:25:07 +09:00 |
|
chankan77
|
511541932e
|
Merge pull request #72 from nakazawakan/fatherapifix
残り親のAPIの追加又は修正
|
2021-11-05 00:24:53 +09:00 |
|
dragon1211
|
1fd2967493
|
start child api&spa
|
2021-11-05 00:07:08 +09:00 |
|
dragon1211
|
ab47ddeb36
|
modified child SPA path-2
|
2021-11-04 17:32:01 +09:00 |
|
dragon1211
|
0ea3e6ebc3
|
Merge branch 'childnoko' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-04 16:10:43 +09:00 |
|
守矢諏訪子
|
5a66127e7f
|
、
|
2021-11-04 16:04:46 +09:00 |
|
守矢諏訪子
|
6bec5c0100
|
。
|
2021-11-04 16:03:31 +09:00 |
|
守矢諏訪子
|
3c0fa9a629
|
もう良いよ
|
2021-11-04 16:01:38 +09:00 |
|
dragon1211
|
ca833e037c
|
modified child auth path and name
|
2021-11-04 15:38:36 +09:00 |
|
dragon1211
|
6f1d9fdec5
|
Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-04 15:25:35 +09:00 |
|
dragon1211
|
7ef49a6b5d
|
.
|
2021-11-04 14:53:51 +09:00 |
|
守矢諏訪子
|
561bbd920a
|
残り親のAPIの追加又は修正
|
2021-11-04 13:28:58 +09:00 |
|
守矢諏訪子
|
e493a0baf2
|
Merge branch 'develop' of github.com:nakazawakan/kikikanri into oyakologin
|
2021-11-04 12:59:38 +09:00 |
|
守矢諏訪子
|
806612fb78
|
忘れた
|
2021-11-04 12:51:42 +09:00 |
|
dragon1211
|
caf915f57a
|
Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-03 23:42:23 +09:00 |
|
dragon1211
|
9578e4ec08
|
Merge branch 'meetingapproval' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 20:58:58 +09:00 |
|
守矢諏訪子
|
b535ff8c9c
|
子供
|
2021-11-03 20:46:48 +09:00 |
|
dragon1211
|
48f2d327eb
|
completed admin-meeting-edit-approval
|
2021-11-03 20:21:01 +09:00 |
|
守矢諏訪子
|
98ecd60338
|
、
|
2021-11-03 19:54:52 +09:00 |
|
守矢諏訪子
|
58a941e184
|
。
|
2021-11-03 19:49:05 +09:00 |
|
守矢諏訪子
|
2ff208734d
|
。
|
2021-11-03 18:25:32 +09:00 |
|
dragon1211
|
5c061e4f66
|
bugfixed admin-meeting-edit-approval
|
2021-11-03 17:47:21 +09:00 |
|
dragon1211
|
cc1ed0d82f
|
Merge branch 'meetingapproval' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 17:24:05 +09:00 |
|
守矢諏訪子
|
4e69719d72
|
、、、
|
2021-11-03 17:21:47 +09:00 |
|
dragon1211
|
58ba292165
|
Merge branch 'meetingapproval' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 16:23:25 +09:00 |
|
守矢諏訪子
|
7fb399e028
|
approval_at == nullって消す
|
2021-11-03 16:18:35 +09:00 |
|
dragon1211
|
63022c6760
|
Merge branch 'meetingapproval' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 02:51:32 +09:00 |
|
dragon1211
|
d179ee727f
|
add validation
|
2021-11-03 02:51:24 +09:00 |
|
守矢諏訪子
|
e02124efe9
|
detailに配列の追加
|
2021-11-03 02:30:46 +09:00 |
|
dragon1211
|
5dda13c8f5
|
Merge branch 'oyakotoroku' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-03 02:04:28 +09:00 |
|
守矢諏訪子
|
8104f6204a
|
親子丼
|
2021-11-03 01:59:03 +09:00 |
|
dragon1211
|
9794557730
|
Merge branch 'fakerhenkou' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-02 22:57:47 +09:00 |
|
dragon1211
|
071529fccd
|
a
|
2021-11-02 22:53:26 +09:00 |
|
守矢諏訪子
|
39e94546d0
|
fakerでランダムIDに
|
2021-11-02 22:40:03 +09:00 |
|
守矢諏訪子
|
9e521cfdd2
|
ミーティング許可のAPIの変更
|
2021-11-02 14:15:58 +09:00 |
|
守矢諏訪子
|
5cee41f059
|
親子の場合、-は_に変換は必要です
|
2021-11-02 11:24:32 +09:00 |
|
守矢諏訪子
|
72df0a09f7
|
親子ログインルート
|
2021-11-02 11:19:00 +09:00 |
|
dragon1211
|
c744bf1a14
|
pull develop
|
2021-11-02 11:14:46 +09:00 |
|
chankan77
|
01250eafde
|
Merge pull request #65 from nakazawakan/nihongomoji
パスワードのアラートを日本語に翻訳
|
2021-11-02 10:56:25 +09:00 |
|
守矢諏訪子
|
901d05dbb4
|
パスワードのアラートを日本語に翻訳
|
2021-11-02 10:43:59 +09:00 |
|
dragon1211
|
1cef943289
|
remove console.log()
|
2021-11-02 01:36:41 +09:00 |
|
dragon1211
|
9dabee5c33
|
「全員に送信」及び「選んで送信」は、radioになります。
|
2021-11-02 00:23:43 +09:00 |
|
dragon1211
|
d9c1ade8fd
|
「メモアイコン」を押すと少し横にずれているので、修正をお願いいたします。
|
2021-11-01 23:57:34 +09:00 |
|
dragon1211
|
b0063dd524
|
Merge branch 'pdfsyusei' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-01 23:26:00 +09:00 |
|
dragon1211
|
1863990c4c
|
画像が何もない場合は正方形です。画像はbackground-size:contain;と同じ挙動になります。
|
2021-11-01 23:24:42 +09:00 |
|
守矢諏訪子
|
9cd7f43959
|
a
|
2021-11-01 23:17:07 +09:00 |
|
守矢諏訪子
|
10b57b20ea
|
a
|
2021-11-01 23:15:48 +09:00 |
|
dragon1211
|
fa5609f9dd
|
Merge branch 'pdfsyusei' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-01 22:45:55 +09:00 |
|
dragon1211
|
44674d8188
|
画像が何もない場合は正方形です。
|
2021-11-01 22:45:08 +09:00 |
|
守矢諏訪子
|
065e8436f2
|
ご面
|
2021-11-01 22:43:32 +09:00 |
|
dragon1211
|
c51b076c6d
|
show login success modal in admin-meeting-index
|
2021-11-01 22:38:21 +09:00 |
|
dragon1211
|
3b6d9e051a
|
Merge branch 'pdfsyusei' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-01 21:59:47 +09:00 |
|
dragon1211
|
e1f0249af6
|
add user-avatar-image object-fit
|
2021-11-01 21:59:30 +09:00 |
|
dragon1211
|
8c91f765fd
|
add user-avatar-image object-fit
|
2021-11-01 21:40:07 +09:00 |
|
守矢諏訪子
|
2fa49a6038
|
..
|
2021-11-01 21:26:37 +09:00 |
|
dragon1211
|
8c6264b9c9
|
Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-01 20:46:43 +09:00 |
|
chankan77
|
4688bbd70c
|
Merge pull request #62 from nakazawakan/pdfsyusei
Pdfsyusei
|
2021-11-01 17:45:42 +09:00 |
|
chankan77
|
554aade1ae
|
Merge pull request #59 from nakazawakan/lofhenko
listOfFatherの変更
|
2021-11-01 17:45:32 +09:00 |
|
守矢諏訪子
|
d08efeef20
|
/
|
2021-11-01 17:44:00 +09:00 |
|
守矢諏訪子
|
12052e4189
|
完了
|
2021-11-01 16:23:03 +09:00 |
|
守矢諏訪子
|
fcc2f9eb04
|
.
|
2021-11-01 16:06:39 +09:00 |
|
守矢諏訪子
|
edcaf09dfc
|
$chkの問題
|
2021-11-01 15:18:40 +09:00 |
|
dragon1211
|
b3d221ba11
|
pull develop
|
2021-11-01 14:50:09 +09:00 |
|
dragon1211
|
becc7a0941
|
Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into c_account
|
2021-11-01 14:47:57 +09:00 |
|
守矢諏訪子
|
f82d31ebc7
|
ok
|
2021-11-01 13:49:52 +09:00 |
|
dragon1211
|
5bd1cc4f94
|
pull frontend
|
2021-11-01 12:40:12 +09:00 |
|
dragon1211
|
a846032499
|
bugfixed admin-meeting-edit.jsx
|
2021-11-01 12:04:37 +09:00 |
|
dragon1211
|
c42ff28f6f
|
bugfixed admin-meeting API&SPA
|
2021-11-01 02:08:30 +09:00 |
|
dragon1211
|
4739191f2a
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-01 01:35:32 +09:00 |
|
守矢諏訪子
|
3697504cd1
|
....
|
2021-11-01 01:31:14 +09:00 |
|
dragon1211
|
c1516e9801
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-01 01:11:44 +09:00 |
|
守矢諏訪子
|
b14d1fa77a
|
...
|
2021-11-01 01:08:02 +09:00 |
|
dragon1211
|
b981fe0638
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-11-01 00:38:49 +09:00 |
|
守矢諏訪子
|
16f56cd289
|
.
|
2021-11-01 00:35:25 +09:00 |
|
守矢諏訪子
|
2a4e14991f
|
..
|
2021-11-01 00:22:21 +09:00 |
|
dragon1211
|
d17689dad7
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-10-31 23:58:25 +09:00 |
|
守矢諏訪子
|
fba16489db
|
PDFアップ
|
2021-10-31 23:50:54 +09:00 |
|
dragon1211
|
c697c82718
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-10-31 23:34:50 +09:00 |
|
dragon1211
|
a64d30aea4
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-10-31 23:30:33 +09:00 |
|
守矢諏訪子
|
34419e1ff2
|
.
|
2021-10-31 23:30:14 +09:00 |
|
守矢諏訪子
|
f15f0c90fd
|
本当に心が変わりすぎるよね…
|
2021-10-31 23:29:21 +09:00 |
|
dragon1211
|
933f00d0fb
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-10-31 23:23:24 +09:00 |
|
守矢諏訪子
|
a2188a7644
|
くるくる
|
2021-10-31 23:22:14 +09:00 |
|
dragon1211
|
10906e21b3
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-10-31 22:59:04 +09:00 |
|
守矢諏訪子
|
a2923d8a88
|
id
|
2021-10-31 22:56:36 +09:00 |
|
dragon1211
|
0533c47a6b
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-10-31 22:47:36 +09:00 |
|
守矢諏訪子
|
bbd2193620
|
id
|
2021-10-31 22:46:49 +09:00 |
|
dragon1211
|
af32af47ab
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-10-31 22:40:08 +09:00 |
|
守矢諏訪子
|
8331bd0e09
|
画像は最大10個までです。
|
2021-10-31 22:32:17 +09:00 |
|
dragon1211
|
2ba4b75a39
|
Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend
|
2021-10-31 22:28:25 +09:00 |
|
守矢諏訪子
|
e08059f32d
|
。。
|
2021-10-31 22:27:54 +09:00 |
|
守矢諏訪子
|
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
|
4e750d7a96
|
add pdf viewer
|
2021-10-30 16:20:41 +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 |
|
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 |
|
chankan77
|
3e23bbb54b
|
Merge pull request #53 from nakazawakan/nokoriapproval
Nokoriapproval
|
2021-10-29 14:45:31 +09:00 |
|
chankan77
|
fa06d05963
|
Merge pull request #52 from nakazawakan/pasowrdsaihakko
パスワード再発行依頼
|
2021-10-29 14:45:19 +09:00 |
|
守矢諏訪子
|
d9cb1e021c
|
ミーティング画像の削除機能性を修正しました
|
2021-10-29 11:04:58 +09:00 |
|
守矢諏訪子
|
fd82401491
|
残っているミーティング存知APIルート
|
2021-10-29 10:56:15 +09:00 |
|
守矢諏訪子
|
992390fa78
|
パスワード再発行依頼
|
2021-10-29 10:37:28 +09:00 |
|
守矢諏訪子
|
2aa3fb5f1d
|
updateとdelleteの問題
|
2021-10-28 17:45:37 +09:00 |
|
守矢諏訪子
|
ea578a18b1
|
DRAGONさんに依頼した修正＋画像アップロード機能性
|
2021-10-28 17:12:12 +09:00 |
|
dragon1211
|
131c1ad169
|
pull develop
|
2021-10-28 15:25:03 +09:00 |
|
dragon1211
|
9dedee02e2
|
admin API
|
2021-10-28 13:38:45 +09:00 |