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,631 Commits
2 Branches
29 Tags
25 MiB
Commit Graph

1631 Commits (a6a79e9f94d219301a2ba74d880fffe270637858)

Author SHA1 Message Date
Claudio Barril a6a79e9f94 fix vertical order when export to freemind versions. 2014-09-07 16:10:06 -03:00
Claudio Barril 94e76fad9c support both export versions for freemind (old and new 1.0.1) 2014-09-07 16:06:58 -03:00
Claudio Barril 3c9573c93e fix drawn and freemind test 2014-08-30 22:42:28 -03:00
Claudio Barril 4641c3cc5a fix side as first level nodes are drawn 2014-08-25 23:32:17 -03:00
Claudio Barril 1ff3cf2127 fixing import dialog, parameters modification and redirect 2014-08-20 23:31:14 -03:00
Claudio Barril 7b512ea2f6 removing comparasion hack and fixing order to compare versions 2014-08-20 23:30:24 -03:00
Ezequiel Bergamaschi 8318e897fe fix less update and restoring symblinks 2014-08-18 21:23:42 -03:00
Ezequiel Bergamaschi 99c909c69b Revert "fix alias checking for jetty 9.x" 
This reverts commit fff27e1bb7.
 2014-08-18 21:10:25 -03:00
Ezequiel Bergamaschi 704fb02d1a old jetty pom 2014-08-18 21:09:56 -03:00
Ezequiel Bergamaschi 8686eb0ad4 Revert "removing unnecesary build" 
This reverts commit 52cac830ae.
 2014-08-18 20:19:59 -03:00
Paulo Gustavo Veiga 5de02c8d51 Bug WISE-242 fixed 
Add support for Firefox 3
 2014-06-25 21:26:58 -03:00
Ezequiel Bergamaschi fff27e1bb7 fix alias checking for jetty 9.x 2014-06-19 00:43:10 -03:00
Ezequiel Bergamaschi c0abb0a71c adding wisemapping service script 2014-05-26 00:19:10 -03:00
Michael Magill e273c52f59 I was getting a 404 because it was looking for en_us, not just en. The en template may need to be copied for other English locales like en_GB, en_CA, etc. The 404 only showed up in Firefox's developer console did not appear to affect functionality, so this is just cleanup. 2014-04-29 15:42:31 +00:00
Michael Magill d609f6f3d7 Syntax error, CHARACTER SET utf8; should have been at the end of the create r_label_mindmap enty, not the bottom of the file. Probably copy and paste error. 2014-04-29 14:23:29 +00:00
Paulo Gustavo Veiga 06004f73a8 Rename migration script ... 2014-04-29 11:17:20 -03:00
Paulo Gustavo Veiga 72034aad1e Remove all used users for setup. Pending to define data set. 2014-04-27 12:05:49 -03:00
Paulo Gustavo Veiga 9efa963ec8 Fix SQL names. 2014-04-27 11:13:38 -03:00
Paulo Gustavo Veiga a42811630d Merge branch 'develop' into feature/WISE-211-iconSupportOnLabels 2014-04-26 21:15:57 -03:00
Paulo Gustavo Veiga d7ca087182 Mir fix on label. 2014-04-26 21:08:13 -03:00
Claudio Barril d2a99998b5 add update for label icon support with tag as default 2014-04-26 18:27:01 -03:00
Paulo Gustavo Veiga d6a60636ed Merged feature/WISE-211-iconSupportOnLabels into develop 2014-04-26 15:44:36 -03:00
Paulo Gustavo Veiga 9ca2f6bb1e Merged in ldap-changes (pull request #1) 
move 'ou=' from being hardcoded to part of security.ldap.subDn
 2014-04-26 15:39:29 -03:00
Michael Magill b886a5888a removed "ou=" from LDAP user search since it is now integrated with security.ldap.subDn 2014-04-25 20:41:50 +00:00
Michael Magill cec140b1fd changed default security.ldap.subDn parameter to include "ou=" 2014-04-25 20:36:48 +00:00
Michael Magill 84cffac713 removed extra / from site.baseurl 2014-04-25 20:30:18 +00:00
Ezequiel Bergamaschi 754d4b3dcf fixing wrong reference variable 2014-04-19 14:18:35 -03:00
Paulo Gustavo Veiga 7ee577c400 Update ads codes. 2014-04-18 19:48:09 -03:00
Paulo Gustavo Veiga c854c1b377 Update analitics tracking code. 2014-04-18 19:13:55 -03:00
Ezequiel Bergamaschi bfe24b7dfb popovers for icons in label icon chooser 2014-04-17 01:29:44 -03:00
Claudio Barril 85c7e3ce5c fixing tests broken because refactor of label attribute icon 2014-04-16 10:29:36 -03:00
Claudio Barril 27304ea385 label icon list reduced 2014-04-16 03:00:00 -03:00
Claudio Barril 8a994ee6f5 jsp include for label icon list 2014-04-16 02:59:33 -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 8cd05ec37e adding icon to tags list (when tagging) and some style 2014-04-16 02:25:07 -03:00
Ezequiel Bergamaschi 5a00229390 adding css for color chooser 2014-04-16 01:57:42 -03:00
Ezequiel Bergamaschi 4b01f7c8ee removing fixme from dialogForm function 2014-04-16 01:48:09 -03:00
Claudio Barril edb91b92bd fix tests 2014-04-16 00:25:32 -03:00
Claudio Barril c6ae7be255 import label list from another jsp prototype 2014-04-14 18:14:56 -03:00
Claudio Barril 86ba19c120 sending icon data to api rest 2014-04-14 18:14:32 -03:00
Claudio Barril 183ab33729 add styles 2014-04-14 18:10:16 -03:00
Claudio Barril 9e992a8f61 add label icons back-end (model and database) 2014-04-14 18:09:34 -03:00
Claudio Barril 5d18283285 icon ui selection 2014-04-12 19:04:28 -03:00
Claudio Barril d66666010d icon dropdown creation dialog 2014-04-12 19:04:19 -03:00
Claudio Barril bddf867b63 icon message 2014-04-12 19:03:31 -03:00
Claudio Barril d0d161e8ab fix padding and label in two lines 2014-04-09 00:13:38 -03:00
Claudio Barril 64c7198d50 update mysql schemas population 2014-03-19 23:29:00 -03:00
Claudio Barril 2fae012fd9 update hsql schemas population 2014-03-19 23:28:46 -03:00
Paulo Gustavo Veiga e8ee76c5f8 Merged feature/WISE-220-mindmapListImprovements into develop 2014-03-16 11:34:38 -03:00
Ezequiel Bergamaschi 3d6df8a143 Revert "new header" 
This reverts commit 251f0eca46.

Conflicts:

	wise-webapp/src/main/webapp/jsp/header.jsp
 2014-03-14 23:59:16 -03:00