6 Commits

Author SHA1 Message Date
Mariela Michalek
f22c0de2ad update bootstrap modal dialog 2014-04-01 07:24:00 -03:00
Ezequiel Bergamaschi
572eb44e7a Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport
Conflicts:
	wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css
	wise-webapp/src/main/webapp/bootstrap/css/bootstrap.min.css
	wise-webapp/src/main/webapp/css/mindmapList.less
	wise-webapp/src/main/webapp/js/mindmapList.js
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp
2014-02-10 01:07:50 -03:00
Paulo Gustavo Veiga
726ffcd817 First corrections.
Fix more styling issues.

Conflicts:
	wise-webapp/src/main/webapp/jsp/accountSettings.jsp
2014-02-09 03:26:51 -03:00
Ezequiel Bergamaschi
deb6c4be4d bootstrap color picker plugin 2014-01-27 23:48:11 -03:00
Ezequiel Bergamaschi
871d89a304 blue icon on mindmap list 2014-01-19 22:39:44 -03:00
Paulo Gustavo Veiga
73c99fe252 Start replacing JQuery UI for Bootstrap. 2012-05-16 01:36:02 -03:00