Claudio Barril
|
cedd12314b
|
Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user
|
2014-01-25 23:03:21 -03:00 |
|
Claudio Barril
|
9a9dabc0ab
|
fix typo
|
2014-01-25 19:50:46 -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 |
|
Paulo Gustavo Veiga
|
2f994be98d
|
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
|
a745167c75
|
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
|
5d4da27842
|
Fix Jetty hangs during install.
|
2014-01-25 15:27:03 -03:00 |
|
Paulo Gustavo Veiga
|
adfc6c08f2
|
Improve delete message.
Add unit test.
|
2014-01-25 12:31:14 -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
|
0493d66daa
|
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
|
2ccb4bfb83
|
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
|
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
|
25e6e4de4f
|
Bug WISE-190 fixed.
Implement REST Console support.
|
2014-01-24 09:45:22 -03:00 |
|
ezequiel
|
31aab0bd48
|
api rest call
|
2014-01-24 00:21:43 -03:00 |
|
ezequiel
|
d1004f2919
|
adding warning msg on delete user popup
|
2014-01-24 00:21:27 -03:00 |
|
ezequiel
|
c3d2739293
|
more users..
|
2014-01-24 00:20:13 -03:00 |
|
Claudio Barril
|
f30106ab39
|
delete account lash in account settings
|
2014-01-20 23:10:57 -03:00 |
|
Claudio Barril
|
24417d4fd0
|
DELETE__ACCOUNT message property (en and es languages)
|
2014-01-20 23:10:15 -03:00 |
|
Paulo Gustavo Veiga
|
9c4dfb7f25
|
Merged feature-WISE-78-pom-improvements into develop
|
2014-01-20 19:27:34 -03:00 |
|
Ezequiel Bergamaschi
|
b401a53a21
|
addding tomcat plugin
|
2014-01-19 18:26:48 -03:00 |
|
Claudio Barril
|
4eec745296
|
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
|
947fd30fa2
|
removing unnecesary build
|
2014-01-19 18:22:47 -03:00 |
|
Ezequiel Bergamaschi
|
808660cfbb
|
remove wrong js file on standalone-editor.xml
|
2014-01-19 18:22:13 -03:00 |
|
Ezequiel Bergamaschi
|
5d231249c7
|
updating jetty plugin on pom
|
2014-01-19 18:21:38 -03:00 |
|
Ezequiel Bergamaschi
|
3736f48efa
|
adding missing info to README.md
|
2014-01-19 18:21:18 -03:00 |
|
Claudio Barril
|
531be52c5b
|
fix mysql database and user creation
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
cc9fa543cb
|
creating mysql and hsql maven profiles
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
52d3838094
|
fix mysql test-data statements
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
d288787fdc
|
add if exists to mysql statements
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
2c26c3cdc0
|
select database wisemapping in mysql tables creation
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
9b133468e4
|
add if not exists to mysql database creation
|
2014-01-19 14:33:56 -03:00 |
|
Claudio Barril
|
953e473ef0
|
add if exists to hsql statements
|
2014-01-19 14:33:56 -03:00 |
|
Paulo Gustavo Veiga
|
cd02cdb1ce
|
Merge branch 'develop' into feature/WISE-16-remove_user
|
2014-01-12 23:42:47 -03:00 |
|
Paulo Gustavo Veiga
|
1e90a74ac7
|
Merge branch 'release/v3.0.2' into develop
|
2014-01-12 23:13:43 -03:00 |
|
Paulo Gustavo Veiga
|
703414266e
|
Fix failing uning tests ...
|
2014-01-12 22:53:42 -03:00 |
|
Paulo Veiga
|
970e5bd2ed
|
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
|
c525acbad4
|
Fix jetty download.
|
2014-01-12 05:54:43 +00:00 |
|
Paulo Gustavo Veiga
|
83d80cadb5
|
Q!
Bug WISE-22 fixed. Resolve resize node issue.
|
2014-01-12 05:50:50 +00:00 |
|
Paulo Veiga
|
b2adb4f6a6
|
Merge branch 'release/v3.0.2' into develop
|
2014-01-12 05:47:21 +00:00 |
|
Paulo Gustavo Veiga
|
94915bc8e4
|
Bug WISE-22 fixed. Resolve resize node issue.
|
2014-01-12 02:17:42 -03:00 |
|
Paulo Gustavo Veiga
|
3679db819a
|
Merged master into feature/WISE-16-remove_user
|
2014-01-10 00:27:30 -03:00 |
|
Paulo Gustavo Veiga
|
50adfa0053
|
Revert "Bug WISE-16 fixed. Backed completed."
This reverts commit 9a77ff3bb8 .
|
2014-01-10 00:21:21 -03:00 |
|
Paulo Gustavo Veiga
|
5f29024559
|
Bug WISE-16 fixed. Backed completed.
|
2014-01-10 00:19:56 -03:00 |
|
Paulo Gustavo Veiga
|
805f5eed7f
|
Bug WISE-16 fixed. Backed completed.
|
2014-01-10 00:18:00 -03:00 |
|
Paulo Gustavo Veiga
|
e4d5425a7d
|
Created new branch develop
|
2014-01-10 01:37:09 +00:00 |
|