stud203990/Treker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,425 Commits 1 Branch 0 Tags 41 MiB
f4e5b68258
Commit Graph

577 Commits

Author SHA1 Message Date
Alinson Xavier
0dc46d02a4 Minor style changes 2017-11-15 21:54:30 -06:00
Alinson Xavier
ecf3086aef Merge branch 'add-delete-button-to-stats' of git://github.com/derebaba/uhabits into pull/delete-button 2017-11-15 21:42:30 -06:00
Alinson Xavier
0077d35ff9 Automatically dismiss summary notification 2017-11-14 23:03:46 -06:00
Alinson Xavier
2a4a7c975f Add action to show reminder right now (for developers) 2017-11-14 22:35:37 -06:00
Alinson Xavier
e91f1c3fa4 Merge branch 'dev' into feature/custom-snooze 2017-11-14 22:20:32 -06:00
Alinson Xavier
9d48b4bcdb Simplify code; change notification actions to Yes/No/Later 2017-11-14 22:07:52 -06:00
Alinson Xavier
7f1a35ebe5 Merge branch 'dev' of git://github.com/rsri/uhabits into pull/cancel_notification 2017-11-14 21:54:16 -06:00
Alinson Xavier
5ccd546958 Merge branch 'dev' of git://github.com/TruffelNL/uhabits into dev 
# Conflicts:
#	uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
 2017-11-14 21:45:56 -06:00
Victor Yu
8feb07ff1b Code review changes; Made 'stack view' design available for all widgets 2017-11-08 21:03:06 -05:00
derebaba
1edd76ae8c Added delete button to statistics screen 2017-11-02 14:21:27 +03:00
Victor Yu
268cb0bc18 Can make either the normal checkmark widget or stackview checkmark widget 2017-10-15 20:44:21 -04:00
Victor Yu
5a78de5a25 Implemented ability to choose multiple habits for stackview 2017-10-15 13:36:54 -04:00
Victor Yu
82972d6e47 Implemented stackwidget style for checkmark widgets 2017-10-15 13:36:54 -04:00
Alinson Xavier
a201273781 Refactoring 2017-10-10 21:31:31 -05:00
Alinson Xavier
819a8d341f Merge branch 'llunak/custom_snooze' into dev 2017-10-09 19:16:57 -05:00
Alinson Xavier
b8f7d4fad2 Add missing test screenshots 2017-10-04 21:43:34 -05:00
Alinson Xavier
dea4e069c5 Add test screenshots for Oreo 2017-10-04 21:27:43 -05:00
Alinson Xavier
223b8bc5ec Merge branch 'dev' into llunak/custom_snooze 2017-09-28 07:00:51 -05:00
Alinson Xavier
ba78e563cd Merge branch 'keep_position' of git://github.com/llunak/uhabits into dev 2017-09-28 06:44:36 -05:00
Alinson Xavier
acb94db6d6 Introduce failing test for bug #339 2017-09-28 06:40:06 -05:00
Luboš Luňák
d2cc283bd5 don't reset habit position when editing it 2017-09-28 13:03:34 +02:00
Luboš Luňák
be9c2ff64d fix name of exported files (correct the time) 
This reverts part of a75a27ad, where this got changed presumably by mistake.
 2017-09-27 20:13:29 +02:00
Alinson Xavier
bb22972eb2 Minor code style changes 2017-09-24 07:19:35 -05:00
Alinson Xavier
e911fb35b6 Better explain LED lights feature 2017-09-24 07:16:59 -05:00
Luboš Luňák
e970473876 make notification snooze popup follow night mode setting 2017-09-15 13:06:42 +02:00
Luboš Luňák
cec05ccbca when asking for snooze delay, first show a list of common options 2017-09-15 13:06:37 +02:00
Luboš Luňák
aac59367dc properly handle the activity window of the snooze time dialog 2017-09-15 12:01:44 +02:00
Luboš Luňák
0421ca0549 make snooze time dialog follow night mode setting 2017-09-15 12:00:51 +02:00
Luboš Luňák
43e802fb8e implement custom snooze for notifications 2017-09-15 12:00:42 +02:00
Luboš Luňák
4d59783809 make LED blinking for notifications configurable 2017-09-11 15:18:42 +02:00
Luboš Luňák
a680d57cac make notifications also blink the LED 2017-09-11 13:46:49 +02:00
TruffelNL
f6620be2d9 Removed an if statement 
Removed the check if a summary was already shown.
 2017-08-15 23:44:41 +02:00
