コミットグラフ

704 コミット

作成者 SHA1 メッセージ 日付
dragon1211 140b660fed complete p-meeting-edit 2021-11-16 03:08:46 -08:00
dragon1211 353401cd0e Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account 2021-11-16 02:32:59 -08:00
dragon1211 94a75c02f5 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account 2021-11-16 02:12:41 -08:00
dragon1211 2048fad7a3 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account 2021-11-16 01:58:05 -08:00
dragon1211 79e9b6181c Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account 2021-11-16 01:36:26 -08:00
dragon1211 b27cc81490 add child_id in listOFFather 2021-11-16 00:47:20 -08:00
dragon1211 ef30cc9d24 fixed p-meeting-edit 2021-11-16 00:46:42 -08:00
dragon1211 06a4fd2e86 add p-meeting-edit 2021-11-16 00:34:22 -08:00
dragon1211 590a56e4a2 modified approvals to approval in MeetingsController 2021-11-16 00:13:18 -08:00
守矢諏訪子 a5e91c8963 検索は一覧と一致にする 2021-11-16 16:05:00 +09:00
dragon1211 786db4f002 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account 2021-11-15 21:42:07 -08:00
dragon1211 27f5b217d1 . 2021-11-15 21:41:14 -08:00
dragon1211 5d4a703d09 completed p-account meeting-detail 2021-11-15 21:36:47 -08:00
守矢諏訪子 2626c98475 まぁいっかー 2021-11-16 02:32:48 +09:00
守矢諏訪子 fb26e8f373 牛肉 2021-11-16 02:15:10 +09:00
守矢諏訪子 530910f66d apiルートは一致に 2021-11-16 02:01:02 +09:00
守矢諏訪子 7d46fd816b 複数子供 2021-11-16 01:38:16 +09:00
守矢諏訪子 9467ec0e6c ごめん 2021-11-15 21:43:18 +09:00
守矢諏訪子 ee1ea474f0 tel 2021-11-15 19:24:49 +09:00
dragon1211 80e94c932c add api to modal_setting_notify 2021-11-15 18:59:25 -08:00
dragon1211 0026c8a4da Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account 2021-11-15 18:22:57 -08:00
dragon1211 0d399560ae Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account 2021-11-15 18:01:26 -08:00
dragon1211 09734d19fd Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account 2021-11-15 17:48:22 -08:00
dragon1211 963b185b9a modified p-account meeting-detail 2021-11-15 17:29:32 -08:00
守矢諏訪子 47a56a4d92 2021-11-15 18:25:04 +09:00
守矢諏訪子 5817537479 approvalNotification 2021-11-15 18:24:20 +09:00
守矢諏訪子 fcd7425da4 sa 2021-11-15 18:04:03 +09:00
守矢諏訪子 425caeb9d9 tel 2021-11-15 17:50:18 +09:00
守矢諏訪子 e0ba0353be sa 2021-11-15 17:35:40 +09:00
守矢諏訪子 92aa39c54d 自分の子だけ 2021-11-15 17:31:40 +09:00
守矢諏訪子 934b490ffc ごめん 2021-11-15 17:18:04 +09:00
守矢諏訪子 0a86adc8db 詳細 2021-11-15 17:06:11 +09:00
守矢諏訪子 bd56414411 チキン 2021-11-15 12:42:00 +09:00
dragon1211 3c0e58e213 convert a to Link in modal_setting_notify 2021-11-15 09:36:35 -08:00
dragon1211 a1253c285e remove component old modal_alert 2021-11-15 09:31:44 -08:00
dragon1211 d988727481 remove console.log in admin 2021-11-15 00:50:40 -08:00
dragon1211 9ce16a549c add infinitescroll to admin 2021-11-15 00:45:32 -08:00
dragon1211 29a1ac4f23 add modal_confirm 2021-11-14 23:56:22 -08:00
dragon1211 d936a364d7 modified modal_memo font 2021-11-14 23:00:08 -08:00
dragon1211 6d9bc42e8c modified component pdf path 2021-11-14 22:35:26 -08:00
dragon1211 b096fe5a7b modified parent side&notification 2021-11-14 05:13:34 -08:00
dragon1211 e7dc8c3102 modified c-account notification 2021-11-14 04:41:33 -08:00
dragon1211 3dfe7e6c4c add parent-meeting-detail 2021-11-14 04:22:30 -08:00
dragon1211 9ac9560627 Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account 2021-11-13 20:17:23 +09:00
dragon1211 d405e0fa39 add parent meeting detail 2021-11-13 20:17:15 +09:00
守矢諏訪子 1e6c1df6ca 通知数字 2021-11-13 15:33:48 +09:00
守矢諏訪子 ba1d837b1f Merge branch 'develop' of github.com:nakazawakan/kikikanri into backend 2021-11-13 15:12:15 +09:00
守矢諏訪子 68b6341c34 ごめん 2021-11-13 14:38:02 +09:00
守矢諏訪子 f0fa618352 オブジェクト→配列 2021-11-13 13:16:03 +09:00
chankan77 fff0cdb897
Merge pull request #83 from nakazawakan/c_account_total
通知ボタンのイベントを新たに追加しました。
2021-11-13 10:28:46 +09:00