Commit Graph

95 Commits

Author SHA1 Message Date
did
94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
dinedine
6ac4ff0393 revert a piece of the theme assets refactoring + upgrade Gemfile as well as the gemspec 2011-02-04 11:18:34 +01:00
dinedine
c178346969 fix the creation of theme assets (and add tests of course) + upgrade Gemfile + remove the mongoid patches 2011-02-04 10:39:23 +01:00
Keith Pitt
124bacba6b Let bundler decide the best version to use 2011-02-04 16:29:12 +08:00
Keith Pitt
a6872b60ef Upgrade fog 2011-02-04 16:26:52 +08:00
Keith Pitt
cad4471995 Use an old version of fog that carrierwave supports 2011-02-04 14:41:51 +08:00
Keith Pitt
d9396cc9ef Downgraded delayed job to use a version that supports mongoid 2.0.0.beta19 2011-02-04 14:35:09 +08:00
dinedine
dbf5680770 wrong custom_fields version 2011-01-27 17:12:23 +01:00
dinedine
56059b6579 gems dependency with mongoid was messy 2011-01-27 15:34:33 +01:00
dinedine
92ec43b2e0 Gemfile updated 2011-01-27 15:01:03 +01:00
dinedine
69c9dbbbcf new Gemfile + fixing broken tests + improve the way we fetch the sicurrent te when serving fonts 2011-01-26 14:07:33 +01:00
dinedine
415ce9fb82 bson_ext is now in 1.2.0 + add lastmod for the sitemap xml + fix issue #19 2011-01-21 12:04:59 +01:00
dinedine
c828301f37 fonts did not work when stored in amazon s3 2011-01-03 21:53:33 +01:00
dinedine
87caa55b80 rspec 2.3 2010-12-19 21:27:32 +01:00
dinedine
9bcebbd6ab pickle as a gem 2010-12-17 11:58:59 +01:00
dinedine
727a824745 prepare locomotive as a gem 2010-12-16 13:39:05 +01:00
dinedine
e6226abece use jammit to compress stylesheet/javascript files 2010-12-14 18:00:12 +01:00
dinedine
bbb09b58cf ruby 1.9.2 compliant 2010-11-08 18:42:14 +01:00
Jacques Crocker
2d4f77c5ca Fix up Gemfile for Ruby 1.9.2 2010-11-04 17:07:03 -07:00
dinedine
cc0b50e22e add rspec tests for the import module + debug the cms to handle correctly the default theme 2010-10-29 01:36:45 +02:00
dinedine
c1b21fac8b use BSON::ObjectId to find elements (asset collection, content type) + make the import module work with S3 2010-10-19 12:20:09 +02:00
dinedine
344a737b9a clean code + fix gem requirements for the engine version of this app 2010-10-17 03:18:41 +02:00
dinedine
a03dd77a65 update gem dependencies + gemspec + liquid tags (stylesheet_tag, ...etc) work with amazon S3 2010-10-16 11:27:26 +02:00
dinedine
acaf997b6e build locomotive engine as a gem 2010-10-15 02:05:21 +02:00
dinedine
3863272ced finish to merge + tweak minor stuff 2010-10-14 16:01:18 +02:00
dinedine
282fbb7244 merging 2010-10-14 14:37:14 +02:00
dinedine
c9c2b5d26c update gems 2010-10-14 00:39:15 +02:00
dinedine
bab4577de0 fixing failed tests 2010-10-12 17:26:05 +02:00
dinedine
2f4128bf8f refactoring theme assets in progress 2010-10-10 16:37:34 +02:00
Jacques Crocker
350aee82a8 Vendoring mongo_session_store so we have one less dependency 2010-09-28 02:19:55 -07:00
Jacques Crocker
cc4c9ea4e9 update to latest custom_fields 2010-09-28 02:03:51 -07:00
Jacques Crocker
3d42e87da6 revert carrierwave 2010-09-28 01:30:31 -07:00
Jacques Crocker
d512e33d03 bundler needs help. removing gemspec helepr for now 2010-09-28 00:18:10 -07:00
Jacques Crocker
ea562978fe Reverting back to cucumber 0.8.5 (dependency conflict issues) 2010-09-27 23:57:22 -07:00
Jacques Crocker
ea4c09c7ce Updating dependencies, removing jeweler, and cleaning up gemspec 2010-09-27 23:04:40 -07:00
dinedine
9a722c4268 working on importing pages 2010-09-24 01:00:13 +02:00
dinedine
39886427e0 first and unfinished draft of the import tool 2010-09-23 00:59:30 +02:00
dinedine
1e1c3bd97b haml always in ugly mode + refactor theme files section in admin 2010-09-22 14:50:01 +02:00
dinedine
f7cfcf450e now working with Rails 3.0 and the last Mongoid gem 2010-09-01 16:26:00 +02:00
dinedine
d2ca6254b3 clean code + use the last version of locomotive liquid 2010-09-01 00:04:21 +02:00
dinedine
35b4e5358c editable_file tag is implemented + remove not used editable elements all in once for better performance + default content inherits from the content of the parent element 2010-08-31 23:53:30 +02:00
dinedine
335d7a1aac fix a major bug when updating template children which have the same parent + remove debug output + rspec tests pass 2010-08-31 01:56:54 +02:00
dinedine
af5fe62d89 clean and improve the ui concerning the editable elements of a page + fix bugs and refactor a bit 2010-08-28 02:00:05 +02:00
dinedine
eea6d4f8ce add some tests for the editable_elements feature + fix bugs 2010-08-26 13:06:44 +02:00
dinedine
be36c85e90 implementation of editable_short_text in progress (tests failed) 2010-08-25 00:59:22 +02:00
dinedine
e25ded881b custom fields has its own repo + upgrade code for Mongoid beta 16 + clean code + fix rspec tests 2010-08-20 17:56:15 +02:00
dinedine
53500bda9e first draft of the new template inheritance mechanism based on our fork of Liquid 2010-08-20 02:31:01 +02:00
dinedine
cf3a177580 move to liquid 2.1.2 2010-08-04 15:12:14 +02:00
dinedine
c76cd6527c merge 2010-08-02 16:16:08 +02:00
dinedine
d973868a06 merge + fix tiny bugs 2010-08-02 13:45:50 +02:00