TruffelNL
1c2abb543b Added private variables 2017-08-15 23:09:19 +02:00
TruffelNL
87cf2871a7 Added bundled notifications 
Added bundled/grouped/stacked notifications as per https://github.com/iSoron/uhabits/issues/243
 2017-08-15 23:02:58 +02:00
srikanth r
e041d9041b Implemented cancel to reminders of habits. 2017-08-04 23:01:41 +05:30
Alinson Xavier
dccf5eae47 Only use signing configuration if env variables are defined 2017-08-02 11:19:25 -04:00
Alinson Xavier
b2a8c9c45f Remove PebbleReceiver 2017-07-26 11:39:02 -04:00
Alinson Xavier
125a574ff9 Merge branch 'master' into dev 2017-07-26 10:37:08 -04:00
Alinson Xavier
a75a27ad42 Make the day start at 3am instead of midnight 
Closes #50
 2017-07-25 20:18:01 -04:00
Alinson Xavier
4126f01ef1 Reactivate proguard 2017-07-25 18:09:48 -04:00
Alinson Xavier
864636705d Implement tests for Preferences 2017-07-24 09:54:51 -04:00
Alinson Xavier
c05f50998f Add branch and commit hash to version name 2017-07-24 00:14:46 -04:00
Alinson Xavier
47e279b3b3 Update SharedPreferencesStorage 2017-07-23 20:14:12 -04:00
Alinson Xavier
60c62b8609 Temporarily disable proguard 2017-07-23 13:50:33 -04:00
Alinson Xavier
e5bc06c138 Increase time limit 2017-07-23 13:37:49 -04:00
Alinson Xavier
89400e281e Move version numbers from build.gradle to gradle.properties 2017-07-23 10:03:09 -04:00
Alinson Xavier
57dc19550d Fix errors 2017-07-22 20:05:01 -04:00
Alinson Xavier
a8aa6f192c Replace Long by Timestamp 2017-07-22 16:29:08 -04:00
Alinson Xavier
882ddba324 Fix acceptance tests 2017-07-22 09:28:30 -04:00
Alinson Xavier
2f7509b94e Update test images (KitKat) 2017-07-21 19:31:37 -04:00
Alinson Xavier
a5720e8d7f BaseViewTest: increase tolerance 2017-07-21 19:30:46 -04:00
Alinson Xavier
c7aaa98935 Convert widget providers to Kotlin 2017-07-21 18:32:13 -04:00
Alinson Xavier
efcb5710c0 Convert more classes to Kotlin 2017-07-21 18:32:03 -04:00
Alinson Xavier
3783fd8506 Convert RingtoneManager to Kotlin 2017-07-21 18:31:49 -04:00
Alinson Xavier
6f80a9c030 Convert intents and notifications to Kotlin 2017-07-21 18:17:42 -04:00
Alinson Xavier
a02376497a Convert automation and database packages to Kotlin 2017-07-21 18:17:28 -04:00
Alinson Xavier
180c18f6bf Merge branch 'feature/kotlin' into dev 2017-07-21 18:12:45 -04:00
Alinson Xavier
2db4c06fe8 Merge branch 'master' into dev 
# Conflicts:
#	app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
#	app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
#	app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
#	uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
#	uhabits-android/src/main/res/values-id/strings.xml
#	uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
 2017-07-18 22:54:52 -04:00
Alinson Xavier
122b300c50 Update view test images (KitKat) 2017-07-18 16:10:41 -04:00
Jude Ibe (Toochukwu)
02f9660fda Socket.io depreciated function 
Kept socket.io to previous version in gradle.
 2017-07-14 10:20:51 -05:00
