Brian Federle 849d601ccf Merge branch 'master' into ui-restyle ... Conflicts: client/WEB-INF/classes/resources/messages.properties ui/dictionary.jsp ui/scripts/ui-custom/accountsWizard.js		2014-01-30 14:40:22 -08:00
..
css	multi-edit UI: Fix wrapping for multirange (start-end) fields	2014-01-28 11:55:43 -08:00
fonts/Noto_Sans	Add custom font for all UI text	2013-09-24 14:18:02 -07:00
images	Update socket icon	2014-01-28 10:25:57 -08:00
lib	Add plugin loading functionality and basic framework	2012-12-19 15:47:25 -08:00
modules	Merge branch 'master' into ui-restyle	2013-12-09 13:11:11 -08:00
plugins	Remove file added by accident in previous commit.	2013-09-30 10:08:16 -07:00
scripts	Merge branch 'master' into ui-restyle	2014-01-30 14:40:22 -08:00
stylesheets	Style detail multi-group	2013-10-16 16:02:06 -07:00
tests	List view: tests for filter dropdown	2014-01-28 15:48:44 -08:00
dictionary.jsp	Merge branch 'master' into ui-restyle	2014-01-30 14:40:22 -08:00
index.jsp	Merge branch 'master' into ui-restyle	2014-01-30 14:40:22 -08:00