Commits
1.6
December 14, 2011
trying to restore css on format selection
0147cea
Oleg committed Dec 14, 2011
simple link dialog. good enough for now
fa0d3b2
Oleg committed Dec 14, 2011
small adjustment for js config
26ffc5a
Oleg committed Dec 14, 2011
Merge branch '1.6' of github.com:twg/comfortable-mexican-sofa into 1.6
389e351
Oleg committed Dec 14, 2011
Merge pull request #113 from bgilham/1.6
e7661d5
Oleg Khabarov committed Dec 14, 2011
only images are listed in the image dialog
61d6f2f
Oleg committed Dec 14, 2011
adjustments for file dialog
142efe1
Oleg committed Dec 14, 2011
significantly simplified files widget
a8958c9
Oleg committed Dec 14, 2011
Properly defining cms_config.
a85231f
Brian Gilham committed Dec 14, 2011
Cleaned up some extra junk.
3aa1991
Brian Gilham committed Dec 14, 2011
Changed user_options to cms_config and made it a hash.
b9be1d4
Brian Gilham committed Dec 14, 2011
Allows user to define multidimensional array to specify JS options.
57db837
Brian Gilham committed Dec 14, 2011
a bit of battling with paperclip
ef9bdfd
Oleg committed Dec 14, 2011
December 13, 2011
cleaning things up
5237e99
Oleg committed Dec 13, 2011
allowing image insertions from the urls
c34a8d4
Oleg committed Dec 13, 2011
upgrading jquery to 1.7.1
5dab932
Oleg committed Dec 13, 2011
cleaning up js a bit
22a6530
Oleg committed Dec 13, 2011
got image insertion to work
c713f89
Oleg committed Dec 13, 2011
December 12, 2011
relaxing gemfile for paperclip
a07f1f8
Oleg committed Dec 12, 2011
css workaround
0f31487
Oleg committed Dec 12, 2011
December 09, 2011
Merge branch 'elrte' into 1.6
ded27b1
Oleg committed Dec 09, 2011
adding Site#identifier, upgrade migration file
f935953
Oleg committed Dec 09, 2011
categories are scoped on sites
ccaa375
Oleg committed Dec 09, 2011
Tag#indentifier instead of #label
e0647da
Oleg committed Dec 09, 2011
December 04, 2011
Block#identifier instead of #label
1a2283e
Oleg committed Dec 04, 2011
December 03, 2011
snippet identifier, not slug
d02285b
Oleg committed Dec 03, 2011
layouts have identifiers, not slugs
2dc1f0d
Oleg committed Dec 03, 2011
November 22, 2011
travis should test against newest rails
ad141b7
Oleg committed Nov 22, 2011