Alinson Xavier
bb282da92d Fix tests 2017-06-23 16:25:25 -04:00
Alinson Xavier
8ccada67d6 Import Loop DB without app restart 2017-06-23 10:24:54 -04:00
Alinson Xavier
5d9563b9d8 Fix handling of null values in AndroidDatabase 2017-06-23 09:14:36 -04:00
Alinson Xavier
ea640a8a17 Rebuild order after removing habit 2017-06-22 22:50:27 -04:00
Alinson Xavier
6801d1d1ae Add more constraints on table Repetitions 2017-06-21 13:18:29 -04:00
Alinson Xavier
1069fcfc62 Move importers to uhabits-core 2017-06-21 00:30:32 -04:00
Alinson Xavier
59745fb90f Refactor Android database classes 2017-06-20 22:37:35 -04:00
Alinson Xavier
1976160ae8 Move tests to uhabits-core 2017-06-20 22:20:46 -04:00
Alinson Xavier
6dd7e49112 Move database migrations to uhabits-core 2017-06-20 21:46:30 -04:00
Alinson Xavier
ecb5352134 Implement JDBC database 2017-06-20 14:13:37 -04:00
Alinson Xavier
b96385c4a7 Move models.sqlite to uhabits-core 2017-06-20 12:50:57 -04:00
Alinson Xavier
96c1a046d4 Merge branch 'feature/raw-sqlite' into dev 2017-06-20 10:43:04 -04:00
Alinson Xavier
00660d3e36 Make filtered MemoryHabitLists update automatically 2017-06-20 10:34:21 -04:00
PrototypeNM1
b14ca5c625 Don't list archived Habits when creating Widgets. (#309) 
Fixes #283
 2017-06-20 06:07:15 -04:00
Alinson Xavier
71fe6137be Remove old database migrations; add missing ones 2017-06-19 12:08:06 -04:00
Alinson Xavier
0a5d565030 Remove dependency: ActiveAndroid 2017-06-19 11:12:31 -04:00
Alinson Xavier
6d06e06840 Simplify SQLite lists 2017-06-19 09:23:40 -04:00
Alinson Xavier
edeba897fb Implement SQLiteRepository 2017-06-19 09:22:48 -04:00
Alinson Xavier
af7c4e227d Fix merge 2017-06-10 19:34:44 -04:00
Alinson Xavier
96ab887545 Merge tag 'v1.7.5' into dev 
1.7.5
 2017-06-10 18:59:28 -04:00
Alinson Xavier
f8a9da59dd Simplify ListHabitsActivity 2017-06-05 22:56:08 -04:00
Alinson Xavier
50a6c6d9dd Remove unused code 2017-06-05 18:11:30 -04:00
Alinson Xavier
8d181a6683 Simplify ShowHabitActivity 2017-06-05 18:01:13 -04:00
Alinson Xavier
217516ad59 Create android-pickers module 2017-06-05 16:38:58 -04:00
Alinson Xavier
fc4b610d59 Create android-base module 2017-06-05 15:58:42 -04:00
Alinson Xavier
382b52e5b2 Merge tag 'v1.7.4' into dev 
1.7.4

# Conflicts:
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
 2017-06-05 09:20:47 -04:00
Alinson Xavier
277738f94d Fix default color and failing tests 2017-06-04 13:14:45 -04:00
Alinson Xavier
cf25229fbc Merge branch 'dev' into pull/austil 2017-06-04 12:59:15 -04:00
Alinson Xavier
74e0dcf706 Disable PebbleReceiver tests on KitKat 2017-06-04 12:46:16 -04:00
Alinson Xavier
4e1cc6dc80 Fix tests for KitKat 2017-06-04 12:21:29 -04:00
Alinson Xavier
c34f9f9e9f Merge branch 'dev' of https://github.com/austil/uhabits into pull/austil 2017-06-04 11:30:10 -04:00
Alinson Xavier
ed9066f393 Implement alternative checkmark algorithm 
Fix failing tests
 2017-06-04 10:58:00 -04:00
