cahrens 731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce ...

Conflicts:
	cms/static/css/tiny-mce.css

2013-01-22 16:15:27 -05:00

..

client_templates

styling - settings layout and delete buttons

2012-12-13 13:35:58 -05:00

coffee

Handle metadata from save being empty

2013-01-11 10:39:57 -05:00

css

Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce

2013-01-22 16:15:27 -05:00

img

revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet

2013-01-13 12:47:30 -05:00

js

Fix bug related to img link for non-img files.

2013-01-16 13:51:17 -05:00

sass

Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce

2013-01-22 16:15:27 -05:00