Paulo Gustavo Veiga a8f7d28c11 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

..

bootstrap

Start replacing JQuery UI for Bootstrap.

2012-05-16 01:36:02 -03:00

css

Login page completed.

2013-03-17 16:39:50 -03:00

doc/rest

Bug WISE-190 fixed.

2014-01-24 09:45:22 -03:00

images

Resources moved to https.

2014-01-02 18:34:14 -03:00

js

Login page completed.

2013-03-17 16:39:50 -03:00

jsp

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

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

META-INF

Remove trunk directory

2009-11-06 23:30:29 -02:00

WEB-INF

Fix mindmaping controller tests.

2014-01-25 04:21:59 -03:00

favicon.ico

Add Google Analitycs to the footer.

2012-07-03 00:04:44 -03:00

index.html

Add support for homepage configuration.

2012-09-01 14:38:19 -03:00

index.jsp

Add support for homepage configuration.

2012-09-01 14:38:19 -03:00