Commit Graph

157 Commits

Author SHA1 Message Date
did
d2f6cc0c53 has_many ui has been implemented 2011-05-19 17:44:04 +02:00
did
7dfce2c336 migration to mongoid 2.0.1 2011-05-16 23:06:46 +02:00
did
7dafc66359 typo for the french translation of the italian locale + right italy flag 2011-05-07 13:48:49 +02:00
did
6dd810b44e new custom_fields gem version as well as an heroku patch to fix the weird issue about json/heroku 2011-05-01 00:28:25 +02:00
did
483dfc350b merging sgrove-master into master 2011-04-27 16:09:21 +02:00
did
8b27880df3 new actionmailer-with-request gem 2011-04-27 00:50:47 +02:00
did
b58e49fce2 make locomotive work with bushido + refactor some portions of code (routing constraints, ...etc) + fix broken tests 2011-04-25 01:21:38 +02:00
did
e03d7b5dcc smoother integration with bushi.do 2011-04-07 01:34:36 +02:00
did
2cba14afec do not run the locomotive core initializer if engine 2011-04-06 01:29:11 +02:00
did
9ec642136f debugging the heroku deployment 2011-04-06 00:56:44 +02:00
did
551ef03ff6 simply the installation screens + fix all the broken tests + add tests for bushido 2011-04-05 02:18:17 +02:00
dinedine
7b30c34a9b forgot to commit Gemfile.lock as well 2011-04-04 02:14:00 +02:00
dinedine
c0a5a4b443 single site / multi sites option in progress + integrating bushi.do + revert back to mongoid rc.7 2011-04-04 01:59:41 +02:00
did
551d8a5761 big refactoring of the locomotive config file in order to handle bushido / single / multi sites, ...etc 2011-04-01 02:34:19 +02:00
did
031113799e a little bit of refactoring 2011-03-28 01:49:12 +02:00
did
ce5f0de165 new version of the custom fields gem 2011-03-22 20:51:10 +01:00
did
d270bf8f69 new custom_fields gem 2011-03-20 21:12:40 +01:00
did
1e5624ce06 fix js bugs 2011-03-20 11:21:07 +01:00
did
38f828a83a new gem versions 2011-03-17 17:54:46 +01:00
did
a66e745746 fix bug #52 2011-03-17 17:41:25 +01:00
did
63530a3a30 still a problem with the last heroku gem (json) + fix an issue with invalid assets 2011-03-10 02:59:35 +01:00
did
78715ddf1e fix issue #48 2011-03-08 16:39:14 +01:00
did
e4b34eac3f patch mongoid to enable the limit option for embedded collections + ui widget to allow more than 5 custom models in the content section 2011-03-08 16:05:07 +01:00
Dirk Kelly
44f84c266b merge 2011-03-07 19:59:02 +08:00
did
f9aac40298 upgrade gems (carrierwave and custom_fields) 2011-03-06 00:17:50 +01:00
did
d3abdd3f37 refactor the asset collections part + disable the image processing for non image assets (use a newer version of locomotive carrierwave for that purpose) 2011-03-05 23:27:26 +01:00
Dirk Kelly
af59f2ea7e rails 3 upgrade 2011-03-04 17:53:02 +08:00
did
f0ee8a7b37 new menu layout in CSS3 and SASS (will make our life easier when integrating new modules) 2011-03-03 23:51:07 +01:00
Dirk Kelly
ba6ce5c861 updates to gem versions 2011-02-22 00:46:10 +08:00
did
bd992cc882 fix issue #37 plus other ones related to theme assets and assets 2011-02-19 00:51:57 +01:00
did
3e5e5d5ba9 add seo_metadata liquid tag (Mario) 2011-02-13 14:40:49 +01:00
did
886d67b2a3 wrong Gemfile + define default task rake (rspec + cucumber) 2011-02-12 20:22:11 +01:00
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
2402ef2cd4 positions for the index and not found pages were messed up when importing site 2011-02-03 11:22:19 +01:00
Dirk Kelly
36053733f7 gem updates 2011-02-01 14:39:25 +08:00
dinedine
e896618c99 fix minor ui issue in the theme assets section 2011-01-29 17:24:37 +01: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
23ce90eab1 clean the TODO list 2011-01-18 00:28:09 +01:00
dinedine
ff01539bb5 date in content types compatible with ruby 1.9.2 2011-01-11 00:50:42 +01:00
dinedine
3ee566eae6 add missing stylesheet for the asset collections section in the back-office 2011-01-07 14:50:53 +01:00
dinedine
c828301f37 fonts did not work when stored in amazon s3 2011-01-03 21:53:33 +01:00
dinedine
56a7a09903 minor stuff 2011-01-03 14:44:38 +01:00
dinedine
8d610dee49 Importing theme works with ruby 1.9.2 + clean code 2010-12-27 12:59:54 +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
62564021b6 the theme import module can work without delayedjob + fix bugs 2010-12-17 00:42:38 +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
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
dinedine
a5ea70229c allows to disable import sub tasks + new images tag logic (in progress) + handle errors when importing 2010-09-28 10:09:49 +02: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
Didier Lafforgue
e31012f861 fix a lot of tiny bugs (not yet) + testing import tool 2010-09-27 00:31:50 +02: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
2e4a15a511 new image plugin for tinymce 2010-09-15 02:19:34 +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
Jacques Crocker
46b889b54b Updating Mongoid version 2010-08-01 02:54:51 -07:00
Jacques Crocker
0607be09ab Remove broken envjs and tweak cucumber environment 2010-07-31 01:27:21 -07:00
Jacques Crocker
cdb5dc22f2 Updating haml in the hope it would fix some stuff (it didnt) 2010-07-30 20:57:57 -07:00
Jacques Crocker
560923f060 Adding growl glue to Gemfile for better growl alerts with autotest 2010-07-30 17:22:58 -07:00
Jacques Crocker
1f463d715c Adding Pickle, and rearranging cucumber support/ folder a bit 2010-07-30 17:02:29 -07:00
Jacques Crocker
8cddd6cb80 Some more dependency updates (devise and rspec-rails) 2010-07-30 14:34:35 -07:00
dinedine
09ed7ee152 updating gems 2010-07-30 01:39:01 +02:00