Commit graph

50 commits

Author SHA1 Message Date
b5188c4370
Create LICENSE 2023-06-30 12:43:24 -07:00
4cca1877eb
Add files via upload 2022-04-30 12:20:33 +05:30
Rishab Kulkarni
eaf3448aeb Fixes #3 2021-06-27 19:32:49 +05:30
25e5343cf5
Create License.md 2020-09-06 22:36:37 +05:30
e5e15fbd9d
Merge pull request #2 from Priyatham-sai-chand/revert-1-add-license-1
Revert "Create LICENSE"
2020-09-06 22:35:56 +05:30
0578eaa12c
Revert "Create LICENSE" 2020-09-06 22:35:45 +05:30
31bd0fb289
Merge pull request #1 from Priyatham-sai-chand/add-license-1
Create LICENSE
2020-09-06 22:34:40 +05:30
822507799d
Create LICENSE 2020-09-06 22:34:20 +05:30
194caeec65
Update README.md 2020-09-06 22:29:48 +05:30
55fef9088b
Add files via upload 2020-09-06 21:54:05 +05:30
c6962f2ab8
Add files via upload
adding screenshots and beautification of readme
2020-09-06 21:34:35 +05:30
f8e56a0014
Update README.md 2020-08-12 14:24:24 +05:30
05a8af42f7
Adding server side files 2020-08-12 10:26:59 +05:30
dd42e94c80
Create README.md 2020-08-08 21:05:52 +05:30
e67fe56550
Delete world-happiness-report-2019.csv 2020-05-20 11:47:42 +05:30
a2dd461898
Add files via upload 2020-05-09 16:44:18 +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
f87213ff8b removing conflicts 2020-03-30 12:41:34 +05:30
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
f73d94b0ec Merge remote-tracking branch 'origin/master' 2020-03-27 23:36:09 +05:30
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
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
ac219546ab new Activity (QuickQuizStart) as replacement for QuickStartingPage. 2020-03-24 15:25:03 +05:30
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
5614a44517 passing jumble times to db 2020-03-24 14:54:59 +05:30
44dd18e0e7 passing username 2020-03-24 14:25:09 +05:30
451e9326b5 passing elapsedMillis 2020-03-23 21:06:51 +05:30
9cbaf5148e time calculation in jumble 2020-03-21 23:10:33 +05:30
d5971cf24a age calc 2020-03-20 11:03:27 +05:30
13517af628 age calc 2020-03-19 23:26:10 +05:30
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
031dc9c42a Merge remote-tracking branch 'origin/master' 2020-03-16 20:57:33 +05:30
6e2a769e29 encreption 2020-03-16 20:57:07 +05:30
rishab
5d77010c4b Made changes 2020-03-16 20:53:50 +05:30
a046314f94 test 2020-03-16 19:56:11 +05:30
rishab
0934a9f1ad Made changes in documentation 2020-03-16 19:46:35 +05:30
07de13c552 successful login-reg using web server 2020-03-16 19:25:33 +05:30
614ba6a192 Authors Documentation 2020-02-15 21:31:09 +05:30
5a9167c74a Authors Documentation 2020-02-02 20:26:09 +05:30
c4335a7401 The Project Dump 2020-02-01 22:48:23 +05:30