vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-25 15:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,298 Commits 10 Branches 29 Tags 26 MiB
a8f7d28c11
Commit Graph

1298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paulo Gustavo Veiga
86324c6873 Add compile information 2014-01-08 23:33:00 +00:00
Paulo Gustavo Veiga
896e299f8f Add compilation details temporally. 2014-01-08 23:28:21 +00:00
Paulo Gustavo Veiga
751157815e README.md edited online with Bitbucket 2014-01-08 23:21:30 +00:00
Paulo Gustavo Veiga
9f6ba0b19c Home.textile edited online with Bitbucket 2014-01-08 23:18:24 +00:00
Paulo Gustavo Veiga
711b673e31 Compiling-and-running.md edited online with Bitbucket 2014-01-08 23:16:06 +00:00
Paulo Gustavo Veiga
fd6d23c513 Fix compile documentation ... 2014-01-08 23:12:53 +00:00
Ezequiel Bergamaschi
1dce163782 fix wrong version of jetty-maven-plugin 2014-01-07 16:58:05 -03:00
Paulo Gustavo Veiga
efd285eb10 README.md edited online with Bitbucket 2014-01-07 01:52:14 +00:00
Paulo Gustavo Veiga
128052102d README.md edited online with Bitbucket 2014-01-07 01:49:07 +00:00
Paulo Veiga
8f2f9da3da Fix 2014-01-05 22:03:41 +00:00