Skip to content

Getting changes from master - #71

Open
murphy46 wants to merge 211 commits into
RyansBranchfrom
master
Open

Getting changes from master#71
murphy46 wants to merge 211 commits into
RyansBranchfrom
master

Conversation

@murphy46

@murphy46 murphy46 commented Dec 12, 2013

Copy link
Copy Markdown
Contributor

Keep receiving errors on local github so starting fresh.

wmacfarlane and others added 30 commits October 17, 2013 16:58
@wmacfarlane
Merge branch 'master' into WillsBranch
7502482
@wmacfarlane
Merge branch 'master' into WillsBranch
48d7814
@cmamatey
updated php scripts
e33e94d
@wmacfarlane
Merge branch 'master' into WillsBranch
341e456
@salty-xiv
Merge remote-tracking branch 'origin/master' into Huys_Branch
6e51563
@cmamatey
Select * From Account script
442f5d8 
Note lines 11 and 13 gather credentials from a separate config file
online
@milnetii
Merge branch 'master' into ChaseBranch
3753c84 
	new file:   .metadata/.lock
	new file:   .metadata/.log
	new file:   .metadata/.plugins/org.eclipse.cdt.core/.log
	new file:   .metadata/.plugins/org.eclipse.cdt.make.core/specs.c
	new file:   .metadata/.plugins/org.eclipse.cdt.make.core/specs.cpp
	new file:   .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
	new file:   .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	new file:   .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
	new file:   .metadata/.plugins/org.eclipse.core.resources/.root/2.tree
	new file:   .metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.ui.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
	new file:   .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.ui.prefs
	new file:   .metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	new file:   .metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	new file:   .metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache
	new file:   .metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt
	new file:   .metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	new file:   .metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	new file:   .metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	new file:   .metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	new file:   .metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	new file:   .metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	new file:   .metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	new file:   .metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	new file:   .metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	new file:   .metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	new file:   .metadata/.plugins/org.eclipse.wst.sse.ui/dialog_settings.xml
	new file:   .metadata/.plugins/org.eclipse.wst.xml.core/default_catalog.xml
	new file:   .metadata/.plugins/org.eclipse.wst.xml.core/system_catalog.xml
	new file:   .metadata/version.ini
	new file:   PayBack/.metadata/.lock
	new file:   PayBack/.metadata/.log
	new file:   PayBack/.metadata/.plugins/org.eclipse.cdt.core/.log
	new file:   PayBack/.metadata/.plugins/org.eclipse.cdt.make.core/specs.c
	new file:   PayBack/.metadata/.plugins/org.eclipse.cdt.make.core/specs.cpp
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.ui.prefs
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	new file:   PayBack/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
	new file:   PayBack/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	new file:   PayBack/.metadata/.plugins/org.eclipse.egit.ui/dialog_settings.xml
	new file:   PayBack/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache
	new file:   PayBack/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	new file:   PayBack/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	new file:   PayBack/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	new file:   PayBack/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	new file:   PayBack/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	new file:   PayBack/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	new file:   PayBack/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	new file:   PayBack/.metadata/version.ini
	modified:   PayBack/AndroidManifest.xml
	new file:   PayBack/Icon.png
	new file:   PayBack/PayBack - CEN3031 Scrum.xlsx
	modified:   PayBack/payback-web.png
	modified:   PayBack/project.properties
	modified:   PayBack/res/drawable-hdpi/payback.png
	renamed:    PayBack/res/drawable-hdpi/payback.png -> PayBack/res/drawable-hdpi/payback2.png
	modified:   PayBack/res/drawable-mdpi/payback.png
	renamed:    PayBack/res/drawable-mdpi/payback.png -> PayBack/res/drawable-mdpi/payback2.png
	modified:   PayBack/res/drawable-xhdpi/payback.png
	renamed:    PayBack/res/drawable-xhdpi/payback.png -> PayBack/res/drawable-xhdpi/payback2.png
	modified:   PayBack/res/drawable-xxhdpi/payback.png
	renamed:    PayBack/res/drawable-xxhdpi/payback.png -> PayBack/res/drawable-xxhdpi/payback2.png
	modified:   PayBack/res/layout/activity_contact.xml
	modified:   PayBack/res/layout/activity_create_account.xml
	modified:   PayBack/res/layout/activity_login.xml
	modified:   PayBack/res/layout/activity_main.xml
	modified:   PayBack/res/layout/activity_settings.xml
	new file:   PayBack/res/layout/activity_shortcuts.xml
	modified:   PayBack/res/layout/activity_statistic.xml
	modified:   PayBack/res/layout/activity_transaction1.xml
	modified:   PayBack/res/layout/activity_transaction2_expandablecontactlist_main.xml
	modified:   PayBack/res/layout/activity_transaction3.xml
	modified:   PayBack/res/layout/activity_transaction4.xml
	modified:   PayBack/res/layout/activity_transaction4_listviewitem.xml
	modified:   PayBack/res/layout/activity_transaction5.xml
	new file:   PayBack/res/layout/custom_title_bar.xml
	renamed:    PayBack/res/layout/dialog_confirm_contact.xml -> PayBack/res/layout/dialog_user_info.xml
	new file:   PayBack/res/menu/login_activitytest.xml
	new file:   PayBack/res/menu/shortcuts.xml
	new file:   PayBack/res/menu/title.xml
	new file:   PayBack/res/values/arrays.xml
	modified:   PayBack/res/values/strings.xml
	modified:   PayBack/res/values/strings_activity_login.xml
	modified:   PayBack/res/values/styles.xml
	new file:   PayBack/src/com/example/payback/AccessNet.java
	modified:   PayBack/src/com/example/payback/ContactActivity.java
	modified:   PayBack/src/com/example/payback/CreateAccountActivity.java
	new file:   PayBack/src/com/example/payback/CreateAccountActivitycopu.java
	modified:   PayBack/src/com/example/payback/LoginActivity.java
	modified:   PayBack/src/com/example/payback/MainActivity.java
	modified:   PayBack/src/com/example/payback/ManageGroupActivity.java
	modified:   PayBack/src/com/example/payback/NotificationActivity.java
	modified:   PayBack/src/com/example/payback/ResolveTransactionActivity.java
	modified:   PayBack/src/com/example/payback/SettingsActivity.java
	new file:   PayBack/src/com/example/payback/ShortcutsActivity.java
	modified:   PayBack/src/com/example/payback/StatisticActivity.java
	new file:   PayBack/src/com/example/payback/TitleActivity.java
	new file:   PayBack/src/com/example/payback/TitleBar.java
	modified:   PayBack/src/com/example/payback/Transaction1Activity.java
	modified:   PayBack/src/com/example/payback/Transaction2Activity.java
	modified:   PayBack/src/com/example/payback/Transaction2Activity_expandablecontactlist_adapter.java
	modified:   PayBack/src/com/example/payback/Transaction3Activity.java
	modified:   PayBack/src/com/example/payback/Transaction4Activity.java
	new file:   PayBack/src/com/example/payback/Transaction4_listview_adapter.java
	modified:   PayBack/src/com/example/payback/Transaction5Activity.java
	modified:   PayBack/src/com/example/payback/User.java
	modified:   PayBackDB/PHP/AccountLookup1var.php
	new file:   PayBackScrum2Presentation.pptx
