60e630e813
Update app.iml
...
Not sure what the rationale is, but Android Studio wanted to make these
changes.
2015-11-18 13:07:02 -05:00
1848f9e003
Rename project .iml file
...
I didn't do this - Android Studio did. But it looks like it makes
sense.
2015-11-18 13:07:02 -05:00
e669351edc
Remove .idea directory from version control
...
The consensus seems to be (among everyone but Jetbrains, that is) that
you shouldn't track .idea in version control. I agree with this since
I've never been a fan of having to check out piles of IDE turds with my
code.
2015-11-16 20:51:24 -05:00
b798154305
Move AffdexMe files up to root
...
This should make it easier to check out the project in Android Studio
and have it be able to build. Having the project files in the AffdexMe
subdirectory seems to confuse Studio.
2015-11-16 14:10:32 -05:00
b65dfe7732
Clean up README
2015-11-16 13:08:00 -05:00
b1b942796d
Merge branch 'master' of https://github.com/Affectiva/affdexme-android
...
Conflicts:
AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java
2015-10-01 21:20:00 -04:00
11408d5a70
Merge branch 'master' into two_oh_one
...
Conflicts:
AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java
AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java
AffdexMe/app/src/main/res/drawable/camera_button_selector.xml
AffdexMe/app/src/main/res/drawable/settings_button_selector.xml
2015-10-01 21:12:00 -04:00
3a58875603
Merge pull request #5 from joneswah/master
...
improved instructions on adding the Affectiva SDK
2015-09-24 02:29:07 -04:00
e6c51cf0a2
improved instructions on adding the Affectiva SDK
2015-09-24 10:08:24 +10:00
1b984f57dc
Merge pull request #4 from Affectiva/minor_fixes
...
Cosmic fixes
2015-09-13 22:16:39 -04:00
5a02ecbe93
Remove bad class docs
2015-09-11 21:24:42 +02:00
dc4f73aee4
Change copyrights year
2015-09-11 21:24:42 +02:00
84dd7c8c68
Make gradlew excutable
2015-09-11 21:24:42 +02:00
4177049b06
Organize imports
2015-09-11 21:24:42 +02:00
f8e9ac906f
Change application version number
2015-09-11 21:02:09 +02:00
99baa6cbef
Merge pull request #3 from Affectiva/affdex_2.0_release
...
Publish AffdexMe 2.0
2015-09-11 20:19:05 +02:00
29c0f78773
Add the new affdexme
2015-09-10 13:30:10 -04:00
76bd712d3e
Merge pull request #2 from Affectiva/ct_pack_update
...
Ct pack update
2015-09-03 17:39:18 -04:00
5faffd33dd
Merge pull request #1 from Affectiva/master
...
Merge CT pack update
2015-09-03 17:37:04 -04:00
176c013d91
Removed some build artifacts from git repository
2015-08-28 15:30:57 -04:00
4e133a4bbd
Updated resources to be public-facing
2015-08-28 15:29:40 -04:00
9f671912e3
Updated resources to be public-facing
2015-08-28 15:26:27 -04:00
da604e5c55
Updated AffdexMe to contain public-facing resource files
2015-08-28 15:22:46 -04:00
f7a49be692
Added new image resource files
2015-08-28 15:17:40 -04:00
9d71cf0b5e
Added image files for UI update and removed unused ones
2015-08-28 15:10:43 -04:00
f43d0de100
Revert "-First commit implementing new classifiers"
...
This reverts commit 35d15089b8
2015-08-27 13:15:07 -04:00
44253cf560
Revert "Modified AffdexMe to use new 2.0 SDK"
...
This reverts commit 96f9d55ebe
2015-08-27 13:14:40 -04:00
3180d67c77
Revert "Made changes for AffdexMe to work with SDK v2.01"
...
This reverts commit 301ba88795
2015-08-27 13:14:17 -04:00
d27ec7e560
Revert "Commented out method to allow AffdexMe to use v2.01"
...
This reverts commit 7081e7fbea
2015-08-27 13:13:43 -04:00
7081e7fbea
Commented out method to allow AffdexMe to use v2.01
2015-08-27 13:05:53 -04:00
301ba88795
Made changes for AffdexMe to work with SDK v2.01
2015-08-27 12:07:37 -04:00
96f9d55ebe
Modified AffdexMe to use new 2.0 SDK
2015-08-20 11:24:17 -04:00
35d15089b8
-First commit implementing new classifiers
2015-07-20 15:53:09 -04:00
734b05c326
Updated project to reflect new capabilities of 1.2 SDK release
2015-07-13 14:17:57 -04:00
5c3be3a9dd
-edit README.md
...
-specify that project is designed to open with Android Studio
2015-06-23 16:47:47 -04:00
b27245ea6a
-upload AffdexMe folder to GitHub
...
-upload the AffdexMe project folder and corresponding README.md file
2015-06-23 16:44:24 -04:00
082a13f0c0
Initial commit
2015-06-23 11:15:27 -04:00
toby cabot