search

ucsdCSE110wi16 / CSE110M260T15

2 stars 0 forks source link

Inventory item list, detail and creation features complete. #18

Closed Jlsmith10 closed 8 years ago

Jlsmith10 commented 8 years ago

No conflicts.

isaacd9 commented 8 years ago

Is there a reason we're modifying the .idea directory so heavily?

LeoWW commented 8 years ago

Looks fine, will need to change activities into fragments. Note: Should only put feature-related commits in future pull requests (i.e. don't mix espresso commits with inventoryitem commits)

isaacd9 commented 8 years ago

Any chance we can rebase this down, just for readability? I doubt there are really 53 discrete pieces of work here.

Other than that :+1:

isaacd9 commented 8 years ago

What is the status on this? Is the plan to merge? I'm blocked on push stuff by this and was hoping to work on it this evening/tmw...

Satre95 commented 8 years ago

@isaacd9 I'm going to merge this stuff first thing tomorrow morning.