Commit Graph

155 Commits

Author SHA1 Message Date
Paulo Gustavo Veiga
d955e44167 Merge branch 'develop'
Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
2015-02-06 22:48:58 -03:00
Paulo Gustavo Veiga
d3dd58fdc5 Merge branch 'feature/remove_mootols' into develop 2015-01-31 21:35:52 -03:00
Paulo Gustavo Veiga
1993040520 Move from 3.0.5-SNAPSHOT to 4.0.0-SNAPSHOT 2015-01-31 21:30:12 -03:00
Ezequiel Bergamaschi
9f79d8f40a fixing samples 2015-01-31 15:32:09 -03:00
Ezequiel Bergamaschi
2d3493b648 fixing missing symb links && samples 2015-01-31 14:40:10 -03:00
Ezequiel Bergamaschi
8202248bad move bootstrap dir from wise-editor to mindplot 2014-10-26 18:13:02 -03:00
Ezequiel Bergamaschi
5a863734a0 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
ac27edae21 css bug fixing 2014-09-22 03:37:18 -03:00
Paulo Gustavo Veiga
2b3fdf1196 Fix release version on master. 2014-09-21 22:20:48 -03:00
Paulo Gustavo Veiga
6a0605b6ac Update release version to 3.0.4 snapshot 2014-09-21 22:19:21 -03:00
Ezequiel Bergamaschi
e23ef8d9d0 remove old References to MooDialog 2014-09-14 17:44:50 -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
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
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
8686eb0ad4 Revert "removing unnecesary build"
This reverts commit 52cac830ae.
2014-08-18 20:19:59 -03:00
Mariela Michalek
1ec921efde update toolbar margin 2014-08-03 19:34:25 -03:00
Ezequiel Bergamaschi
75739389cc replace last Request by $.ajax 2014-08-03 17:07:48 -03:00
Ezequiel Bergamaschi
4ac182f0d9 RestPersisnteceManager reimplemented with ajax 2014-08-03 16:50:06 -03:00
Ezequiel Bergamaschi
df9f865e04 add missed css boostrap property 2014-08-03 15:24:58 -03:00
Ezequiel Bergamaschi
9230c186e1 copying bootstrap from wise-webapp to wise-editor 2014-07-29 02:25:45 -03:00
Ezequiel Bergamaschi
c8cbd42fe3 link icon tooltip as black tooltip 2014-07-28 00:21:06 -03:00
Ezequiel Bergamaschi
92e47fb98b reduce popover padding and size 2014-07-27 20:28:15 -03:00
Ezequiel Bergamaschi
f51480731a trying to load pom.xml 2014-07-27 18:25:52 -03:00
Ezequiel Bergamaschi
b9b4c380b2 adding js resources to jsp 2014-07-14 02:45:39 -03:00
Ezequiel Bergamaschi
9fbe471585 change old addEvent method call by .on() 2014-07-14 00:11:56 -03:00
Ezequiel Bergamaschi
039da8e73d adding hover to icon panel 2014-07-06 01:29:00 -03:00
Ezequiel Bergamaschi
5081311f7d adding option to ajax request for debugging 2014-07-06 01:16:08 -03:00
Ezequiel Bergamaschi
2302116214 mousewheel jquery oficial plugin 2014-05-13 02:23:32 -03:00
Ezequiel Bergamaschi
4414e0943d some css changes.. 2014-04-27 23:59:45 -03:00
Ezequiel Bergamaschi
0c80f8f544 removing css class 2014-04-06 18:31:28 -03:00
Ezequiel Bergamaschi
a47232d6df removing custom class .btn-primary, keep bootstrap 2014-04-06 18:24:16 -03:00
Mariela Michalek
52fa7679b9 revert "update bootstrap modal dialog"
This reverts commit 690b653092.
2014-04-02 15:28:59 -03:00
Mariela Michalek
690b653092 update bootstrap modal dialog 2014-04-01 07:24:00 -03:00
Mariela Michalek
d4b8754c05 change compatibility file 2014-04-01 07:15:12 -03:00
Ezequiel Bergamaschi
dccc1c8c88 fix click outside modal is closing it on wait dialog 2014-03-17 02:15:03 -03:00
Ezequiel Bergamaschi
2ab488bfa6 replacing old .each mootools' method by _.each 2014-03-17 00:36:29 -03:00
Ezequiel Bergamaschi
a0e3c74921 adding underscorejs library 2014-03-17 00:35:54 -03:00
Ezequiel Bergamaschi
43898f6878 browser global variable workaround 2014-03-16 18:12:21 -03:00
Ezequiel Bergamaschi
7b5835f2e9 removing todo 2014-03-15 03:55:57 -03:00
Ezequiel Bergamaschi
18584e8c9f using bootstrap for modal loading dialog 2014-03-09 20:50:41 -03:00
Ezequiel Bergamaschi
3969097d21 working on loading dialog 2014-03-09 05:50:52 -03:00
Ezequiel Bergamaschi
d2176a49a7 hotkeys plugin 2014-03-09 01:45:36 -03:00
Paulo Gustavo Veiga
fde613e24a Start working on editor.html. 2014-03-05 00:55:22 -03:00
Paulo Gustavo Veiga
b46ad170fb Keep migration to jQuery ... 2014-03-04 22:48:31 -03:00
Paulo Gustavo Veiga
4c83b27e6f Reduce Mootools components. 2014-03-04 20:47:23 -03:00
Paulo Gustavo Veiga
0e0e3ec29e Remove moodialog
Re-implementing message dialog.
Fix several imports.
2014-02-19 03:34:12 -03:00
Paulo Gustavo Veiga
4efd64fac1 Remove mootools more dependency. 2014-02-19 03:11:13 -03:00
Paulo Gustavo Veiga
f3f03be007 Add just restricted mootools libraries. 2014-02-19 03:01:32 -03:00