Commit Graph

34 Commits

Author SHA1 Message Date
Rishab Kulkarni eaf3448aeb Fixes #3 2021-06-27 19:32:49 +05:30
rishab bd7384cb39 Merge remote-tracking branch 'origin/master' 2020-04-02 21:27:33 +05:30
rishab b027fe81a8 Added sliding tile puzzle game 2020-04-02 21:27:06 +05:30
Priyatham f87213ff8b removing conflicts 2020-03-30 12:41:34 +05:30
Priyatham 680df4b109 Merge branch 'tmp'
# Conflicts:
#	app/src/main/java/com/example/alzapp/QuizQuestionPage.java
#	app/src/main/java/com/example/alzapp/TileMatchingActivity.java
#	app/src/main/res/layout/activity_tile_matching.xml
2020-03-29 14:29:27 +05:30
Priyatham f73d94b0ec Merge remote-tracking branch 'origin/master' 2020-03-27 23:36:09 +05:30
Priyatham 33a8321fb2 passing tile time to DB 2020-03-27 23:35:46 +05:30
rishab 26ce59d117 Quiz completed
Added timer in tile matching
2020-03-27 19:56:51 +05:30
Priyatham a36bfccb24 passing tile time to DB 2020-03-25 23:42:51 +05:30
rishab 11f732361d Quiz part completed 50% 2020-03-25 21:51:21 +05:30
rishab 5079b5e3ae Quiz part completed 50% 2020-03-24 20:34:21 +05:30
rishab 7a2ef373b1 Quiz part completed 50% 2020-03-24 18:52:18 +05:30
Priyatham ac219546ab new Activity (QuickQuizStart) as replacement for QuickStartingPage. 2020-03-24 15:25:03 +05:30
Priyatham 719290f134 activities(QuickStartingPage and QuickQuestionPage) addition to android manifest 2020-03-24 15:08:27 +05:30
rishab ef069a7030 Added quiz 2020-03-24 14:56:31 +05:30
Priyatham 5614a44517 passing jumble times to db 2020-03-24 14:54:59 +05:30
Priyatham 44dd18e0e7 passing username 2020-03-24 14:25:09 +05:30
Priyatham 451e9326b5 passing elapsedMillis 2020-03-23 21:06:51 +05:30
Priyatham 9cbaf5148e time calculation in jumble 2020-03-21 23:10:33 +05:30
Priyatham d5971cf24a age calc 2020-03-20 11:03:27 +05:30
Priyatham 13517af628 age calc 2020-03-19 23:26:10 +05:30
Priyatham 31e70bf8d5 gender addition 2020-03-17 17:36:25 +05:30
rishab 2b4dc9e3c2 Added survey 2020-03-17 14:03:00 +05:30
rishab 642cff7f1b Added survey 2020-03-17 13:42:00 +05:30
rishab f8f5928fa7 Added survey 2020-03-17 13:20:59 +05:30
rishab 99ff66bdcf Made changes 2020-03-16 22:20:01 +05:30
Priyatham 031dc9c42a Merge remote-tracking branch 'origin/master' 2020-03-16 20:57:33 +05:30
Priyatham 6e2a769e29 encreption 2020-03-16 20:57:07 +05:30
rishab 5d77010c4b Made changes 2020-03-16 20:53:50 +05:30
Priyatham a046314f94 test 2020-03-16 19:56:11 +05:30
rishab 0934a9f1ad Made changes in documentation 2020-03-16 19:46:35 +05:30
Priyatham 07de13c552 successful login-reg using web server 2020-03-16 19:25:33 +05:30
Priyatham 614ba6a192 Authors Documentation 2020-02-15 21:31:09 +05:30
Priyatham 5a9167c74a Authors Documentation 2020-02-02 20:26:09 +05:30