|
|
30b906d284
|
Merge remote-tracking branch 'origin/feature/updateupdate' into feature/updateupdate
# Conflicts:
# feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
|
2024-07-05 12:56:58 +09:00 |
|
|
|
7487d6aa1b
|
子供のチェックボックス左寄せしたよん
|
2024-07-05 12:55:14 +09:00 |
|
|
|
990f45d821
|
呼び出し忘れ修正
|
2024-07-02 22:59:08 +09:00 |
|
|
|
e78708c6f6
|
RecyclerView初期化処理修正
|
2024-07-02 22:58:40 +09:00 |
|
|
|
ff0621c524
|
Logger修正追従
|
2024-07-02 22:57:02 +09:00 |
|
|
|
9afca9091f
|
コールバック生成
|
2024-07-02 22:55:50 +09:00 |
|
|
|
865caede14
|
手動マージ
|
2024-07-02 22:55:34 +09:00 |
|
|
|
bfd3f5396e
|
Merge branch 'main' into feature/updateupdate
# Conflicts:
# feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
# feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
|
2024-07-02 22:50:40 +09:00 |
|
|
|
0f9cff0883
|
workaround, 空コールバック追加
|
2024-07-02 22:13:38 +09:00 |
|
|
|
80e19745ba
|
workaround, 空コールバック追加
|
2024-07-02 22:13:21 +09:00 |
|
|
|
01b0697f55
|
子供のチェックボックス左寄せしたよん
|
2024-07-02 16:32:09 +09:00 |
|
|
|
db83de7a37
|
Merge branch 'main' into parent_swipe
# Conflicts:
# feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
# feature/parent/src/main/res/layout/fragment_parent_main.xml
# feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
# gradle/libs.versions.toml
|
2024-07-02 14:13:44 +09:00 |
|
|
|
5ebb269135
|
Merge pull request '親の名前出したよ' (#113) from feature/add_task_menu into main
Reviewed-on: #113
|
2024-07-02 05:05:10 +00:00 |
|
|
|
d5ce31a58e
|
Merge remote-tracking branch 'origin/feature/add_task_menu' into feature/add_task_menu
# Conflicts:
# feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
|
2024-07-02 14:04:40 +09:00 |
|
|
|
e1f6d4d361
|
親の名前出したよ
|
2024-07-02 14:02:05 +09:00 |
|
|
|
120200e8e5
|
Merge pull request 'improve/refactorJul1' (#109) from improve/refactorJul1 into main
Reviewed-on: #109
|
2024-07-01 02:55:27 +00:00 |
|
|
|
3e06c26ce8
|
workaround
|
2024-07-01 11:54:30 +09:00 |
|
|
|
3db5914f95
|
プロパティ名修正
|
2024-07-01 11:54:19 +09:00 |
|
|
|
008a437d19
|
重複削除
|
2024-07-01 11:54:08 +09:00 |
|
|
|
7b445fd007
|
プロパティ名修正
|
2024-07-01 11:53:51 +09:00 |
|
|
|
666c4b0657
|
Merge branch 'main' into feature/settingmainfragment
# Conflicts:
# feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
|
2024-07-01 11:53:27 +09:00 |
|
|
|
43be41c67b
|
不要な引数周りの実装を削除
|
2024-07-01 11:44:03 +09:00 |
|
|
|
aa443f9ee8
|
実装修正
|
2024-06-29 05:19:07 +09:00 |
|
|
|
872b19a710
|
実装修正
|
2024-06-29 05:18:31 +09:00 |
|
|
|
e16ea9a666
|
workaround
|
2024-06-28 12:54:04 +09:00 |
|
|
|
88d99e00da
|
workaround
|
2024-06-28 12:53:25 +09:00 |
|
|
|
cfbaedd740
|
Merge branch 'main' into feature/add_task_menu
# Conflicts:
# gradle/libs.versions.toml
|
2024-06-28 12:46:03 +09:00 |
|
|
|
7825b9cc16
|
ぐるぐるさせました
|
2024-06-28 12:17:58 +09:00 |
|
|
|
b004d9b3d1
|
親の名前出したよ
|
2024-06-28 11:53:16 +09:00 |
|
|
|
5e50a622d4
|
暫定対応
|
2024-06-28 10:22:48 +09:00 |
|
|
|
fe5e077d08
|
親の名前出したよ
|
2024-06-26 14:28:51 +09:00 |
|
|
|
fc28d43cce
|
親の名前出したよ
|
2024-06-25 13:57:38 +09:00 |
|
|
|
8a35bdc285
|
TODO明記
|
2024-06-24 12:04:54 +09:00 |
|
|
|
08a6520dd3
|
コールバック暫定対応
|
2024-06-24 11:10:28 +09:00 |
|
|
|
34fa087d87
|
Workaround
|
2024-06-24 10:36:23 +09:00 |
|
|
|
a575fbe8b5
|
修正
|
2024-06-24 09:34:14 +09:00 |
|
|
|
ecc9ea3f67
|
親の名前出したよ
|
2024-06-21 12:18:04 +09:00 |
|
|
|
4330927e5f
|
設定画面変更したよ
|
2024-06-21 11:36:36 +09:00 |
|
|
|
4d9722ca21
|
フラグメントを追加
|
2024-06-14 10:22:42 +09:00 |
|
|
|
b6f1abc3c2
|
ナビゲーショングラフ作成
|
2024-06-14 10:21:37 +09:00 |
|
|
|
4bcdbae7f4
|
フラグメント作成
|
2024-06-14 10:20:32 +09:00 |
|
|
|
8345efa5c2
|
:feature:setting モジュール作成
|
2024-06-05 14:52:08 +09:00 |
|
