ZhouXY108
/
wisemapping-open-source
mirror of https://github.com/wisemapping/wisemapping-open-source.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,925 Commits
2 Branches
29 Tags
25 MiB
Commit Graph

131 Commits (ab9576ae61d84b56895401d8c03bac04946d3254)

Author SHA1 Message Date
Claudio Barril 26a18ae7d0 support both export versions for freemind (old and new 1.0.1) 2014-09-07 16:06:58 -03:00
Ezequiel Bergamaschi 7ea9da3512 popovers for icons in label icon chooser 2014-04-17 01:29:44 -03:00
Claudio Barril b427747f9a label attribute icon to iconName refactor (because of eze code review) 2014-04-16 02:38:33 -03:00
Claudio Barril 8e7133c4ab add label icons back-end (model and database) 2014-04-14 18:09:34 -03:00
Claudio Barril a0f4024d26 icon message 2014-04-12 19:03:31 -03:00
Ezequiel Bergamaschi 9dc195cc4b bootstrap 12px and 13px 2014-03-14 23:48:05 -03:00
Ezequiel Bergamaschi 6b73dd10b1 Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport 
Conflicts:
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp
 2014-02-10 22:16:48 -03:00
Paulo Gustavo Veiga bbc380366f Fix login page. 2014-02-09 21:58:23 -03:00
Ezequiel Bergamaschi cfa669fe2e adding hibernate config 2014-02-05 21:55:37 -03:00
Ezequiel Bergamaschi 668506ceb8 adding missing msgs 2014-02-05 21:25:59 -03:00
Ezequiel Bergamaschi 29acc46d34 solving merge conflict 2014-02-05 21:21:00 -03:00
Ezequiel Bergamaschi d089b471fc remove classes of relationship 2014-02-05 02:10:12 -03:00
Claudio Barril 7525ba4820 Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user 2014-02-04 22:18:29 -03:00
Claudio Barril 58390dfb92 Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user 2014-02-04 22:18:29 -03:00
Ezequiel Bergamaschi b99cb2f8a3 adding icons and change label msg 2014-02-03 00:46:35 -03:00
Paulo Gustavo Veiga 079606c4e7 Change the unexpecter error message. 2014-02-02 22:56:40 -03:00
Claudio Barril 8db7f5015f api for unlink mindmaps 2014-02-02 04:09:28 -03:00
Ezequiel Bergamaschi 632a9a6e00 ordering labels on mindmap retreive 2014-02-02 01:26:28 -03:00
Ezequiel Bergamaschi 9a19e2a5eb some button actions 2014-02-01 23:33:38 -03:00
Paulo Gustavo Veiga 3b23fead8e Fix another typo. 2014-02-01 19:54:31 -03:00
Paulo Gustavo Veiga 94b043ecf5 Fix another typo. 2014-02-01 19:54:31 -03:00
Paulo Gustavo Veiga c8286c26aa Fix minor typo. 2014-02-01 19:50:37 -03:00
Paulo Gustavo Veiga f567513468 Fix minor typo. 2014-02-01 19:50:37 -03:00
Paulo Gustavo Veiga 472bb38342 Change the unexpecter error message. 2014-02-01 19:47:33 -03:00
Paulo Gustavo Veiga 10fb98cdaa Change the unexpecter error message. 2014-02-01 19:47:33 -03:00
Ezequiel Bergamaschi 8936ef5008 btn actions 2014-02-01 15:46:18 -03:00
Claudio Barril 1ead555e09 fixing tag cascade delete when mindmap tagged is deleted 2014-02-01 04:19:39 -03:00
Ezequiel Bergamaschi 640b8d7ed0 delete modal dialog 2014-02-01 01:41:02 -03:00
Paulo Gustavo Veiga 71bba1c5ab Merge branch 'develop' into feature/WISE-16-remove_user 2014-01-30 00:24:06 -03:00
Paulo Gustavo Veiga 708b8eb355 Merge branch 'develop' into feature/WISE-16-remove_user 2014-01-30 00:24:06 -03:00
Ezequiel Bergamaschi 7d9ccaec91 Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport 2014-01-29 02:58:10 -03:00
Ezequiel Bergamaschi b4c69133f5 api rest 2014-01-29 02:56:09 -03:00
Ezequiel Bergamaschi 81e9b5f59d add label modal dialog 2014-01-28 02:59:09 -03:00
Ezequiel Bergamaschi 2ec941e1a0 link label to mindmaps 2014-01-28 02:57:40 -03:00
Ezequiel Bergamaschi 72a46367d6 label validator finished 2014-01-28 02:21:14 -03:00
Ezequiel Bergamaschi 154db9d9e8 adding color properties to label 2014-01-28 00:13:29 -03:00
Ezequiel Bergamaschi deb6c4be4d bootstrap color picker plugin 2014-01-27 23:48:11 -03:00
Paulo Gustavo Veiga 81e3cb590c Add Jira Issue Integration. 2014-01-26 20:12:56 -03:00
Paulo Gustavo Veiga a70dd1e52e Add Jira Issue Integration. 2014-01-26 20:12:56 -03:00
Ezequiel Bergamaschi 1b480b566a rest api for label and hibernate mapping 2014-01-25 23:21:17 -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
ezequiel 4f40431d55 adding warning msg on delete user popup 2014-01-24 00:21:27 -03:00
ezequiel d1004f2919 adding warning msg on delete user popup 2014-01-24 00:21:27 -03:00
Ezequiel Bergamaschi f4fb008f1b popup for label 2014-01-21 01:45:12 -03:00
Claudio Barril 8a684519f0 DELETE__ACCOUNT message property (en and es languages) 2014-01-20 23:10:15 -03:00
Claudio Barril 24417d4fd0 DELETE__ACCOUNT message property (en and es languages) 2014-01-20 23:10:15 -03:00
Ezequiel Bergamaschi 91b5a08b11 adding new properties 2014-01-20 01:02:48 -03:00
Paulo Gustavo Veiga 35d76ea56f Fix message. 2013-04-20 00:43:19 -03:00
Paulo Gustavo Veiga 31fb342ef1 Fix missing message. 2013-04-05 20:49:17 -03:00