Brian Talbot
|
7b75703556
|
resolving Sass issues caused by previous merge conflict resolution in branch
|
2013-01-03 11:44:09 -05:00 |
|
Don Mitchell
|
4f32d5f34d
|
Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor
Conflicts:
cms/static/sass/_assets.scss
cms/static/sass/_base.scss
cms/static/sass/_unit.scss
cms/templates/unit.html
|
2013-01-02 17:39:27 -05:00 |
|
Tom Giannattasio
|
75c4909785
|
added modal cover for editors
|
2012-12-13 11:28:59 -05:00 |
|
Tom Giannattasio
|
af908104df
|
fixed html tab; started adding upload within widget
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
c233740057
|
cleaning up of asset widget; html tab is broken
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
8abf93cc36
|
search and upload button added to widget
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
9613f92fad
|
asset widget inserts into tiny
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
f16e7b2ede
|
added asset library widget template
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
005cf66e2e
|
removed box shadow on embed xmls
|
2012-10-17 15:20:03 -04:00 |
|
Tom Giannattasio
|
e9b42d7a15
|
added embeddable xml input text to modal
|
2012-10-17 15:10:06 -04:00 |
|
Tom Giannattasio
|
edacd22c16
|
added xml embed text field to table
|
2012-10-17 15:07:44 -04:00 |
|
Lyla Fischer
|
f06c67ef08
|
added embeddable links
|
2012-10-11 11:59:17 -04:00 |
|
Tom Giannattasio
|
24247dc0b9
|
cross-browser css3
|
2012-10-05 10:29:36 -04:00 |
|
Tom Giannattasio
|
3bb5a003bc
|
asset library styles
|
2012-10-03 11:26:30 -04:00 |
|
Tom Giannattasio
|
44d4a4b0d9
|
started asset library template -wip
|
2012-10-02 17:02:47 -04:00 |
|