Commit Graph

1917 Commits

Author SHA1 Message Date
Ezequiel Bergamaschi
23f5603460 change statix input size by percentage value 2014-09-12 17:09:17 -03:00
Ezequiel Bergamaschi
00e0959855 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
144a5061a3 change thumbnails service due to service is down 2014-09-12 02:01:19 -03:00
Ezequiel Bergamaschi
ae1e8a2625 temporary hack for same scrollbar of mindmapList 2014-09-11 16:59:55 -03:00
Ezequiel Bergamaschi
4a0f39fb07 finishing css bug fixing of custom toolbar items 2014-09-11 16:59:22 -03:00
Ezequiel Bergamaschi
400f3963f5 mindmapExport css bug fixing 2014-09-11 15:12:27 -03:00
Mariela Michalek
687657bab3 when dialog is closed, remove divs from dom 2014-09-11 14:42:15 -03:00
Ezequiel Bergamaschi
7c31954b19 trigger event when dialog is shown to perform custom dialog actions 2014-09-11 14:38:49 -03:00
Ezequiel Bergamaschi
71b9357a9f fix esc key not working if not focus in modal 2014-09-11 14:38:22 -03:00
Ezequiel Bergamaschi
0f8b7ca662 mindmapShare css improvements 2014-09-11 13:04:50 -03:00
Ezequiel Bergamaschi
4f1f111432 fixing style stuffs 2014-09-11 11:35:31 -03:00
Paulo Gustavo Veiga
08d2403133 Merge branch 'develop' 2014-09-09 22:41:53 -03:00
Claudio Barril
28660e3400 really fix share editor (prod bug) 2014-09-09 18:48:51 -03:00
Claudio Barril
fb3a82222b fix some issues in share dialog 2014-09-09 17:43:22 -03:00
Claudio Barril
7abd37a138 remove duplicates files uploads 2014-09-09 17:42:17 -03:00
Claudio Barril
5c9b6f735d add translation for History in spanish 2014-09-09 17:41:25 -03:00
Claudio Barril
b9b3eb43f7 fix view history of maps 2014-09-09 13:50:17 -03:00
Claudio Barril
5b7bbf2e72 fix first save (wrong timestamp was being taken) 2014-09-09 11:54:48 -03:00
Claudio Barril
ded8dae982 fix publish panel 2014-09-09 11:19:56 -03:00
Claudio Barril
f1c6c845b8 fix regular expresion in export window 2014-09-09 11:19:20 -03:00
Claudio Barril
dcb4de0e0e fix content type 2014-09-08 15:51:20 -03:00
Ezequiel Bergamaschi
943a1ddbd7 dialogs migration from moodialog to bootstrap 2014-09-08 14:55:34 -03:00
Claudio Barril
802c9d3375 fix exporter to freemind issues (shape, font styles and font sizes) 2014-09-08 14:36:49 -03:00
Claudio Barril
81b138cf62 Merge remote-tracking branch 'origin/WISE-253-support-freemind-101' into develop 2014-09-07 23:31:57 -03:00
Claudio Barril
25ee14b7aa add default to import error manager 2014-09-07 23:16:00 -03:00
Claudio Barril
014d9334b3 fix nomenclature test name 2014-09-07 23:15:48 -03:00
Claudio Barril
7ee42468bd freemind constant 2014-09-07 23:15:27 -03:00
Claudio Barril
c83f4bd213 add test for version comparison 2014-09-07 21:02:04 -03:00
Claudio Barril
b0a6e7fac5 fixing files to test export 2014-09-07 20:20:03 -03:00
Ezequiel Bergamaschi
0c9d11c731 mindmap export bug fixing 2014-09-07 20:17:59 -03:00
Ezequiel Bergamaschi
4a27a7479a BootstrapDialog.Request implementation using modal body 2014-09-07 20:17:47 -03:00
Claudio Barril
7d973c7a87 setting default version for freemind export 2014-09-07 20:16:23 -03:00
Claudio Barril
d8e255cac8 considering possibility of null positions 2014-09-07 20:16:09 -03:00
Claudio Barril
b45f874ce4 remove console printing for debugging 2014-09-07 18:51:19 -03:00
Claudio Barril
8b6764af17 hack fix for relationships when import/export for freemind 2014-09-07 16:58:14 -03:00
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
Ezequiel Bergamaschi
020dd0a876 BootstrapDialog.Request implementation 2014-09-01 02:45:15 -03:00
Claudio Barril
3c9573c93e fix drawn and freemind test 2014-08-30 22:42:28 -03:00
Claudio Barril
663310b388 copy parent background color when a sibling or a child is created 2014-08-25 23:58:13 -03:00
Claudio Barril
4641c3cc5a fix side as first level nodes are drawn 2014-08-25 23:32:17 -03:00
Mariela Michalek
be044840a1 Merge branch 'feature/remove_mootols' of bitbucket.org:wisemapping/wisemapping-open-source into feature/remove_mootols
Conflicts:
	mindplot/src/main/javascript/LinkIcon.js
2014-08-24 16:46:43 -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
9844fb156e Revert "Revert "new header""
This reverts commit 3d6df8a143.
2014-08-18 21:54:41 -03:00
Ezequiel Bergamaschi
72a47b76bb Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
Conflicts:
	wise-editor/src/main/webapp/js/less.js
	wise-webapp/pom.xml
	wise-webapp/src/main/webapp/js/less.js
2014-08-18 21:35:45 -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