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

991 Commits (beee6962464f1a3e074efb910ced5dc6b294f485)

Author SHA1 Message Date
Ezequiel Bergamaschi 2f3cc5fd32 Merge remote-tracking branch 'origin/develop' into feature/remove_mootols 
Conflicts:
	mindplot/src/main/javascript/widget/LinkIconTooltip.js
	wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
 2014-09-26 23:24:41 -03:00
Ezequiel Bergamaschi ef84e3fbbd rename js symb link 2014-09-22 03:14:28 -03:00
Ezequiel Bergamaschi 234d8cb09d change statix input size by percentage value 2014-09-12 17:09:17 -03:00
Ezequiel Bergamaschi 0cf62d53d0 Revert "Revert "Revert "new header""" 
This reverts commit 9844fb156e.

Conflicts:

	wise-webapp/src/main/webapp/jsp/header.jsp
 2014-09-12 17:07:22 -03:00
Ezequiel Bergamaschi 8bdbdae5c9 finishing css bug fixing of custom toolbar items 2014-09-11 16:59:22 -03:00
Ezequiel Bergamaschi 3eca991285 mindmapExport css bug fixing 2014-09-11 15:12:27 -03:00
Ezequiel Bergamaschi 63b8c32d63 trigger event when dialog is shown to perform custom dialog actions 2014-09-11 14:38:49 -03:00
Ezequiel Bergamaschi 9fd5c2c8d4 mindmapShare css improvements 2014-09-11 13:04:50 -03:00
Ezequiel Bergamaschi 903d03fdf4 fixing style stuffs 2014-09-11 11:35:31 -03:00
Claudio Barril d7ca99a69c really fix share editor (prod bug) 2014-09-09 18:48:51 -03:00
Claudio Barril 3b10674925 fix some issues in share dialog 2014-09-09 17:43:22 -03:00
Claudio Barril 6710fbd9f7 remove duplicates files uploads 2014-09-09 17:42:17 -03:00
Claudio Barril 438bb5a7d6 fix view history of maps 2014-09-09 13:50:17 -03:00
Claudio Barril 9906f46ce6 fix publish panel 2014-09-09 11:19:56 -03:00
Claudio Barril 4581f07daf fix regular expresion in export window 2014-09-09 11:19:20 -03:00
Claudio Barril 69631a11b1 fix content type 2014-09-08 15:51:20 -03:00
Ezequiel Bergamaschi 0cec7c2fec dialogs migration from moodialog to bootstrap 2014-09-08 14:55:34 -03:00
Claudio Barril 77a087277a fix exporter to freemind issues (shape, font styles and font sizes) 2014-09-08 14:36:49 -03:00
Claudio Barril b66d15e51f add default to import error manager 2014-09-07 23:16:00 -03:00
Claudio Barril 0447cb995f fix nomenclature test name 2014-09-07 23:15:48 -03:00
Claudio Barril eadea5e442 freemind constant 2014-09-07 23:15:27 -03:00
Claudio Barril cb80d5e976 add test for version comparison 2014-09-07 21:02:04 -03:00
Claudio Barril 68b8428439 fixing files to test export 2014-09-07 20:20:03 -03:00
Ezequiel Bergamaschi 0df077d14b mindmap export bug fixing 2014-09-07 20:17:59 -03:00
Claudio Barril 01071a9236 setting default version for freemind export 2014-09-07 20:16:23 -03:00
Claudio Barril 72ee23849f considering possibility of null positions 2014-09-07 20:16:09 -03:00
Claudio Barril 37b2cc7466 remove console printing for debugging 2014-09-07 18:51:19 -03:00
Claudio Barril bf5ae3b0de hack fix for relationships when import/export for freemind 2014-09-07 16:58:14 -03:00
Claudio Barril 2a121f91d2 fix vertical order when export to freemind versions. 2014-09-07 16:10:06 -03:00
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 2459a14c9b BootstrapDialog.Request implementation 2014-09-01 02:45:15 -03:00
Claudio Barril 369f015af2 fix drawn and freemind test 2014-08-30 22:42:28 -03:00
Claudio Barril 696ac88330 fix side as first level nodes are drawn 2014-08-25 23:32:17 -03:00
Claudio Barril c4a4424364 fixing import dialog, parameters modification and redirect 2014-08-20 23:31:14 -03:00
Claudio Barril e1a28027db removing comparasion hack and fixing order to compare versions 2014-08-20 23:30:24 -03:00
Ezequiel Bergamaschi 8bfdda82b7 Revert "Revert "new header"" 
This reverts commit 3d6df8a143.
 2014-08-18 21:54:41 -03:00
Ezequiel Bergamaschi c282a80b5d fix less update and restoring symblinks 2014-08-18 21:23:42 -03:00
Ezequiel Bergamaschi 4705a4e612 adding symlink for bootstrap in wise-webapp 2014-07-29 02:30:51 -03:00
Ezequiel Bergamaschi 8df2441a66 remove wise-webapp bootstrap 2014-07-29 02:30:08 -03:00
Ezequiel Bergamaschi 21e5850ee5 adding js resources to jsp 2014-07-14 02:45:39 -03:00
Ezequiel Bergamaschi 6ab59967d2 loading dialog added 2014-07-14 00:12:23 -03:00
Ezequiel Bergamaschi 367a6d7cb7 change old addEvent method call by .on() 2014-07-14 00:11:56 -03:00
Ezequiel Bergamaschi fedef3cbac restore symlink for less.js 2014-07-14 00:11:17 -03:00
Ezequiel Bergamaschi a6fabc5a5a Merge remote-tracking branch 'origin/develop' into feature/remove_mootols 2014-07-13 02:39:19 -03:00
Paulo Gustavo Veiga 756afef4b6 Bug WISE-242 fixed 
Add support for Firefox 3
 2014-06-25 21:26:58 -03:00
Ezequiel Bergamaschi 2166dd9504 Merge remote-tracking branch 'origin/develop' into feature/remove_mootols 2014-06-19 00:49:34 -03:00
Michael Magill d3b1c9087f 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
Paulo Gustavo Veiga 634cd3e8be Mir fix on label. 2014-04-26 21:08:13 -03:00
Paulo Gustavo Veiga d1a5bd56f9 Merged feature/WISE-211-iconSupportOnLabels into develop 2014-04-26 15:44:36 -03:00
Michael Magill 1bfbd8ea60 removed "ou=" from LDAP user search since it is now integrated with security.ldap.subDn 2014-04-25 20:41:50 +00:00