Commit Graph

1648 Commits (8003ef73bf2e2070dcecd43a77aef76b14c4dc92)

Author SHA1 Message Date
Claudio Barril 93a8647c6a Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user 2014-01-25 23:53:54 -03:00
Claudio Barril 6ac7948312 Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user 2014-01-25 23:53:54 -03:00
Claudio Barril 0dc426487d fix mysql populate file selected 2014-01-25 23:53:17 -03:00
Claudio Barril b9e64e20e3 fix mysql populate file selected 2014-01-25 23:53:17 -03:00
Ezequiel Bergamaschi 561fb00ac2 WISE-199 #resolve 2014-01-25 23:39:55 -03:00
Ezequiel Bergamaschi b774052e1d WISE-199 #close 2014-01-25 23:39:26 -03:00
Ezequiel Bergamaschi 367bcf084d close WISE-199 2014-01-25 23:32:18 -03:00
Ezequiel Bergamaschi fe2b7225ef close #199 2014-01-25 23:30:34 -03:00
Ezequiel Bergamaschi 49d9820a44 create tag item on left list 2014-01-25 23:25:17 -03:00
Ezequiel Bergamaschi 3f2c687643 bug WISE-199 fixed 2014-01-25 23:24:04 -03:00
Ezequiel Bergamaschi c68b4c90da removing unnecesary validation 2014-01-25 23:21:44 -03:00
Ezequiel Bergamaschi 1b480b566a rest api for label and hibernate mapping 2014-01-25 23:21:17 -03:00
Ezequiel Bergamaschi 504e3e18e6 sql scripts for label support 2014-01-25 23:07:35 -03:00
Claudio Barril f2be251c8b Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user 2014-01-25 23:03:21 -03:00
Claudio Barril cedd12314b Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user 2014-01-25 23:03:21 -03:00
Ezequiel Bergamaschi 02cb53d082 fixing merge conflicts 2014-01-25 19:54:28 -03:00
Claudio Barril 0acd0c097f fix typo 2014-01-25 19:50:46 -03:00
Claudio Barril 9a9dabc0ab fix typo 2014-01-25 19:50:46 -03:00
Paulo Gustavo Veiga 99be712a5f Add JCoco Coverage report. 2014-01-25 18:31:50 -03:00
Paulo Gustavo Veiga ed4d50724a Add JCoco Coverage report. 2014-01-25 18:31:50 -03:00
Ezequiel Bergamaschi 94812cd96a adding missing db profiles due to a wrong merge 2014-01-25 18:16:21 -03:00
Ezequiel Bergamaschi f39e82b016 adding missing db profiles due to a wrong merge 2014-01-25 18:16:21 -03:00
Paulo Gustavo Veiga 2f994be98d Remove unsed file. 2014-01-25 15:49:10 -03:00
Paulo Gustavo Veiga 40907bc479 Remove unsed file. 2014-01-25 15:49:10 -03:00
Paulo Gustavo Veiga d4f9fb1756 Remove unsed files. 2014-01-25 15:47:44 -03:00
Paulo Gustavo Veiga 14d688b9bf Remove unsed files. 2014-01-25 15:47:44 -03:00
Paulo Gustavo Veiga a745167c75 Minor fix on documentation. 2014-01-25 15:43:46 -03:00
Paulo Gustavo Veiga 2cb7ec9afb Minor fix on documentation. 2014-01-25 15:43:46 -03:00
Paulo Gustavo Veiga 540b575e54 Improve readme documentation. 2014-01-25 15:39:50 -03:00
Paulo Gustavo Veiga 7e5b3c51a8 Improve readme documentation. 2014-01-25 15:39:50 -03:00
Paulo Gustavo Veiga 5d4da27842 Fix Jetty hangs during install. 2014-01-25 15:27:03 -03:00
Paulo Gustavo Veiga 20a786460c Fix Jetty hangs during install. 2014-01-25 15:27:03 -03:00
Paulo Gustavo Veiga 07b18d9527 Improve delete message.
Add unit test.
2014-01-25 12:31:14 -03:00
Paulo Gustavo Veiga adfc6c08f2 Improve delete message.
Add unit test.
2014-01-25 12:31:14 -03:00
Paulo Gustavo Veiga 9a1c0fe46d Merge branch 'develop' into feature/WISE-16-remove_user
Conflicts:
	wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
	wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
2014-01-25 11:33:31 -03:00
Paulo Gustavo Veiga a8f7d28c11 Merge branch 'develop' into feature/WISE-16-remove_user
Conflicts:
	wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
	wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
2014-01-25 11:33:31 -03:00
Paulo Gustavo Veiga 5b1fb27ca2 Add Maven Tomcat Plugin. 2014-01-25 04:53:51 -03:00
Paulo Gustavo Veiga cf0b3cf80d Add Maven Tomcat Plugin. 2014-01-25 04:53:51 -03:00
Paulo Gustavo Veiga 0493d66daa Fix mindmaping controller tests. 2014-01-25 04:21:59 -03:00
Paulo Gustavo Veiga f66c476187 Fix mindmaping controller tests. 2014-01-25 04:21:59 -03:00
Paulo Gustavo Veiga 9b3f1c79a6 Enable MindmapController rests. 2014-01-25 03:13:51 -03:00
Paulo Gustavo Veiga 5e62eb3279 Enable MindmapController rests. 2014-01-25 03:13:51 -03:00
Paulo Gustavo Veiga 2ccb4bfb83 Remove HTML support for test ... 2014-01-24 22:58:25 -03:00
Paulo Gustavo Veiga 686e011f9b Remove HTML support for test ... 2014-01-24 22:58:25 -03:00
Paulo Gustavo Veiga f610bfdfb3 Fix W3ORG logo url location on footer. 2014-01-24 22:42:05 -03:00
Paulo Gustavo Veiga f0c6d944a8 Fix W3ORG logo url location on footer. 2014-01-24 22:42:05 -03:00
Paulo Gustavo Veiga ebf4603889 Conflicts:
README.md
	config/database/mysql/apopulate-schemas.sql
	wise-webapp/pom.xml
2014-01-24 20:17:21 -03:00
Paulo Gustavo Veiga 706031a641 Conflicts:
README.md
	config/database/mysql/apopulate-schemas.sql
	wise-webapp/pom.xml
2014-01-24 20:17:21 -03:00
Paulo Gustavo Veiga 25e6e4de4f Bug WISE-190 fixed.
Implement REST Console support.
2014-01-24 09:45:22 -03:00
Paulo Gustavo Veiga ae604b1c70 Bug WISE-190 fixed.
Implement REST Console support.
2014-01-24 09:45:22 -03:00