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

43 Commits

Author SHA1 Message Date
Claudio Barril
d2a99998b5 add update for label icon support with tag as default 2014-04-26 18:27:01 -03:00
Claudio Barril
5ec3b6cce1 label attribute icon to iconName refactor (because of eze code review) 2014-04-16 02:38:33 -03:00
Claudio Barril
9e992a8f61 add label icons back-end (model and database) 2014-04-14 18:09:34 -03:00
Claudio Barril
64c7198d50 update mysql schemas population 2014-03-19 23:29:00 -03:00
Ezequiel Bergamaschi
8462e54293 Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport 
Conflicts:
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp
 2014-02-14 03:54:36 -03:00
Paulo Gustavo Veiga
b7051d56c0 Fix modal dialogs loading ... 2014-02-12 14:37:04 -03:00
Ezequiel Bergamaschi
d23595a75c update 2014-02-07 06:08:40 -03:00
Ezequiel Bergamaschi
29acc46d34 solving merge conflict 2014-02-05 21:21:00 -03:00
Claudio Barril
b4857ed99e drop R_LABEL_MINDMAP added 2014-02-01 19:36:42 -03:00
Ezequiel Bergamaschi
f248a8c099 addding on delete cascade to R table 2014-02-01 18:53:54 -03:00
Claudio Barril
1ead555e09 fixing tag cascade delete when mindmap tagged is deleted 2014-02-01 04:19:39 -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
43d5779d5f deleting user id field and adding collaborator foreing key from access 2014-01-29 22:15:26 -03:00
Ezequiel Bergamaschi
154db9d9e8 adding color properties to label 2014-01-28 00:13:29 -03:00
Ezequiel Bergamaschi
829815f9e9 Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport 2014-01-26 12:18:37 -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
Paulo Gustavo Veiga
ed4d50724a Add JCoco Coverage report. 2014-01-25 18:31:50 -03:00
Paulo Gustavo Veiga
99be712a5f Add JCoco Coverage report. 2014-01-25 18:31:50 -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
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
ezequiel
7151aa4e2c more users.. 2014-01-24 00:20:13 -03:00
ezequiel
c3d2739293 more users.. 2014-01-24 00:20:13 -03:00
Claudio Barril
531be52c5b fix mysql database and user creation 2014-01-19 14:33:56 -03:00
Claudio Barril
2e24032d1c fix mysql database and user creation 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
3828a1afdb 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
c6aed4bf6e 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
7eda354f8f 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
f20b3a7a46 add if not exists to mysql database creation 2014-01-19 14:33:56 -03:00
Paulo Gustavo Veiga
f9d1e869b0 Move to WiseMapping 3.1 2013-03-28 17:06:34 -03:00
Paulo Gustavo Veiga
0d81db52f1 Add alter table scripts. 2013-03-17 23:40:39 -03:00
Paulo Gustavo Veiga
67398fe07e Add OpenId required colums. 2013-03-17 23:19:29 -03:00
Paulo Gustavo Veiga
9b21c77485 Finish OpenId implementation. 2013-03-17 23:17:55 -03:00
Paulo Gustavo Veiga
0e5592a0d3 Move database configuration scripts. 2013-03-10 19:05:33 -03:00