Paulo Gustavo Veiga 9a1c0fe46d Merge branch 'develop' into feature/WISE-16-remove_user ...

Conflicts:
	wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
	wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java

2014-01-25 11:33:31 -03:00

..

dao

api rest call

2014-01-24 00:21:43 -03:00

exceptions

Fix missing message.

2013-04-05 20:49:17 -03:00

exporter

Mindmap loading is lazy.

2013-03-30 01:09:28 -03:00

filter

Add firefox 20 support.

2013-04-04 20:39:11 -03:00

importer

Fix freemind import/export notes.

2012-12-01 17:22:54 -03:00

listener

Fix unlock issues.

2013-04-07 12:27:45 -03:00

mail

Handle deleted maps propertly.

2013-03-29 21:09:28 -03:00

model

Enable MindmapController rests.

2014-01-25 03:13:51 -03:00

rest

Merge branch 'develop' into feature/WISE-16-remove_user

2014-01-25 11:33:31 -03:00

security

Complete mindjet integration.

2013-03-29 11:49:59 -03:00

service

Revert "Bug WISE-16 fixed. Backed completed."

2014-01-10 00:21:21 -03:00

util

Fix i18n encodding issue.

2012-11-19 22:47:20 -03:00

validator

Update copyright year.

2012-11-01 21:35:01 -03:00

view

Try to fix issues with encoding.

2012-11-28 21:45:13 -03:00

webmvc

Add debung info for exceptions....

2013-03-29 22:44:13 -03:00