Marko Iskander
02ea6913e3
Merge branch 'master' into wildcards
...
Conflicts:
Gemfile.lock
app/assets/javascripts/locomotive/models/page.js.coffee
app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee
app/models/locomotive/extensions/site/locales.rb
app/models/locomotive/page.rb
app/views/locomotive/pages/_form.html.haml
config/initializers/haml.rb
config/locales/default.ru.yml
config/locales/formtastic.ru.yml
doc/TODO
lib/locomotive/haml.rb
script/upgrade_v1.rb
spec/dummy/config/initializers/haml.rb
2012-05-22 20:39:30 -04:00
Annalisa
043b78a061
strange error
2012-04-21 01:50:37 +02:00
Annalisa
fc380e3e4d
strange error
2012-04-21 01:31:33 +02:00
Annalisa
b87c76bc67
added current_user
2012-04-21 00:54:54 +02:00
Didier Lafforgue
9b4fc56e82
fix issue #360
2012-04-19 16:30:16 +02:00
Didier Lafforgue
e26febdaf6
refactoring (wip)
2012-04-06 12:23:11 +02:00
Didier Lafforgue
3f6e7acda6
fix issue #333
2012-03-28 17:33:20 +02:00
Didier Lafforgue
cfbe68564d
fixed editable elements (wip)
2012-03-19 02:29:59 +01:00
Didier Lafforgue
9a9f270d99
fix issue #317 + with_scope works now with has_many relationships + clean code
2012-03-12 03:09:20 +01:00
Paul Sponagl
b13c5d1d40
added a snippet option to the liquid nav tag
...
this is useful if you want to render more than
just a page.title string within the nav list item.
(page.menue_image, page.menue_teaser...)
use nav snippet: "<liquid snippet>" to provide a string
or nav snippet: "<snippetname>" to load the snippet from db.
added page.<editable_field> for usage within liquid templates
2012-03-07 16:32:25 +01:00
Didier Lafforgue
989f608755
change the default way to config AWS for carrierwave + fix issue #299
2012-03-02 01:46:02 +01:00
Didier Lafforgue
dd9b382637
alpha version of the upgrade script (good results with my existing locomotive sites) + fix bugs according to my tests with my existing live websites + remove useless code (polishing)
2012-02-20 01:15:43 +01:00
Didier Lafforgue
085a54d7c1
introduce the proxy collection liquid drop so that we can paginate for real + fix the cucumber features for the public part of the engine
2012-02-17 00:51:33 +01:00
Didier Lafforgue
6619d4e5dc
all the non-models specs have been fixed
2012-02-16 02:45:14 +01:00
did
dfd437a762
fix an issue with compass + move to rails 3.2 + switch from mongoid_acts_as_tree to mongoid_tree + implement the UI to deal with has_many field types (wip)
2012-02-01 02:01:42 +01:00
did
c0b8587eb2
rename the i18n site module into locales in order to avoid conflicts with the original i18n + rendering a page according to a locale specified in the url seems to work (tests are following)
2012-01-26 02:33:39 +01:00
Mario Visic
75b0137230
Merge remote-tracking branch 'origin/master' into rails_3_1
...
Conflicts:
Gemfile
Gemfile.lock
features/support/env.rb
locomotive_cms.gemspec
spec/cells/locomotive/global_actions_spec.rb
spec/cells/locomotive/main_menu_cell_spec.rb
spec/cells/locomotive/settings_menu_cell_spec.rb
2012-01-14 16:37:24 +10:30
did
4c204ef6a6
refactor and clean code (wip) + the api controller has been deleted and replace by the entry_submission_controller (+ custom responder)
2012-01-09 06:49:59 -08:00
did
0f1b4f59d3
listing all entries (done) + fix bugs + tweak ui
2012-01-04 02:07:53 +01:00
did
e9ef4d48c3
content_instance becomes now content_entry with its shortcut content_type.entries + change references to the old custom_fields API
2011-12-23 00:45:32 +01:00
did
47625dfa17
refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip)
2011-11-25 02:04:42 +01:00
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
did
a3f66e19b5
fix issue #243 (Kaminari causing error on Bushido)
2011-11-05 15:18:15 +01:00
Mario Visic
ad0adc7153
Added a cucumber feature to paginate through models.
2011-11-05 19:10:26 +11:00
Mario Visic
c3c5d8e754
Tests are passing for has many pagination with Kaminari.
2011-11-05 18:42:04 +11:00
Mario Visic
06ab49ecec
Replaced will_paginate with kaminari
2011-11-05 16:45:43 +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
786d2d9693
Added will paginate to liquid.
2011-10-24 23:44:35 +08: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
Rytis Lukoševičius
6b9d2317da
adding .published? and .listed? methods for the liquid Page drop class
2011-10-04 04:35:40 +03:00
Karl Brightman
769b0569db
Added examples
2011-09-16 11:37:48 +08:00
Karl Brightman
75f4835d3e
Integrated next and previous methods for content in content types
2011-09-16 11:35:40 +08:00
Alex Sanford
88fd17a5aa
Fixed issue with tablerow tag
2011-08-19 10:10:26 -03:00
Rytis Lukoševičius
69e24e8fe0
added .breadcrumbs method to Page drop. It gives all the ancestors of the page and the page itself
2011-08-14 11:34:57 +03:00
Rytis Lukoševičius
025d5a7dda
added .parent method to Page drop
2011-08-14 11:34:08 +03:00
did
a9b6c234e7
fix issue #150
2011-07-28 16:42:16 +02:00
did
1e465e231e
remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring
2011-07-04 19:40:14 +02:00
did
fa7e4c24d8
implement feature #57
2011-06-23 05:57:52 -07:00
did
f4d9acd282
fix the tests + finish the integration of Dragonfly + clean code
2011-06-20 17:39:59 -07:00
did
ecdb79bb2d
removing asset_collections: script + remove references in liquid
2011-06-20 04:25:17 -07:00
did
abcf4f684a
help to create public form with has_one field
2011-06-03 02:25:19 +02:00
did
91119bf54e
allow administrators to change the text displayed for each content in the back-office (documentation is coming)
2011-06-01 23:43:12 +02:00
AJ Schuster
f65cd0b2fc
Allows for page- and content instance-specific metadata.
...
Falls back to site metadata when not specified.
2011-04-29 16:10:13 -04:00
Dirk Kelly
70104e8f9d
Merge branch 'master' of github.com:locomotivecms/engine
2011-02-28 12:49:54 +08:00
did
ebc40d1682
the site drop has access to pages
2011-02-27 17:14:14 +01:00
Dirk Kelly
6070da8a5c
added some helper methods to content_types liquid drops (via @KarlBright)
2011-02-25 11:47:12 +08:00
dinedine
02039159d7
add getter to the size of an asset collection in liquid
2011-01-30 00:30:24 +01:00
dinedine
2e774b2a97
conflict between the index scope in the page model and the mongoid index method
2011-01-27 10:49:42 +01:00
