Commit Graph

109 Commits

Author SHA1 Message Date
Paulo Gustavo Veiga
59f0ed5793 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-21 13:10:07 -03:00
Paulo Gustavo Veiga
1e4d88fa55 Replace version to the next SNAPSHOT 2015-02-06 23:07:44 -03:00
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
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
0d20938506 still removing .bind(this) usages 2014-12-26 18:07:31 -03:00
Ezequiel Bergamaschi
00ab6fd61a adding tests to suite 2014-10-26 18:43:30 -03:00
Ezequiel Bergamaschi
429f335001 jasmine framework configured for mindplot 2014-10-26 17:53:57 -03:00
Ezequiel Bergamaschi
e5b1e17e1f mindplot integrated with jasmine, dummy test uploaded 2014-10-07 01:17:23 -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
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
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
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
001f62b539 fixing Options problem 2014-05-16 00:27:57 -03:00
Ezequiel Bergamaschi
cd5ed0414e adding configuration for mindplot module 2014-04-10 01:06:50 -03:00
Ezequiel Bergamaschi
4bcea1363e removing fixme 2014-03-15 03:56:10 -03:00
Ezequiel Bergamaschi
8115b50556 adding Events mootool class 2014-03-15 03:55:42 -03:00
Ezequiel Bergamaschi
c89a27e62e Dummy Keyboard class 2014-03-09 01:45:53 -03:00
Paulo Gustavo Veiga
f9d1e869b0 Move to WiseMapping 3.1 2013-03-28 17:06:34 -03:00
Pablo Luna
9e7f289a9e removing Google Brix... no further comments 2013-03-14 23:57:38 +00:00
Paulo Gustavo Veiga
7960c0a419 Finsh CA Integrationb. 2013-02-22 20:49:20 -03:00
Paulo Gustavo Veiga
be545d7103 Add german message bundle. 2012-11-16 23:44:23 -03:00
Paulo Gustavo Veiga
a74efa4647 Merge branch 'master' into db-purge
Conflicts:
	mindplot/src/main/javascript/MainTopic.js
	wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
	wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
2012-11-04 01:38:52 -03:00
Paulo Gustavo Veiga
2d58e9a0f5 Temporal commit. 2012-11-01 21:35:01 -03:00
Paulo Gustavo Veiga
d2f9749d61 - Refactor node properties to topics. 2012-09-21 09:34:33 -03:00
Paulo Gustavo Veiga
dcd15d8fa4 Fix resources generation bug
Add support for try.
2012-08-23 22:07:37 -03:00
Paulo Gustavo Veiga
4891fbb024 Generate convertor for properties files to js. 2012-08-21 23:05:55 -03:00
Paulo Gustavo Veiga
8da65a9102 Fix error connecting to the central node. 2012-07-06 23:59:54 -03:00
Paulo Gustavo Veiga
2757a5ddb4 Add 18n support to the editor. 2012-07-01 17:25:34 -03:00
Paulo Gustavo Veiga
9a9837af35 Improve JS compilation times. 2012-03-22 02:02:27 -03:00
Paulo Gustavo Veiga
f82f024fb7 Add support for click event node registration. 2012-03-20 08:56:20 -03:00
Paulo Gustavo Veiga
ce53e8e726 Add tooltip to menu. 2012-03-19 23:29:52 -03:00
Paulo Gustavo Veiga
7c10b00435 Topic editor can be configured based on the shape type. 2012-03-07 23:53:03 -03:00
Paulo Gustavo Veiga
ae9f05dd05 Use FX class for delete node events. 2012-03-07 20:35:06 -03:00
Paulo Gustavo Veiga
7ba0e36cb9 Introduce the convept of Feature to a topic. 2012-02-27 18:49:58 -03:00
Paulo Gustavo Veiga
9e44804314 Move persistence clases to persistence package. 2012-02-25 23:34:57 -03:00
Paulo Gustavo Veiga
7b6cae0fd2 - Add missing changes. 2012-02-21 15:37:15 -03:00
Paulo Gustavo Veiga
5fd6ba30f5 - Migrate to Spring 3.1
- Remove Acegy
- Fix editor partially
2012-02-12 02:55:42 -03:00
Paulo Veiga
6f7567abea More refactors. 2012-02-04 12:51:50 -03:00
Paulo Veiga
69b36bed75 Rename wise-doc to wise-editor. 2012-01-30 23:33:05 -03:00
Paulo Veiga
00ca42f7fe Remove layout harcodes. 2012-01-30 20:17:47 -03:00
Paulo Veiga
0e07e28b4c Add migrator for Pela to Tango 2012-01-21 18:02:38 -03:00
Paulo Veiga
c7ddfd6135 nlayout refactor. 2012-01-14 14:20:59 -03:00