-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
LabXP2014 - Entrega #2
Open
arthbr
wants to merge
245
commits into
cogroo:master
Choose a base branch
from
labxp2014cogroo:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains 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
Criamos o diretório dictionary e seu controller. Piloto: Arthur Co: Vitor On branch master deleted: comunidade.properties new file: src/main/java/br/usp/ime/cogroo/controller/DictionaryController.java new file: src/main/webapp/WEB-INF/jsp/dictionary/newEntry.jsp modified: src/main/webapp/header.jspf
…bter o JASON do webservice.
…o] TODO: unir corretamente os métodos de consulta e inserção.
Conflicts: src/main/java/br/usp/ime/cogroo/controller/WordController.java
…ur] TODO: linkar com a classe Vocable
…into teste_vocable Conflicts: src/main/java/br/usp/ime/cogroo/controller/WordController.java
…a. [Ricardo, Vitor]
…down [Ricardo, Arthur]
…ntrySearch.jsp removido. [Ricardo, Arthur]
Conflicts: src/main/java/br/usp/ime/cogroo/controller/WordController.java
…unity into RenomearLema
…unity into RenomearLema
…unity into RenomearLema
(#51) [Vitor, Ricardo]
[Ricardo, Vitor]
[Ricardo, Vitor]
[Vitor, Ricardo]
Conflicts: src/main/webapp/WEB-INF/jsp/dictionaryPatch/dictionaryEntrySearch.jsp
(#56) [Ricardo, Vitor]
…alavras e na análise gramatical. (#46) [Vitor, Ricardo]
[Vitor, Ricardo]
- Remoção de marcações de teste. - Revertendo pom.xml para rodar todos os testes e local do comunidade.properties. - Ocultando links e caminhos para edição de palavras. TODO: Formatar, organizar imports e consertar encodings. [Vitor, Ricardo]
…lHost não é possível mandar de fato o email [Rodrigo, Arthur] #41
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Alterações durante a disciplina:
Ver mais em: http://ccsl.ime.usp.br/redmine/projects/cogroo/wiki/LabXP_2014