Commit Graph

807 Commits

Author SHA1 Message Date
a28ec3b065
workaround 2024-07-02 13:58:28 +09:00
318397e1d3 Merge pull request 'JavaDoc追加' (#112) from improve/fixJavaDoc into main
Reviewed-on: #112
2024-07-01 03:25:30 +00:00
a2a2b75a60
消し忘れ 2024-07-01 12:24:48 +09:00
885059a1e4
消し忘れ 2024-07-01 12:24:42 +09:00
f105b853ed
JavaDoc 2024-07-01 12:24:27 +09:00
1e7fc1ab87
JavaDoc 2024-07-01 12:23:48 +09:00
87c7ba93a9
JavaDoc文言修正 2024-07-01 12:21:59 +09:00
45a8d94294
JavaDoc 2024-07-01 12:21:41 +09:00
106c8b7994
JavaDoc修正 2024-07-01 12:20:26 +09:00
ed85755968
JavaDoc 2024-07-01 12:19:46 +09:00
fd9343c714
JavaDoc 2024-07-01 12:18:58 +09:00
eab70e801e
JavaDoc 2024-07-01 12:18:15 +09:00
664520f03d
JavaDoc 2024-07-01 12:17:51 +09:00
27cbbec1c4
コンストラクタにJavaDoc追加 2024-07-01 12:16:42 +09:00
48af8f831c
コンストラクタにJavaDoc追加 2024-07-01 12:15:47 +09:00
8535e4727d
コンストラクタにJavaDoc追加 2024-07-01 12:15:27 +09:00
232c7dafbb
コンストラクタにJavaDoc追加 2024-07-01 12:14:26 +09:00
c147d6ebe8
JavaDoc修正 2024-07-01 12:13:42 +09:00
d6789fe999
コンストラクタにJavaDoc追加 2024-07-01 12:13:14 +09:00
feb988cf26
コンストラクタにJavaDoc追加 2024-07-01 12:13:01 +09:00
26331bf278
コンストラクタにJavaDoc追加 2024-07-01 12:12:40 +09:00
ec730622d2
コメント削除 2024-07-01 12:12:18 +09:00
01f9744778
コメント削除 2024-07-01 12:11:56 +09:00
32eba3626a
コメント削除 2024-07-01 12:11:33 +09:00
eefcac51d0
コンストラクタにJavaDoc追加 2024-07-01 12:11:14 +09:00
a923aeddf4
コンストラクタにJavaDoc追加 2024-07-01 12:10:42 +09:00
ebe0b24761
コンストラクタにJavaDoc追加 2024-07-01 12:10:25 +09:00
29149835e0
コンストラクタにJavaDoc追加 2024-07-01 12:09:40 +09:00
108284ea4f
JavaDoc追加 2024-07-01 12:03:28 +09:00
807cb4e876
JavaDoc追加 2024-07-01 12:02:16 +09:00
db72976607 Merge pull request 'feature/login_code_dialog' (#110) from feature/login_code_dialog into main
Reviewed-on: #110
2024-07-01 02:55:54 +00:00
120200e8e5 Merge pull request 'improve/refactorJul1' (#109) from improve/refactorJul1 into main
Reviewed-on: #109
2024-07-01 02:55:27 +00:00
b15cb685f0 Merge pull request '親の名前出したよ' (#108) from feature/settingmainfragment into main
Reviewed-on: #108
2024-07-01 02:55:13 +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
c1b1cdcd1c Merge pull request 'feature/parent_login' (#107) from feature/parent_login into main
Reviewed-on: #107
2024-07-01 02:49:29 +00:00
44c11c4f4f Merge pull request 'feature/showtotalreword' (#106) from feature/showtotalreword into main
Reviewed-on: #106
2024-07-01 02:48:26 +00:00
51da4bce63
workaround 2024-07-01 11:48:09 +09:00
504a43d153
Merge branch 'main' into feature/showtotalreword
# Conflicts:
#	data/src/main/java/one/nem/kidshift/data/impl/RewardDataDummyImpl.java
#	data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java
#	data/src/main/java/one/nem/kidshift/data/modules/RewardDataDummyModule.java
#	data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java
2024-07-01 11:47:45 +09:00
100744f05c Merge pull request 'feature/register' (#105) from feature/register into main
Reviewed-on: #105
2024-07-01 02:45:53 +00:00
43be41c67b
不要な引数周りの実装を削除 2024-07-01 11:44:03 +09:00
a94d972048
未使用インポート削除 2024-07-01 11:42:28 +09:00
987f282310 Merge pull request 'タスク取得時DBにキャッシュするように' (#103) from feature/task_cache into main
Reviewed-on: #103
2024-06-30 07:34:59 +00:00
rca
4e3372594c デバッグ用ログ追加 2024-06-30 16:28:47 +09:00
rca
9f1f46c5c4 ログ追加 2024-06-30 16:26:51 +09:00
rca
9f198f61f8 キャッシュ取得処理実装 2024-06-30 16:24:43 +09:00
rca
8d17072ffe ログを日本語に 2024-06-30 16:22:47 +09:00