GitBlixt

Commits

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