@milneti
Merge pull request #46 from milneti/master
67ea1fb 
Update Local Branch
oepstein
First implementation of dialogs in settings page
d467de9
@wmacfarlane
Merge branch 'master' into WillsBranch
22fca6a
@agarwalarnav
Merge pull request #50 from milneti/master
2449af8 
Update Local Branch
@vtquan
Add achartengine library
719c653
@vtquan
Add LineGraph class
4c87d42
@vtquan
Add BarGraph class
b3bcabc 
extend LineGraph with function to create a custom line graph
@vtquan
Add PieGraph class
3f080ec
@vtquan
Add ScatterGraph class
144a77b
@vtquan
Add getTestView to LineGraph class
734ea2c 
View allows you to open the chart in the current activity
@cmamatey
Merge pull request #51 from milneti/master
1898f06 
Update ChaseBranch from latest master 11/13
@wmacfarlane
Merge branch 'master' into WillsBranch
059b544
oepstein
Update scrum doc
91e7752
oepstein
Forcing app to stay in portrait orientation
cd08106
@salty-xiv
Merge remote-tracking branch 'origin/master' into Huys_Branch
11f2985
@vtquan
add fields for total payables and receivables
9fd011f
@HJeon139
This one is ready to go
151288f
@HJeon139
made corrections
b76dfe9
@wmacfarlane
Added Notifications, global User variable
0093e50 
The global user variable can be found in TitleActivity, which is a
class that every other activity extends. It's updated upon login.
@HJeon139
UPDATED
05b0576
@murphy46
TransactionCreation.php
62bcf3a
@cmamatey
Merge pull request #52 from milneti/master
28f94e7 
Pulling team's latest php scripts
@cmamatey
updated multiple php scripts
b92e3eb 
old_db_transaction_create.php is deprecated and will not be used.
vtquan and others added 30 commits December 12, 2013 22:04
@vtquan
implement total payable/receivable functions
517ad1d
@vtquan
bug fix
d54396e
@vtquan
Merge pull request #76 from milneti/master
a6c0612 
Getting changes from master
@vtquan
add get/set function for resolved in Transaction
5d33c08
@HJeon139
ignore
414aaae
@HJeon139
Revert "ignore"
ccd2ce3 
This reverts commit 414aaae.
@vtquan
bug fix
b20d5f1
@vtquan
replace dummy data with actual data
a857e18
@vtquan
bug fix
e6f5fce
@vtquan
Merge pull request #77 from milneti/ViquocBranch
dee2156 
Viquoc branch
@wmacfarlane
Notification Overhaul
2a743bb 
Users may now differentiate between read and unread notifications.
Additionally, notifications may now be deleted. I was unable to
implement the proper server calls and I encourage anyone interested to
find the //TODO spots in NotificationActivity.java and add them.
@milnetii
Merge branch 'master' into WillsBranch
b96a255 
	modified:   PayBack/res/layout/activity_contact.xml
	modified:   PayBack/res/layout/activity_main.xml
	modified:   PayBack/res/layout/activity_settings.xml
	modified:   PayBack/res/layout/activity_statistic.xml
	new file:   PayBack/res/layout/textview.xml
	modified:   PayBack/src/com/example/payback/AccessNet.java
	modified:   PayBack/src/com/example/payback/ContactActivity.java
	modified:   PayBack/src/com/example/payback/LoginActivity.java
	modified:   PayBack/src/com/example/payback/MainActivity.java
	modified:   PayBack/src/com/example/payback/NotificationActivity.java
	modified:   PayBack/src/com/example/payback/StatisticActivity.java
	modified:   PayBack/src/com/example/payback/TitleActivity.java
	modified:   PayBack/src/com/example/payback/Transaction.java
	modified:   PayBack/src/com/example/payback/Transaction1Activity.java
	modified:   PayBack/src/com/example/payback/Transaction2Activity.java
	modified:   PayBack/src/com/example/payback/Transaction3Activity.java
	modified:   PayBack/src/com/example/payback/Transaction4Activity.java
	modified:   PayBack/src/com/example/payback/Transaction5Activity.java
	modified:   PayBack/src/com/example/payback/User.java
