Claudio Barril
|
558aa31516
|
changing jetty version
|
2014-01-29 22:15:45 -03:00 |
|
Claudio Barril
|
ccd5eb8e15
|
deleting user id field and adding collaborator foreing key from access
|
2014-01-29 22:15:26 -03:00 |
|
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
|
0dc426487d
|
fix mysql populate file selected
|
2014-01-25 23:53:17 -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
|
0acd0c097f
|
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 |
|
Ezequiel Bergamaschi
|
f39e82b016
|
adding missing db profiles due to a wrong merge
|
2014-01-25 18:16:21 -03:00 |
|
Paulo Gustavo Veiga
|
40907bc479
|
Remove unsed file.
|
2014-01-25 15:49:10 -03:00 |
|
Paulo Gustavo Veiga
|
14d688b9bf
|
Remove unsed files.
|
2014-01-25 15:47:44 -03:00 |
|
Paulo Gustavo Veiga
|
2cb7ec9afb
|
Minor fix on documentation.
|
2014-01-25 15:43:46 -03:00 |
|
Paulo Gustavo Veiga
|
7e5b3c51a8
|
Improve readme documentation.
|
2014-01-25 15:39:50 -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
|
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
|
cf0b3cf80d
|
Add Maven Tomcat Plugin.
|
2014-01-25 04:53:51 -03:00 |
|
Paulo Gustavo Veiga
|
f66c476187
|
Fix mindmaping controller tests.
|
2014-01-25 04:21:59 -03:00 |
|
Paulo Gustavo Veiga
|
5e62eb3279
|
Enable MindmapController rests.
|
2014-01-25 03:13:51 -03:00 |
|
Paulo Gustavo Veiga
|
686e011f9b
|
Remove HTML support for test ...
|
2014-01-24 22:58:25 -03:00 |
|
Paulo Gustavo Veiga
|
f0c6d944a8
|
Fix W3ORG logo url location on footer.
|
2014-01-24 22:42:05 -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
|
ae604b1c70
|
Bug WISE-190 fixed.
Implement REST Console support.
|
2014-01-24 09:45:22 -03:00 |
|
ezequiel
|
88fed0af0a
|
api rest call
|
2014-01-24 00:21:43 -03:00 |
|
ezequiel
|
4f40431d55
|
adding warning msg on delete user popup
|
2014-01-24 00:21:27 -03:00 |
|
ezequiel
|
7151aa4e2c
|
more users..
|
2014-01-24 00:20:13 -03:00 |
|
Claudio Barril
|
da2594292b
|
delete account lash in account settings
|
2014-01-20 23:10:57 -03:00 |
|
Claudio Barril
|
8a684519f0
|
DELETE__ACCOUNT message property (en and es languages)
|
2014-01-20 23:10:15 -03:00 |
|
Paulo Gustavo Veiga
|
7d6c26539d
|
Merged feature-WISE-78-pom-improvements into develop
|
2014-01-20 19:27:34 -03:00 |
|
Ezequiel Bergamaschi
|
0c103fc3a2
|
addding tomcat plugin
|
2014-01-19 18:26:48 -03:00 |
|
Claudio Barril
|
2e7aa144b2
|
Merge remote-tracking branch 'origin/feature-WISE-78-pom-improvements' into feature/WISE-16-remove_user
|
2014-01-19 18:25:03 -03:00 |
|
Ezequiel Bergamaschi
|
52cac830ae
|
removing unnecesary build
|
2014-01-19 18:22:47 -03:00 |
|
Ezequiel Bergamaschi
|
9d2cf7e1ff
|
remove wrong js file on standalone-editor.xml
|
2014-01-19 18:22:13 -03:00 |
|
Ezequiel Bergamaschi
|
242827f7e6
|
updating jetty plugin on pom
|
2014-01-19 18:21:38 -03:00 |
|
Ezequiel Bergamaschi
|
9639b9e113
|
adding missing info to README.md
|
2014-01-19 18:21:18 -03:00 |
|
Claudio Barril
|
2e24032d1c
|
fix mysql database and user creation
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
541d07c46c
|
creating mysql and hsql maven profiles
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
3828a1afdb
|
fix mysql test-data statements
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
c6aed4bf6e
|
add if exists to mysql statements
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
7eda354f8f
|
select database wisemapping in mysql tables creation
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
f20b3a7a46
|
add if not exists to mysql database creation
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
abede3c010
|
add if exists to hsql statements
|
2014-01-19 14:33:56 -03:00 |
|
Paulo Gustavo Veiga
|
3d948a1419
|
Merge branch 'develop' into feature/WISE-16-remove_user
|
2014-01-12 23:42:47 -03:00 |
|
Paulo Gustavo Veiga
|
ae587a037a
|
Merge branch 'release/v3.0.2' into develop
|
2014-01-12 23:13:43 -03:00 |
|
Paulo Gustavo Veiga
|
22c102917e
|
Fix failing uning tests ...
|
2014-01-12 22:53:42 -03:00 |
|
Paulo Veiga
|
0001dff347
|
Merge branch 'release/v3.0.2' of bitbucket.org:wisemapping/wisemapping-open-source into release/v3.0.2
|
2014-01-12 05:55:42 +00:00 |
|
Paulo Veiga
|
a50a96492f
|
Fix jetty download.
|
2014-01-12 05:54:43 +00:00 |
|
Paulo Gustavo Veiga
|
63c063933d
|
Q!
Bug WISE-22 fixed. Resolve resize node issue.
|
2014-01-12 05:50:50 +00:00 |
|
Paulo Veiga
|
59a57e0b34
|
Merge branch 'release/v3.0.2' into develop
|
2014-01-12 05:47:21 +00:00 |
|
Paulo Gustavo Veiga
|
80dfab3ef4
|
Bug WISE-22 fixed. Resolve resize node issue.
|
2014-01-12 02:17:42 -03:00 |
|
Paulo Gustavo Veiga
|
fd73564be2
|
Merged master into feature/WISE-16-remove_user
|
2014-01-10 00:27:30 -03:00 |
|