Commit graph

25 commits

Author SHA1 Message Date
Phillip Thelen
8c3fae91cc update translations 2017-11-17 14:12:12 +01:00
Phillip Thelen
e2fba6c6e4 update translations 2017-08-02 14:30:56 +02:00
Phillip Thelen
5cb790dfce update translations 2017-07-05 11:51:46 +02:00
Phillip Thelen
3c61635394 Merge branch 'realm' of github.com:HabitRPG/habitrpg-android into realm
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/res/anim/fab_slide_in.xml
#	Habitica/res/anim/fab_slide_out.xml
#	Habitica/res/layout/floating_menu_tasks.xml
#	Habitica/res/values-ru/strings.tutorial.xml
#	Habitica/res/values-ru/strings.xml
#	Habitica/res/values/strings.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTaskCommand.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeSerializer.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
#	translations/store_strings-ru.xml
2017-04-29 19:42:27 +02:00
Phillip Thelen
e99059b298 update translation 2017-04-21 13:18:52 +02:00
Phillip Thelen
f5ad6488bc Move all db access to repositories 2017-04-20 21:14:23 +02:00
Phillip Thelen
9d5ff8d58d update translations 2017-04-19 15:16:00 +02:00
Phillip Thelen
21504fedba update translations 2017-04-14 15:26:28 +02:00
Phillip Thelen
368608693a improve creator view 2017-04-07 15:56:23 +02:00
Phillip Thelen
d0a0b845e4 update translations 2017-02-26 12:07:23 +01:00
Phillip Thelen
67a0deee61 fix a bunch of linter errors 2017-02-01 16:58:53 +01:00
Phillip Thelen
3b56a066bb update translations 2017-01-23 13:16:11 +01:00
Phillip Thelen
3a8098c3ec update translations 2016-12-12 14:33:01 +01:00
Phillip Thelen
15c1a850d6 update translations 2016-11-01 09:45:20 +01:00
Phillip Thelen
4b7c402657 improve widget update behaviour 2016-09-30 17:31:05 +02:00
Phillip Thelen
e62c6b567c update translations 2016-09-23 20:50:27 +02:00
Phillip Thelen
9de0f1b91b update translations 2016-08-21 20:37:43 +02:00
Phillip Thelen
f2a716edc5 update translations 2016-08-03 15:42:23 +02:00
Phillip Thelen
2dd12cafa7 update translations 2016-07-19 00:31:45 +02:00
Phillip Thelen
dbd46af4a2 update translations 2016-06-20 11:36:43 +02:00
Phillip Thelen
4b5265e170 finalize v3 update 2016-05-21 20:05:43 +02:00
Phillip Thelen
275bc861f7 update translations 2016-04-26 16:49:56 +02:00
Phillip Thelen
9dd99afbe6 update translations 2016-04-12 15:04:16 +02:00
Phillip Thelen
809a247766 update translations 2016-04-07 20:14:41 +02:00
Phillip Thelen
b869f0c93e update translations 2016-03-22 20:06:00 +01:00