Commit Graph

708 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
Ezequiel Bergamaschi
088bba7985 bugfixing for keypress events when user wrinting in a topic 2015-02-01 23:44:34 -03:00
Ezequiel Bergamaschi
48ca102d0a jasmine specs not running for mindplot through maven 2015-02-01 21:37:41 -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
Claudio Barril
72b5685fce undo jasmine plugin removed from poms 2015-01-11 12:16:47 -03:00
Ezequiel Bergamaschi
bd3f1b39b2 fixing all popover, some hacks 2014-12-27 00:46:19 -03:00
Ezequiel Bergamaschi
15c13a8f4f fix popover not updated when updating notes 2014-12-27 00:09:01 -03:00
Ezequiel Bergamaschi
91f85139ca fix error in pom and add data for accept click events in bootstrap dialogs 2014-12-26 23:13:12 -03:00
Ezequiel Bergamaschi
d0dd1bb288 change api for url thumbnails 2014-12-26 20:12:07 -03:00
Ezequiel Bergamaschi
4107e8e61c change api for url thumbnails 2014-12-26 20:11:41 -03:00
Ezequiel Bergamaschi
5ca5a93eb3 fixing bugs in shortcuts and modal dialog with errors 2014-12-26 20:01:15 -03:00
Ezequiel Bergamaschi
8c807398a4 remove mootools components 2014-12-26 18:09:30 -03:00
Ezequiel Bergamaschi
3ee4bdd019 reformat moootools js for develop 2014-12-26 18:08:55 -03:00
Ezequiel Bergamaschi
0d20938506 still removing .bind(this) usages 2014-12-26 18:07:31 -03:00
Claudio Barril
ff6ff266c5 test broken because overlapping (is failing in master) 2014-12-21 14:33:11 -03:00
Claudio Barril
9e08a50c2d fix test name 2014-12-21 14:30:07 -03:00
Claudio Barril
75b89e1c7f fix code style 2014-12-21 14:29:51 -03:00
Claudio Barril
645be7afb3 symmetric test suite 2014-12-14 19:17:48 -03:00
Claudio Barril
65cc84e062 test suite with node constants 2014-12-14 17:36:00 -03:00
Claudio Barril
4ea1bf6f71 free test migrated to jasmine (only which really works) 2014-12-14 17:35:08 -03:00
Claudio Barril
3770c0cac6 balanced test migrated to jasmine 2014-12-14 17:33:22 -03:00
Ezequiel Bergamaschi
00ab6fd61a adding tests to suite 2014-10-26 18:43:30 -03:00
Ezequiel Bergamaschi
8202248bad move bootstrap dir from wise-editor to mindplot 2014-10-26 18:13:02 -03:00
Ezequiel Bergamaschi
6e5ec59137 change js for symlink in tests 2014-10-26 18:11:56 -03:00
Ezequiel Bergamaschi
429f335001 jasmine framework configured for mindplot 2014-10-26 17:53:57 -03:00
Ezequiel Bergamaschi
60fed4ef8a adding resource test 2014-10-26 17:53:22 -03:00
Ezequiel Bergamaschi
728e8d7f38 comment tests setup in order to fix the continous build 2014-10-07 01:25:35 -03:00
Ezequiel Bergamaschi
e5b1e17e1f mindplot integrated with jasmine, dummy test uploaded 2014-10-07 01:17:23 -03:00
Ezequiel Bergamaschi
a814366058 some additional assertion 2014-10-07 01:16:56 -03:00
Ezequiel Bergamaschi
6de0b2d183 symb links for tests 2014-10-07 01:16:41 -03:00
Ezequiel Bergamaschi
fdd3b484fc remove unless dependency 2014-09-28 16:33:21 -03:00
Ezequiel Bergamaschi
10c596e95c use old jquery version since htmlunit does not support jquery 2.1.0 yet 2014-09-27 15:58:15 -03:00
Ezequiel Bergamaschi
b83e45e406 adding development jquery source 2014-09-27 15:57:46 -03:00
Ezequiel Bergamaschi
5412e1aaaa change webDriver since htmlunit throws error with jquery 2014-09-27 15:15:35 -03:00
Ezequiel Bergamaschi
98d9d877a2 unit testing for events 2014-09-27 14:35:49 -03:00
Ezequiel Bergamaschi
27149b0870 reducing functionality of Events class 2014-09-27 14:35:40 -03:00
Ezequiel Bergamaschi
e65eb3131b Merge branch 'feature/WISE-214-JasmineTests' into feature/remove_mootols 2014-09-26 23:24:47 -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
3026504110 Merge remote-tracking branch 'origin/develop' into feature/WISE-214-JasmineTests 2014-09-25 03:10:05 -03:00
Ezequiel Bergamaschi
81468c2e04 fix thumbnail service is down 2014-09-25 00:18:03 -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
4c94f44f3c replace old event.control and event.meta by event.ctrlKey and event.metaKey 2014-09-21 18:34:45 -03:00
Mariela Michalek
b7e5500e96 update remove button for editors 2014-09-14 18:32:18 -03:00
Ezequiel Bergamaschi
0dc7ead2a9 BootstrapDialog improvements and design 2014-09-14 17:45:11 -03:00
Ezequiel Bergamaschi
144a5061a3 change thumbnails service due to service is down 2014-09-12 02:01:19 -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