@milneti
Merge pull request #79 from milneti/WillsBranch
83c5af2 
push notifs
@milnetii
comments
d39fdb6
@wmacfarlane
Slight Fixes
4c2467c
@wmacfarlane
Merge branch 'WillsBranch'
0cc76f5
@salty-xiv
mitigated the low resolution problem
36ca9ac
@wmacfarlane
Added (Server Functionality) AND (Number of Notifications to Main Act…
d6ad458 
…ivity)
@wmacfarlane
Forgot to unset demo
b9c965c
@cmamatey
Merge pull request #80 from milneti/master
e8f82e7 
Pulling latest from master
@cmamatey
Merge pull request #81 from milneti/ChaseBranch
fd425f6 
PHP changes, no effect on Android
@milnetii
lots
20dd910
@milnetii
minor
d110cc1
@cmamatey
More PHP updates
8edbbd6
@cmamatey
Merge pull request #82 from milneti/master
8723d8d 
Pulling latest from master
@cmamatey
Merge branch 'ChaseBranch' of https://github.com/milneti/PayBack into…
3dcf814 
… ChaseBranch
@milnetii
too many things
c8b26c2
@cmamatey
Merge pull request #83 from milneti/master
9269c4d 
Pulling latest from master
@milnetii
the last hoorah
46f6064
@cmamatey
Merge pull request #85 from milneti/ChaseBranch
151a265 
Last PHP updates EVERRR
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.

9 participants

@murphy46 @wmacfarlane @cmamatey @salty-xiv @milnetii @milneti @agarwalarnav @vtquan @HJeon139