Mario Visic
|
5f893d51c0
|
Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
Gemfile
Gemfile.lock
config/initializers/will_paginate.rb
lib/locomotive/engine.rb
lib/locomotive/hosting/bushido/account_ext.rb
lib/locomotive/hosting/bushido/enabler.rb
lib/locomotive/hosting/bushido/hooks.rb
|
2011-11-20 21:08:23 +11:00 |
|
Mario Visic
|
ad0adc7153
|
Added a cucumber feature to paginate through models.
|
2011-11-05 19:10:26 +11:00 |
|
did
|
cdab48f0a9
|
isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext
|
2011-11-01 00:44:23 +01:00 |
|
did
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |
|
Mario Visic
|
2bb9f5ed05
|
Revert "Arrays now paginate correctly."
This reverts commit 25441ff60a.
|
2011-10-24 23:34:43 +08:00 |
|
Mario Visic
|
25441ff60a
|
Arrays now paginate correctly.
|
2011-10-24 22:35:21 +08:00 |
|
Alex Sanford
|
88fd17a5aa
|
Fixed issue with tablerow tag
|
2011-08-19 10:10:26 -03:00 |
|
did
|
a9b6c234e7
|
fix issue #150
|
2011-07-28 16:42:16 +02:00 |
|
Dirk Kelly
|
6070da8a5c
|
added some helper methods to content_types liquid drops (via @KarlBright)
|
2011-02-25 11:47:12 +08: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
|
7cb26a74d4
|
fix bug with pagination + add _permalink property for content instances
|
2010-10-26 15:06:57 +02:00 |
|
dinedine
|
eabe4903f3
|
refactor locomotive liquid drops + implement the theme or site import page (95% done)
|
2010-09-29 00:08:11 +02:00 |
|
Jacques Crocker
|
a09329c030
|
Cleaning whitespace on all .rb files so commit diffs from now on will be a bit more readable
|
2010-07-23 13:09:54 -07:00 |
|
dinedine
|
b8dd3e772e
|
bug fixes
|
2010-06-24 11:14:08 +02:00 |
|
dinedine
|
b7e1cd0926
|
categories in content types have been improved a lot + cross-site session + meta keys / description for site + clean code + fix bugs
|
2010-06-16 16:43:29 +02:00 |
|
dinedine
|
7ccc3d4548
|
very simple api for contents (just create for now) + fix a lot of bugs in the custom fields plugin and some enhancements as well + add an ui for manage categories + fix bugs
|
2010-06-10 15:30:22 +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 |
|