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 |
|
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
|
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
|
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 |
|
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 |
|
Jacques Crocker
|
e09a3210c7
|
Trying out the rails3 branch of formtastic. Seems to work well.
|
2010-07-23 16:07:31 -07:00 |
|
Jacques Crocker
|
baf5b87a7d
|
Ruby-debug is fairly useful to have on test and debug environments
|
2010-07-23 13:04:27 -07:00 |
|
dinedine
|
35e0120cab
|
fix js bug when changing layout in page editing + improve nav tag
|
2010-07-22 01:35:30 +02:00 |
|
dinedine
|
b2c39b4137
|
updating Rails to beta 4 + mongoid to beta 9 + fix all broken parts caused by the upgrade
|
2010-07-20 12:15:53 +02:00 |
|
dinedine
|
0671a55ef8
|
sitemap + use inherited_sources gem to refactor controllers + fix bugs + clean stuff + save some forms with CMD + S (in progress)
|
2010-07-13 02:46:17 +02:00 |
|
dinedine
|
4e2e6411f3
|
fix liquid gem version + require httparty + bump to 0.0.2.8
|
2010-07-06 23:44:24 +02:00 |
|
dinedine
|
96e4753ed6
|
specify MIT license + textile filter + fix bug with new tree plugin + fix tests
|
2010-07-06 17:00:02 +02:00 |
|
dinedine
|
c38a8ff9dd
|
adding 2 new liquid tags: consume (to retrieve posts from a blog for instance) + nav (display children of a page) + fix a few bugs
|
2010-07-06 02:05:47 +02:00 |
|
dinedine
|
c5b5c6ded4
|
move patches for mongoid / carrierwave + add patch for mongoid + clean stuff
|
2010-06-30 00:09:47 +02:00 |
|
dinedine
|
d685fb526c
|
trying to fix an issue with cucumber tests
|
2010-06-24 13:12:39 +02:00 |
|
dinedine
|
5d7ee3cf67
|
fix gem versions
|
2010-06-24 12:11:13 +02:00 |
|
dinedine
|
29c22c05c1
|
heroku support + fix minor bugs
|
2010-06-14 15:04:01 +02:00 |
|
dinedine
|
fe96fbdaa2
|
Change version of the mongo_session_store gem + clean code
|
2010-06-11 11:23:20 +02:00 |
|
dinedine
|
f567b7754f
|
change devise config in routes.rb + clean code + fix broken tests
|
2010-06-11 00:07:59 +02:00 |
|
dinedine
|
fc690d8a0b
|
rename CustomFields::CustomField into CustomFields::Field + create a dynamic class when we have an object with custom fields (optimization) + create a new type of custom field: categories + fix minor bugs + add ui to rename the alias of a custom field
|
2010-06-08 02:45:49 +02:00 |
|
dinedine
|
9b87be4637
|
patch for http://github.com/plataformatec/devise/issues/issue/206
|
2010-06-04 01:53:59 +02:00 |
|
dinedine
|
3d22ef4d1c
|
modify the way locomotive setups a mongo connection
|
2010-06-04 00:55:04 +02:00 |
|
dinedine
|
9e7d1d3a08
|
make an engine of the cms
|
2010-06-03 17:32:40 +02:00 |
|
dinedine
|
9447386f0e
|
rendering engine + liquid tags/drops/filters + rspec tests + fix small bugs
|
2010-05-31 01:57:33 +02:00 |
|
dinedine
|
05a93cb5c1
|
custom fields proof of concept in progress
|
2010-05-19 18:17:45 +02:00 |
|
dinedine
|
e5c10cfa3e
|
theme assets
|
2010-05-11 23:38:52 +02:00 |
|
dinedine
|
a0216dc75f
|
first cucumber features + crud for pages (95% done)
|
2010-05-09 14:44:53 +02:00 |
|
dinedine
|
ae20b51636
|
page acts as tree / list + improve validations
|
2010-04-30 16:05:53 +02:00 |
|
dinedine
|
0d606852ef
|
beautiful login page is up
|
2010-04-23 01:52:11 +02:00 |
|
dinedine
|
710e2bba29
|
customizing devise
|
2010-04-13 16:26:40 +02:00 |
|
dinedine
|
0db6b9625f
|
add cucumber to the projet (waiting for the first scenari)
|
2010-04-13 01:33:25 +02:00 |
|
dinedine
|
3b8a6c67df
|
add validations to site
|
2010-04-10 17:25:07 +02:00 |
|
dinedine
|
ff6fcf43f1
|
clean code + rspec works smoothly now
|
2010-04-09 14:03:54 +02:00 |
|
dinedine
|
4e16509531
|
current testing context
|
2010-04-09 12:22:38 +02:00 |
|
dinedine
|
cd67a29b88
|
working stack ?
|
2010-04-09 11:23:41 +02:00 |
|
dinedine
|
a9fb66f9c1
|
first init
|
2010-03-30 00:01:47 +02:00 |
|