Solvinf conflict problems#2
Merged
danisales merged 44 commits intodanisales:masterfrom Oct 5, 2015
Merged
Conversation
…ded include Controller and GUI 'duplicated residue generator username'. Scenarios changes are at Controller and GUI of 'new valid generator'. Also changed name of 'duplicated residue generator' to 'duplicated residue generator address'
Adicionando Requisição de Coleta
adding the feature
added admin user scenarios
Notification of Waste Collection Confirmation
Adicionando feature e cenários de Login
Adicionando feature para tratar cenários de edição de cadastro.
RequestResidueCollection
I am adding a feature about the collection notice, in which the system resends the notification to the city hall if there are pending requests.
Added and changed Scenarios on featureRegisterGenerator. Scenarios ad…
adding a feature of reports generated of collections made on the month at a restaurant
Add a feature
Periodic Restaurant Report Genertator
I am adding a feature about the collection notice, which resends a email if the are peding requests
Merge das features de Cecília Hunka, Dani Sales, Bruno Melo e Lucas Falbo.
Feature dos membros 5 a 8
Added Scenario ResidueCollector
Merge 5 + 10
mchma dso bhlvm kepa features
…n the system, and beginning of tests implementations
Added admin user feature and Login feature tests
Merging between Cecilia and Franclin
danisales
pushed a commit
that referenced
this pull request
Oct 6, 2015
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It already contains Cecilia Pull request and Lucas Pull Request, both already merged.