Skip to content
This repository has been archived by the owner on Apr 30, 2019. It is now read-only.

Staging #22

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
9a73f5b
Add OpenCV module to application
xNul Nov 9, 2018
4d7ffb2
Add Camera permission and add CameraActivity
xNul Nov 9, 2018
75d3370
Add files via upload
ventusboy Nov 9, 2018
0775d5b
Transferred some app files
ventusboy Nov 9, 2018
fe8d103
Merge remote-tracking branch 'origin/app-frontend' into app-backend
xNul Nov 24, 2018
e56994c
Add OpenCV Canny Camera
xNul Nov 25, 2018
d95d641
Remove ignored files part 1
xNul Nov 25, 2018
6b8e88b
Remove ignored files part 2 DONE
xNul Nov 25, 2018
2462f6a
Merge branch 'master' into app-backend
xNul Nov 25, 2018
016f9ff
Fix a couple compilation bugs
xNul Nov 25, 2018
5b52152
getting started with android and json
ventusboy Nov 30, 2018
6b5c1f1
Increase minimum SDK version
xNul Dec 1, 2018
13a2e3f
Add miscellaneous camera code
xNul Dec 1, 2018
c1c6227
Merge branch 'app-backend' of https://github.com/Bonfire/OptiGrader i…
xNul Dec 1, 2018
b8b2285
Rename camera layout, finalize perspective transform, remove test fla…
xNul Dec 3, 2018
5d55138
Add scantron cropping
xNul Dec 3, 2018
9d59e65
Add circle detection
xNul Dec 3, 2018
ac76a28
comiiting some show json button changes
ventusboy Dec 3, 2018
1778b4f
started getting ready to send the registration data to the server
ventusboy Dec 4, 2018
17f7901
somew weird files
ventusboy Dec 4, 2018
7bbd48d
Merge branch 'app-backend' of https://github.com/Bonfire/OptiGrader i…
ventusboy Dec 4, 2018
d33f5b4
got the ability to send json packets to a server
ventusboy Dec 4, 2018
f2ce821
Update misc.xml
ventusboy Dec 4, 2018
a35d195
Merge branch 'app-backend' of https://github.com/Bonfire/OptiGrader i…
ventusboy Dec 4, 2018
f6ddc40
Clean up code and add comments
xNul Dec 4, 2018
0c348b2
Merge branch 'app-backend' of https://github.com/Bonfire/OptiGrader i…
xNul Dec 4, 2018
1da38d9
Update CameraActivity.java
jpzp Dec 5, 2018
eeaab49
created homepage and login functionality
ventusboy Dec 5, 2018
1222ad5
Merge branch 'app-backend' of https://github.com/Bonfire/OptiGrader i…
ventusboy Dec 5, 2018
220c266
got rid of the json buttons, and adjusted to open cv button
ventusboy Dec 5, 2018
5b68fc2
Update .gitignore
xNul Dec 5, 2018
23cde9c
Update CameraActivity.java
jpzp Dec 5, 2018
4115e44
Merge branch 'app-backend' of https://github.com/Bonfire/OptiGrader i…
jpzp Dec 5, 2018
41e7510
Add answer/question sorting and grouping
xNul Dec 5, 2018
eb616dc
Update CameraActivity.java
jpzp Dec 5, 2018
fc3a236
Revert "Update CameraActivity.java"
jpzp Dec 5, 2018
1a61367
Revert "Revert "Update CameraActivity.java""
jpzp Dec 5, 2018
17eea12
login should work now
ventusboy Dec 5, 2018
8188b2e
Merge branch 'app-backend' of https://github.com/Bonfire/OptiGrader i…
ventusboy Dec 5, 2018
acd2bcd
added some fields to the homepage
ventusboy Dec 5, 2018
ef23ccb
tests are now recieved
ventusboy Dec 5, 2018
bca8848
Update CameraActivity.java
jpzp Dec 5, 2018
b96dd2f
Merge branch 'app-backend' of https://github.com/Bonfire/OptiGrader i…
jpzp Dec 5, 2018
d056724
Update gitignore
Dec 5, 2018
61c7282
Update gitignore
Dec 5, 2018
d71769e
Update gitignore
Dec 5, 2018
660ca65
Merge app-backend
Dec 5, 2018
56f09a8
Aggregate other branches
Dec 5, 2018
0ddd490
Merge branch 'frontend' of github.com:Bonfire/OptiGrader into staging
Dec 5, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
144 changes: 142 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,142 @@
# Ignore the .idea folder
.idea/

# Created by https://www.gitignore.io/api/androidstudio
# Edit at https://www.gitignore.io/?templates=androidstudio

### AndroidStudio ###
# Covers files to be ignored for android development using Android Studio.

# Built application files
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle
.gradle/
build/

# Signing files
.signing/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio
/*/build/
/*/local.properties
/*/out
/*/*/build
/*/*/production
captures/
.navigation/
*.ipr
*~
*.swp

# Android Patch
gen-external-apklibs

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# NDK
obj/

# IntelliJ IDEA
*.iml
*.iws
/out/

# User-specific configurations
.idea/caches/
.idea/libraries/
.idea/shelf/
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
.idea/datasources.xml
.idea/dataSources.ids
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/assetWizardSettings.xml

# OS-specific files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

# Legacy Eclipse project files
.classpath
.project
.cproject
.settings/

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.war
*.ear

# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
hs_err_pid*

## Plugin-specific files:

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Mongo Explorer plugin
.idea/mongoSettings.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### AndroidStudio Patch ###

!/gradle/wrapper/gradle-wrapper.jar

# End of https://www.gitignore.io/api/androidstudio
application/.idea/terminal.xml
application/.idea/runConfigurations.xml
application/.idea/misc.xml
application/.idea/gradle.xml
application/.idea/terminal.xml
application/.idea/terminal.xml
application/app/debug/output.json
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading