Commit Graph

186 Commits

Author SHA1 Message Date
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
Jacques Crocker
071196e97b Upgrading to Rails3 rc 2010-07-29 16:21:48 -07:00
Jacques Crocker
42cc763553 Updating dependencies (mongoid beta.15 & carrierwave) 2010-07-29 13:26:36 -07:00
Jacques Crocker
4eea9855aa Fixing up Cucumber env (database_cleaner and envjs) 2010-07-26 01:19:42 -07:00
Jacques Crocker
1e79f5bcfd Updating devise to be compatible with latest mongoid 2010-07-26 00:59:02 -07:00
Jacques Crocker
c6240dd7eb Upgrading to Mongoid 2.0 beta 11 and fixing specs 2010-07-25 19:49:35 -07:00
Jacques Crocker
eb82548452 Fixing up dependencies (httparty/crack) and adding autotest 2010-07-25 18:59:03 -07:00
Jacques Crocker
be19ffbbed Updating RSpec to beta 18 (textmate support w00t!). Also checking in Gemfile.lock, as Yehuda will be mad at us if we dont ;-). 2010-07-25 17:42:11 -07:00