Skip to content

push - #79

Merged
10 commits merged into
masterfrom
WillsBranch
Dec 13, 2013
Merged

push#79
10 commits merged into
masterfrom
WillsBranch

Conversation

@ghost

@ghost ghost commented Dec 13, 2013

Copy link
Copy Markdown

No description provided.

wmacfarlane and others added 10 commits October 17, 2013 16:58
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.
	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
ghost pushed a commit that referenced this pull request Dec 13, 2013
@ghost
ghost merged commit 83c5af2 into master Dec 13, 2013
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants