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
Didier Lafforgue
e225ad2278
fix issue #385
2012-05-07 00:31:59 +02:00
Didier Lafforgue
23600edb1f
performance improvements as described in #383
2012-04-26 03:39:23 +02:00
Didier Lafforgue
486c6a12a2
fix issue #367
2012-04-20 00:31:48 +02:00
Didier Lafforgue
60df273e4b
fix tests for issue #366
2012-04-17 03:02:31 +02:00
Dmitriy
a74a0045a3
Wrong arguments order fixed.
2012-04-17 02:44:19 +04:00
Didier Lafforgue
06fa564f37
fix a couple of potential bugs when playing with the site locales
2012-04-13 18:32:55 +02:00
Didier Lafforgue
7a595208aa
fix issue #338
2012-04-13 14:38:00 +02:00
Didier Lafforgue
106cc6fc50
fix issue #346
2012-04-11 00:26:59 +02:00
Didier Lafforgue
63fd77f950
handle is unique within the scope of a site
2012-04-11 00:21:20 +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
7260f36be7
Downcase subdomains and domains when given as user input.
2012-04-06 23:10:16 +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
64168cad37
wip
2012-04-05 17:12:26 +02:00
Mario Visic
4c1e9fa9c4
Fix the problem where the last domain could not be removed. Closes #335 .
2012-04-02 21:11:30 +08:00
Didier Lafforgue
21c5e8a627
small optimization when retrieving a page from a path
2012-03-29 16:17:09 +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
ed15c0d6b5
templatized pages can have now sub pages
2012-03-26 16:31:28 +02: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
did
e2f60f2e15
the template of related pages were not updated for the non default locale
2012-03-19 09:15:12 -07:00
Didier Lafforgue
cfbe68564d
fixed editable elements (wip)
2012-03-19 02:29:59 +01:00
Didier Lafforgue
fbd945cf6d
implement feature #324
2012-03-14 01:16:01 +01:00
Didier Lafforgue
79f958c505
create mongoDB indexes for locomotive models without any errors
2012-03-13 16:37:19 +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
Didier Lafforgue
1c902a5448
fix a bug about the editable_file not correctly displayed in a snippet given as an argument of the new nav tag
2012-03-09 13:05:44 +01:00
Didier Lafforgue
7ab8110e41
with_scope also takes care of order_by (pull request #278 )
2012-03-09 01:01:09 +01:00
Didier Lafforgue
effce313bf
Merge pull request #319 from paulsponagl/nav_with_liquid_2.0
...
added a snippet option to the liquid nav tag
2012-03-07 17:44:00 -08:00
Didier Lafforgue
0c65516807
fix issue #320
2012-03-08 02:32:59 +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
ac823aac66
entries can be grouped by a belongs_to field in the back-office + add the show action for the content_entries API
2012-03-07 01:39:24 +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
did
a1cbdf9ed8
page templates were not updated if a related snippet got modified (BUG)
2012-03-02 08:37:54 -08:00
Didier Lafforgue
05baecad0b
change the path to files added in the content entries + ui settings are a hash not an object
2012-03-02 00:31:45 +01:00
Didier Lafforgue
50a3addf45
fix ALL the cucumber tests + also solve a couple of UI bugs with the has_many and many_to_many relationships
2012-03-01 11:07:22 +01:00
Didier Lafforgue
a2308787f1
fix theme assets tests
2012-02-28 11:25:51 +01:00
did
520b68104b
fixing tests (wip) + sync javascript objects when updating an entry in a has_many relationship
2012-02-27 03:48:06 -08:00
Didier Lafforgue
c6e1276974
fix the broken tests
2012-02-21 01:45:45 +01:00
Didier Lafforgue
fa2cd996ce
icons for redirect and templatized pages were not displayed in the back-office + fix the random issue when getting an API token in development (very weird behaviour) + remove the default mongoid scope for pages + force the depth
2012-02-20 17:21:32 +01:00
Didier Lafforgue
61281db943
the API for content_types now allows to change the label_field property of a content type
2012-02-20 16:16:59 +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
02e48f5c36
fix the specs for the page model
2012-02-16 22:07:00 +01:00
Didier Lafforgue
73b559260e
fix specs for the content_type and editable_element models
2012-02-16 16:17:30 +01:00
Didier Lafforgue
2fd0410b66
tests pass for the account, content_entry and content_asset models
2012-02-16 12:42:41 +01:00
Didier Lafforgue
3b5d04238f
remove deprecated warning about ActiveSupport::Concern + add the handle property to Page in order to retrieve them more easily (very useful to display a page from an external controller for instance
2012-02-11 00:39:06 +01:00
