Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merging branch 'new_main' into 'master' #1

Open
wants to merge 175 commits into
base: master
Choose a base branch
from
Open

Merging branch 'new_main' into 'master' #1

wants to merge 175 commits into from

Conversation

jpers001
Copy link
Owner

No description provided.

jdepalma and others added 30 commits February 13, 2019 23:52
Camera functionality (WIP) + modified Manifest (allow camera)
9acb911
Fixed broken manifest. My bad. App will run now.
0bdc359
@thoan001
setting FoundReport's parent in manifest
822362e
Updating Main GUI
1d2e895
@thoan001
Changing relativeLayout > constraintLayout
02e8fb0
@thoan001
Having FoundReportActivity extend AppCompatActivity
4d8384b
@thoan001
Having LostReportActivity extend AppCompatActivity
fbf956e
@jpers001
Adding topnav to Report Map
a4b1f9c
@jpers001
Merge remote-tracking branch 'origin/new_main' into new_main
93459e2
@thoan001
Changing titles to found and lost pages, setting parents in Manifest
7484628
camera function
012a93c
Merge remote-tracking branch 'origin/new_main' into new_main
ef67f3c
@jpers001
Updating Main GUI
7b6b8c6
Added Camera request
cf5b765
Merge remote-tracking branch 'origin/new_main' into new_main
e1159ab
@thoan001
Changing titles to found and lost pages, setting parents in Manifest
df42486
@thoan001
Updated activity_found_report with basic fields
00d4992
Camera working. Manifest needs fixing. Only camera or rest of app works.
8935151
@jpers001
Adding custom InfoWindow code and a sample lost report
6695f47
Updating GUI for Found and Lost report.
3188238
@thoan001
Allowing FoundReportActivity to put data into an ArrayList
b3ac263
@thoan001
Creating new class 'ReportData'
5e9803e
@jpers001
Adding misc.xml, .idea/, and build_file_checksums.ser to .gitignore
c2271e9
@jpers001
All buttons should (sorta) work now
468c96c
@jpers001
Commenting out code that caused map to crash
6a637c5
@thoan001
FoundReportActivity small changes to buttons
33124e4
@jpers001
Adding more stuff to gitignore
eee26b6
@jpers001
Merge remote-tracking branch 'origin/new_main' into new_main
9e067e1
@jpers001
Deleting .idea folder and adding more gitignore
3bc0174
@jpers001
Deleting more .idea files
d89f6a0
thoan001 and others added 30 commits April 15, 2019 18:24
@thoan001
Allowing tags to push to database
9704ccb
Complete overhaul of login and registration page =D
b13be71
Merge remote-tracking branch 'origin/new_main' into new_main
f641580
put in working skip...
f8522d2
Fixed login issue (it was php)
98fea32
Adding php stuff
ec6deef
@jpers001
Scaling bitmaps to 600x600 before sending to database
e9da0bf
@jpers001
Scaling bitmap to 600x600, compressing to 25% on both report types
c4dde3e
Added username to Lost Report
8634720
@jpers001
Changing color of buttons and text.
ac0d35c
@thoan001
Adding dependency and updating theme
70a344b
@thoan001
Merge remote-tracking branch 'origin/new_main' into new_main
03498c9
@thoan001
Fixing dependencies
4b35745
@jpers001
Add Mascot to Login Activity and Register Activity. Fixed Interface f…
04f1b03 
…or Lost and Found report (Land)
Merge remote-tracking branch 'origin/new_main' into new_main
ae4fef4
Added terms and priv policy link on login page.
a61fcc1
@thoan001
FINALLY implementing ChipGroup (holder for Chips) and updating depend…
d5c69e0 
…encies
@jpers001
Fixing LostReportActivity error in getting the location string
75b51c4
@jpers001
Getting and displaying tags from JSON
30ca68c
@thoan001
Allowing tags to show up as "Chips" on Found and Lost reports, and de…
eb6fce4 
…fining chip layout
@jpers001
Changing map markers to circular images of the user submitted image
28ea8f7
@thoan001
Modifying chip colors to match theme
4ed063b
@thoan001
Replacing camera ImgButton with a FloatingActionButton, and re-adjust…
bd0c071 
…ing found and lost report layouts to better scale with different types of phones
@thoan001
Removing skip button and moving code for RegisterActivity titlebar fu…
91a2490 
…rther down
@thoan001
Adding tags to report confirmation and setting tag input to max of 30…
ff1fe4d 
… characters
@thoan001
Allowing Go/Send on keyboard to login, register, and add tags
206ef8b
@jpers001
Map defaults to ODU instead of Africa on first open now
f1845bb
@thoan001
Having tag strings created in Found/Lost report be initialized if empty
40dafde
@jpers001
Fixing zoom when clicking on a map marker while zoomed in
5576f2a
@thoan001
Adding checkbox for terms of use on RegisterActivity
7b777f6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jpers001 @thoan001