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
Will Cosgrove
c0627bf8a7
Fixed typo for bootstrap setting: data-toogle to data-toggle
2012-05-08 22:31:20 -05:00
Didier Lafforgue
0502cf3305
bump version to 2.0.0.rc7
2012-04-23 01:04:06 +02:00
Didier Lafforgue
b3902bb3d5
Merge branch 'master' of github.com:locomotivecms/engine
2012-04-22 23:44:24 +02:00
Didier Lafforgue
ce5576da09
the extends tag was not looking for the right fullpath (when localization is enabled) + sample in order to modify the tinyMCE settings in the back-office
2012-04-22 23:25:18 +02:00
Mario Visic
283a0d9be4
Merge pull request #378 from davide-malagoli/master
...
current_user liquid extension (issue #312 ) added
2012-04-22 03:15:05 -07:00
Didier Lafforgue
08cf381bc3
simple media plugin for Aloha
2012-04-22 01:14:25 +02: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
d6059c2a9b
fix issue #373
2012-04-20 15:42:10 +02:00
Didier Lafforgue
9b4fc56e82
fix issue #360
2012-04-19 16:30:16 +02:00
Didier Lafforgue
b053ba5a26
bump version to 2.0.0.rc6
2012-04-17 18:42:27 +02:00
Didier Lafforgue
1d19d606b8
closing textarea tags do not break the page form anymore
2012-04-17 16:13:21 +02:00
Didier Lafforgue
67c36191d2
was breaking the API (tests are coming)
2012-04-17 13:53:15 +02:00
Didier Lafforgue
bc919ed544
bump version to 2.0.0.rc5
2012-04-17 03:09:17 +02:00
Didier Lafforgue
b25332b262
disable the inline editor launch button if the page to display enabled the cache (quick patch for #353 )
2012-04-16 11:49:04 +02:00
Didier Lafforgue
655fe18d72
add UI notifications when a form is submitted + disable the form when it is being submitted + pass the current ability to the presenter + remove debug statements
2012-04-16 11:38:32 +02:00
Didier Lafforgue
f973ccef1b
preserve whitespace in textarea tags (HAML/Rails bug)
2012-04-14 17:35:11 +02:00
Didier Lafforgue
14596a5443
fix a couple of annoying engine bugs + implement the first version of the find tag
2012-04-10 17:44:13 +02:00
did
4d1b986f1b
fix broken tests + make the editing of locales more robust
2012-04-10 04:55:59 -07:00
Mario Visic
f74306503b
Use unidecoder for converting non ascii charcters for page slugs. Fixes #340
2012-04-08 15:13:07 +08:00
Didier Lafforgue
e26febdaf6
refactoring (wip)
2012-04-06 12:23:11 +02:00
Didier Lafforgue
260f9ae4ef
one way to avoid autosave
2012-04-05 18:02:16 +02:00
Didier Lafforgue
64ea41cbcd
one way to avoid autosave
2012-04-05 18:01:16 +02:00
Didier Lafforgue
6bd1154886
use the last version of mongoid / rails + bump the new gem version (rc.4)
2012-04-02 21:46:23 +02:00
Mario Visic
29e40b39ea
Removed output when compiling assets. It seems to break vendored assets when running as an engine.
2012-04-02 21:46:08 +08:00
Didier Lafforgue
b06b7b50aa
the filter base file was missing, my bad (thanks Joel)
2012-04-02 11:57:52 +02:00
Mario Visic
370ec26d65
Allow engine assets to be precompiled when config.assets.initialize_on_precompile is set to false.
2012-04-02 15:31:48 +08:00
Didier Lafforgue
f0e41205fd
re-organize filters + drop unused tags
2012-04-02 02:41:52 +02:00
Didier Lafforgue
3f6e7acda6
fix issue #333
2012-03-28 17:33:20 +02:00
Didier Lafforgue
11d92ab80e
nested templatized pages finally done (+ specs) + upgrade gems + change the zindex value of the start button for the inline editor + change version (rc.3) for the next rc release
2012-03-28 00:26:32 +02:00
Didier Lafforgue
2329f26e4d
new liquid filter: default
2012-03-26 18:12:16 +02:00
Didier Lafforgue
90e1c4f438
preserve GET parameters when paginating a collection
2012-03-26 17:58:01 +02:00
Didier Lafforgue
ed15c0d6b5
templatized pages can have now sub pages
2012-03-26 16:31:28 +02:00
Didier Lafforgue
e9bf29f297
the last commit broke the test suite: fixed now
2012-03-23 00:41:04 +01:00
Didier Lafforgue
58c5e9e238
Merge pull request #327 from belighted/2.0.0.rc
...
Add nav compatibility with twitter menu dropdown
2012-03-22 16:21:38 -07:00
Didier Lafforgue
b7424b1fd4
implement the auto_discovery_link_tag liquid filter (feature #206 )
2012-03-23 00:18:32 +01:00
Didier Lafforgue
a9aeffba9b
it is now possible to change the response type of a page + correct translations in French
2012-03-22 19:20:31 +01:00
Didier Lafforgue
6b8e3db8c3
add missing files for the last commit about the control editable element + implement feature #326
2012-03-22 02:13:24 +01:00
Didier Lafforgue
b3b0a5ac16
new editable element for a page: the control
2012-03-22 00:50:34 +01:00
Didier Lafforgue
ab5a4755b8
make the editable elements more robust when working with localization + write tests to prove it
2012-03-21 03:21:29 +01:00
Didier Lafforgue
cfbe68564d
fixed editable elements (wip)
2012-03-19 02:29:59 +01:00
Gil Vandendriessche
caa0e69760
Add nav compatibility with twitter menu dropdown
2012-03-15 11:39:20 +01:00
Didier Lafforgue
834042fda3
bump version
2012-03-14 01:20:55 +01:00
Mario Visic
52247242fc
Requiring locomotive is now much less noisy.
2012-03-12 14:04:52 +08: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
did
1f49eca09f
with_scope did not resolve (ie the Liquid way) correctly the values
2012-03-08 09:24:33 -08: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
did
f77bdd9826
fix #289 . This fix is different from the one in the master branch. It only the filename (without the whole path and the extension)
2012-03-05 14:17:33 -08:00
