Commit Graph

2386 Commits

Author SHA1 Message Date
Ezequiel Bergamaschi
beee696246 adding development jquery source 2014-09-27 15:57:46 -03:00
Ezequiel Bergamaschi
053b0842dd change webDriver since htmlunit throws error with jquery 2014-09-27 15:15:35 -03:00
Ezequiel Bergamaschi
6c4b0fe1e5 unit testing for events 2014-09-27 14:35:49 -03:00
Ezequiel Bergamaschi
d8015c5608 reducing functionality of Events class 2014-09-27 14:35:40 -03:00
Ezequiel Bergamaschi
248efeb717 try change browser version for continuous build 2014-09-26 23:33:18 -03:00
Ezequiel Bergamaschi
0eef0c1f83 Merge branch 'feature/WISE-214-JasmineTests' into feature/remove_mootols 2014-09-26 23:24:47 -03:00
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
49cba6090a adding jasmine configuration and suite to core-js module 2014-09-26 23:22:37 -03:00
Ezequiel Bergamaschi
dd2d50a95d Merge remote-tracking branch 'origin/develop' into feature/WISE-214-JasmineTests 2014-09-25 03:10:05 -03:00
Ezequiel Bergamaschi
09606bf820 fix thumbnail service is down 2014-09-25 00:18:03 -03:00
Ezequiel Bergamaschi
c3ebde34d7 css bug fixing 2014-09-22 03:37:18 -03:00
Ezequiel Bergamaschi
e249dee600 include js in final war 2014-09-22 03:28:34 -03:00
Ezequiel Bergamaschi
ef84e3fbbd rename js symb link 2014-09-22 03:14:28 -03:00
Paulo Gustavo Veiga
dfaa8ccd89 Fix release version on master. 2014-09-21 22:20:48 -03:00
Paulo Gustavo Veiga
4d89851d1a Update release version to 3.0.4 snapshot 2014-09-21 22:19:21 -03:00
Ezequiel Bergamaschi
6176ac9558 replace old event.control and event.meta by event.ctrlKey and event.metaKey 2014-09-21 18:34:45 -03:00
Mariela Michalek
ac425c6f0d update remove button for editors 2014-09-14 18:32:18 -03:00
Ezequiel Bergamaschi
c78ae247f4 BootstrapDialog improvements and design 2014-09-14 17:45:11 -03:00
Ezequiel Bergamaschi
616b782c5d remove old References to MooDialog 2014-09-14 17:44:50 -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
f30f8fb0f2 change thumbnails service due to service is down 2014-09-12 02:01:19 -03:00
Ezequiel Bergamaschi
fff432b634 temporary hack for same scrollbar of mindmapList 2014-09-11 16:59:55 -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
Mariela Michalek
35e7341654 when dialog is closed, remove divs from dom 2014-09-11 14:42:15 -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
c946742767 fix esc key not working if not focus in modal 2014-09-11 14:38:22 -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
Paulo Gustavo Veiga
e9444f373e Merge branch 'develop' 2014-09-09 22:41:53 -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
ea0b7fd8d1 add translation for History in spanish 2014-09-09 17:41:25 -03:00
Claudio Barril
438bb5a7d6 fix view history of maps 2014-09-09 13:50:17 -03:00
Claudio Barril
94f070832c fix first save (wrong timestamp was being taken) 2014-09-09 11:54:48 -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
013a31ca6e Merge remote-tracking branch 'origin/WISE-253-support-freemind-101' into develop 2014-09-07 23:31:57 -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
Ezequiel Bergamaschi
9855e032ef BootstrapDialog.Request implementation using modal body 2014-09-07 20:17:47 -03:00