Alinson Xavier
96e1771c25 Remove inferred tables from SQLite database 2017-06-03 10:51:17 -04:00
Alinson Xavier
6875fc0428 Move notifications and reminders to uhabits-core 2017-06-02 19:30:39 -04:00
Alinson Xavier
b88b3a683d Move preferences to uhabits-core 2017-06-02 18:24:12 -04:00
Alinson Xavier
d97f94075d Implement widget test 2017-06-02 15:25:24 -04:00
Alinson Xavier
28f095e56a Implement additional UI tests 2017-06-02 14:45:06 -04:00
Alinson Xavier
ead87519b1 UI tests: reset state programmatically 2017-06-02 13:16:15 -04:00
Alinson Xavier
7cfe3355e4 Downgrade Mockito to 1.0 on AndroidTest 2017-06-01 21:55:13 -04:00
Alinson Xavier
a51ecaaf24 Annotate all Android tests 2017-06-01 21:55:13 -04:00
Alinson Xavier
5eb63df633 Merge branch 'modules' into dev 2017-05-31 21:17:28 -04:00
Alinson Xavier
e4b5a3ea45 Implement acceptance tests for some basic features 2017-05-31 18:24:22 -04:00
Alinson Xavier
88c1e73720 Merge tag 'v1.7.3' into dev 
1.7.3
 2017-05-30 11:11:42 -04:00
Alinson Xavier
6ccfb53329 Add missing tests for RepetitionList and Habit 2017-05-30 08:19:28 -04:00
Alinson Xavier
8a29fbf07d Merge branch 'hotfix/1.7.3' into modules 
# Conflicts:
#	uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
#	uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
 2017-05-29 22:55:08 -04:00
Alinson Xavier
745d07024c Remove unused permissions 2017-05-29 08:37:49 -04:00
Alinson Xavier
94025c5262 Add test for BundleSavedState 2017-05-28 22:26:36 -04:00
Alinson Xavier
ab09eb8a03 Update CI build script 2017-05-28 17:04:04 -04:00
Alinson Xavier
e826c80ff2 Fix Android tests 2017-05-28 15:26:28 -04:00
Alinson Xavier
6255fe2d12 Make generated classes work on Android Studio 2017-05-28 11:39:07 -04:00
Alinson Xavier
1746920699 Rename uhabits-core package 2017-05-28 11:38:20 -04:00
Alinson Xavier
c9b62669de Merge branch 'dev' into modules 2017-05-28 09:44:55 -04:00
Alinson Xavier
56c5fb6c9d Write missing tests 2017-05-27 22:46:33 -04:00
Alinson Xavier
d8d4c4f55e Write tests for ListHabits behaviors 2017-05-27 20:33:30 -04:00
Alinson Xavier
70423ddb0a Move ListHabits controllers to uhabits-core 2017-05-27 18:52:06 -04:00
Alinson Xavier
94c70485b7 Remove unit tests for uhabits-android 2017-05-27 10:31:05 -04:00
Alinson Xavier
3e558be4d4 Move ListHabitsBehavior to uhabits-core 2017-05-26 22:04:59 -04:00
Alinson Xavier
fa4944700c Move UI behavior to uhabits-core 2017-05-26 16:33:21 -04:00
Alinson Xavier
df0cf57984 Move tests to androidTest 2017-05-25 18:41:59 -04:00
Alinson Xavier
29d1de46e7 Reorganize tests 2017-05-25 15:59:03 -04:00
Alinson Xavier
cb4ab3b436 Move ExportCSVTask to uhabits-core 2017-05-25 12:50:38 -04:00
Alinson Xavier
370e7343d7 Move commands to uhabits-core 2017-05-25 10:00:56 -04:00
Alinson Xavier
acd653db70 Create org.isoron.androidbase package 2017-05-25 09:31:54 -04:00
Alinson Xavier
51ca4aa98e Move remaining model classes 2017-05-25 08:54:21 -04:00
Alinson Xavier
d23b59ced2 Move some models 2017-05-25 08:24:22 -04:00
Alinson Xavier
f18ac9db48 Create module uhabits-core 2017-05-25 08:16:55 -04:00
Alinson Xavier
c20ca3921f Rename android module to uhabits-android 2017-05-25 08:00:00 -04:00