GitBlixt

Commits

dragonfly
December 22, 2011
trying out dragonfly
Oleg committed Dec 22, 2011
22d0e1a
enabling travis for rails 3.2
Oleg committed Dec 22, 2011
c568109
Merge branch 'master' of github.com:twg/comfortable-mexican-sofa
Oleg committed Dec 22, 2011
2ba742a
fixing deprecation warnings for rails 3.2 and moving upgrade migrations folder
Oleg committed Dec 22, 2011
a8ff763
fixing test for rails3.2
Oleg committed Dec 22, 2011
28ada7d
December 20, 2011
Update db/migrate/upgrades/07_upgrade_to_1_6_0.rb
Oleg Khabarov committed Dec 20, 2011
f7a194d
paperclip under rbx doesn't play nice and 3.2.0.rc1 fails a test
Oleg committed Dec 20, 2011
d3c01a6
adding rbx
Oleg committed Dec 20, 2011
e64a766
proper rails version plus enabling rbx again
Oleg committed Dec 20, 2011
0d649b4
adding travis config for 3.2
Oleg committed Dec 20, 2011
9d2fc81
Regenerate gemspec for version 1.6.2
Oleg committed Dec 20, 2011
b165b26
Version bump to 1.6.2
Oleg committed Dec 20, 2011
e4d7900
fixing incorrect datatype
Oleg committed Dec 20, 2011
4536cc5
December 19, 2011
forgot few things
Oleg committed Dec 19, 2011
6a44419
December 15, 2011
Regenerate gemspec for version 1.6.1
Oleg committed Dec 15, 2011
472d429
Version bump to 1.6.1
Oleg committed Dec 15, 2011
803feb8
removing ie specific css so asset pipeline works
Oleg committed Dec 15, 2011
cbc4c8a
Regenerate gemspec for version 1.6.0
Oleg committed Dec 15, 2011
12076a1
Version bump to 1.6.0
Oleg committed Dec 15, 2011
4f14455
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