Commit Graph

56 Commits

Author SHA1 Message Date
Pablol
18dfd82c1d Merge branch 'wise-doc' into collaboration
Conflicts:
	mindplot/pom.xml
	mindplot/src/main/javascript/DesignerActionRunner.js
	mindplot/src/main/javascript/DragTopic.js
	mindplot/src/main/javascript/MindmapDesigner.js
	wise-doc/src/main/webapp/html/editor.html
	wise-doc/src/main/webapp/js/editor.js
2011-08-07 19:51:55 -03:00
Pablol
bd888412f7 adding general collaboration framework and Brix 2011-08-07 19:27:23 -03:00
Paulo Veiga
36e44c13ca Improve toolbar and editor size. 2011-08-05 01:06:56 -03:00
Paulo Veiga
0b3083d50c Several fixes added. 2011-08-04 22:12:53 -03:00
Paulo Veiga
63cda0a170 Start working on ActionDispatcher migration. 2011-08-03 17:56:11 -03:00
Paulo Veiga
d4fefed545 Fix package names ... 2011-07-27 21:01:54 -03:00