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
|
c3c5d8e754
|
Tests are passing for has many pagination with Kaminari.
|
2011-11-05 18:42:04 +11:00 |
did
|
87d2440f14
|
working on fixing issues with devise (wip)
|
2011-11-04 16:55:51 +01: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
|
e6abd6bbe0
|
Path fix for pagination.
|
2011-10-24 23:37:39 +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 |
did
|
718b3c67bb
|
improve the with_scope tag based on the work on the editor
|
2011-09-27 00:25:47 +02:00 |
did
|
71a592eec1
|
fix issue #177
|
2011-08-25 18:27:43 +02:00 |
did
|
e05586d387
|
write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook
|
2011-07-26 21:20:03 +02:00 |
did
|
770ae3a543
|
fix a couple of tiny bugs about: export, import and aloha
|
2011-07-13 11:14:44 +02:00 |
did
|
007f34ed8c
|
export didn't work when sub pages
|
2011-07-07 01:34:11 +02:00 |
Didier Lafforgue
|
bf4b2be2b9
|
Merge pull request #108 from corgibytes/variables-as-values
Enabled the use of variable values as the default values for editable con
|
2011-07-06 15:06:47 -07:00 |
M. Scott Ford
|
314c1293d9
|
Enabled the use of variable values as the default values for editable content.
|
2011-07-06 15:19:55 -04:00 |
Didier Lafforgue
|
43670714b9
|
Merge pull request #86 from mariovisic/hotfix/nested_snippets
Fix for issue #84 (Nested snippets)
|
2011-07-05 12:16:30 -07:00 |
did
|
fa7e4c24d8
|
implement feature #57
|
2011-06-23 05:57:52 -07:00 |
did
|
d4b7734003
|
fix issue #90
|
2011-06-23 01:14:36 -07:00 |
Mario Visic
|
8c62ec4dba
|
Small refactoring on the snippet tag constructor.
|
2011-06-02 22:34:06 +08:00 |
Mario Visic
|
684b1ddf5c
|
Nested snippets now update correctly, fixes #84
|
2011-06-02 21:56:05 +08: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 |
did
|
ea050afd5e
|
use absolute urls for the pagination links + allow developers to access the http params within a liquid template + the with_scope handles category fields
|
2011-04-29 01:16:40 +02:00 |
did
|
50f06a7b85
|
invalidate dynamic klass after an import + change the id of a link in the nav tag
|
2011-03-09 00:27:46 +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 |
did
|
c3cc358934
|
Merge branch 'multi-level-sub_menu' of https://github.com/dirkkelly/locomotive into dirkkelly-multi-level-sub_menu
|
2011-03-07 21:49:01 +01:00 |
did
|
11ccb31088
|
clean code
|
2011-03-07 20:31:08 +01:00 |
Dirk Kelly
|
ea81025d33
|
storing default_attribute on the editable_element if a default attribute has been parsed.
|
2011-03-02 14:38:32 +08:00 |
Dirk Kelly
|
95cd56cba2
|
sending a default tag will call the method on the page. Ignoring the default text in the tags.
{% editable_short_text coolertitle, default: title %}{% endeditable_short_text %}
|
2011-03-02 11:28:54 +08:00 |
Dirk Kelly
|
74277b48ed
|
the rescue wasn't trying the name, causing private method call exceptions
|
2011-03-02 10:05:50 +08:00 |
Dirk Kelly
|
adbae00457
|
changed the editable inheritance tag to be assignable, avoiding confusion between that and the content tag inheritance
|
2011-03-02 09:13:45 +08:00 |
Dirk Kelly
|
cc51e75f5c
|
change the tag name for retrieving a value to be 'content'
{% content somecooltitlebro, inherit: true %}
|
2011-03-02 08:22:41 +08:00 |
Dirk Kelly
|
77d7587150
|
allow inheritable to be sent through as a tag
|
2011-03-02 08:15:54 +08:00 |
Dirk Kelly
|
04b0849dc5
|
Added the liquid tag for content, retrieves an editable element from self or parent if inherited: true
|
2011-03-02 08:14:58 +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
|
083debc516
|
add seo_metadata liquid tag (Mario)
|
2011-02-13 14:40:55 +01:00 |
did
|
94be90986d
|
merge Dirk's branch + upgrade a lot of gems (rails, ...etc)
|
2011-02-12 15:00:57 +01:00 |
Dirk Kelly
|
7bce392e56
|
moved to the listed methods in the nav
|
2011-02-01 16:07:56 +08:00 |
Dirk Kelly
|
2d3c0e974f
|
not showing unlisted pages in the nav
|
2011-02-01 14:43:07 +08: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 |
Dirk Kelly
|
7d529f22d7
|
I can't believe I missed the include_page? method.
Now supports exactly the same standards as the top level list elements, such as unpublished and excluded urls
|
2011-01-25 07:54:07 +08:00 |
Dirk Kelly
|
825521a5d4
|
need to reject templatized pages, because they're not real pages.
Also using children with minimal attributes, like top level.
|
2011-01-24 23:20:26 +08:00 |
Dirk Kelly
|
f512b417f5
|
added the depth option to nav tag
|
2011-01-24 17:00:02 +08:00 |
dinedine
|
85bee3a110
|
Merge branch 'add_or_update_editable_element' of https://github.com/dirkkelly/locomotive into dirkkelly-add_or_update_editable_element
|
2011-01-18 00:28:41 +01:00 |
Dirk Kelly
|
62568bbdbb
|
Fixed exception when updating a layout from back-office which contained an editable area
|
2011-01-14 15:27:58 +08:00 |
dinedine
|
1291b68aba
|
in special sitation inherited templates were not correctly updated
|
2011-01-08 00:10:44 +01:00 |
dinedine
|
572ee360a1
|
preserve page orders when importing theme + handle favicon as theme asset + add tests for the nav tag + polish code (remove useless logs)
|
2011-01-03 11:50:09 +01:00 |
dinedine
|
210ce3d2d8
|
enhance the nav tag + some optimization in the back-office when rendering the pages tree
|
2011-01-02 23:58:06 +01:00 |
dinedine
|
a1d9a5d548
|
reflect changes from the last imported theme (enhancements + bugs fixed)
|
2010-10-31 00:30:30 +02:00 |
dinedine
|
7cb26a74d4
|
fix bug with pagination + add _permalink property for content instances
|
2010-10-26 15:06:57 +02:00 |