Skip to content
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
wants to merge 245 commits into
base: master
Choose a base branch
from
Open

LabXP2014 - Entrega #2

wants to merge 245 commits into from

Conversation

arthbr
Copy link
Member

@arthbr arthbr commented Jul 3, 2014

Alterações durante a disciplina:

  • consulta de palavras
  • inserção
  • edição

Ver mais em: http://ccsl.ime.usp.br/redmine/projects/cogroo/wiki/LabXP_2014

rfguimaraes and others added 30 commits March 19, 2014 16:05
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
…o] TODO: unir corretamente os métodos de consulta e inserção.
Conflicts:
	src/main/java/br/usp/ime/cogroo/controller/WordController.java
…into teste_vocable

Conflicts:
	src/main/java/br/usp/ime/cogroo/controller/WordController.java
Conflicts:
	src/main/java/br/usp/ime/cogroo/controller/WordController.java
rfguimaraes and others added 30 commits June 27, 2014 15:38
Conflicts:
	src/main/webapp/WEB-INF/jsp/dictionaryPatch/dictionaryEntrySearch.jsp
…alavras e na análise gramatical.

(#46)

[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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants