Dmitriy
a74a0045a3
Wrong arguments order fixed.
2012-04-17 02:44:19 +04:00
Didier Lafforgue
256a0e4bc0
Merge branch 'master' of github.com:locomotivecms/engine
2012-04-16 12:35:44 +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
1ae9557515
back to the original editable_short_text ( #349 )
2012-04-14 13:38:47 +02:00
Didier Lafforgue
21469ce367
do not display the content types select box if a page is not templatized
2012-04-14 11:55:24 +02: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
a507d756b7
repair the js slugify method
2012-04-13 18:08:53 +02:00
Mario Visic
f7388d14e7
Merge pull request #356 from colibri-software/inline_editor_firefox_fix
...
Inline editor bug in Firefox
2012-04-13 07:21:56 -07:00
Mario Visic
ebd3081205
Merge remote-tracking branch 'origin/master'
2012-04-13 22:14:23 +08:00
Mario Visic
edca6323fb
Fixed a regression when updating javascript stringify. Fixes #355 .
2012-04-13 22:11:44 +08:00
Didier Lafforgue
9dc3f778a4
Merge pull request #351 from willcosgrove/spinny-toggle-buttons
...
Spinny toggle buttons
2012-04-13 06:40:07 -07:00
Alex Sanford
56a0affbcb
Changed iframe resize function
...
Instead of resizing the iframe based on the height of the body element
of the iframe content, do it based on the entire content height. Also,
don't compare the inner content height to the body height of the outer
page, but use the iframe height instead.
2012-04-13 10:03:31 -03:00
Didier Lafforgue
7a595208aa
fix issue #338
2012-04-13 14:38:00 +02:00
Will Cosgrove
560afc6b0a
Fixed my css and javascript problems
2012-04-11 15:35:23 -05:00
Will Cosgrove
cd703970b4
Added new buttons and styling
2012-04-11 14:24:41 -05:00
Didier Lafforgue
106cc6fc50
fix issue #346
2012-04-11 00:26:59 +02:00
Sergey Kuleshov
2798e15481
Made JS permalink regexp more generic for non–latin languages.
...
Fixed specs for permalinks generated by stringex.
2012-04-08 14:41:03 +08:00
Sergey Kuleshov
ad9bd5f5f3
support cyrilic in slug
2012-04-08 14:40:43 +08:00
Mario Visic
7260f36be7
Downcase subdomains and domains when given as user input.
2012-04-06 23:10:16 +08:00
Mario Visic
6677689902
Load the locomotive mount path earlier in the JS to make it available for backbone models. Fixes #336
2012-04-06 15:54:54 +08: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
7877f11669
Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc
2012-03-28 17:33:48 +02:00
Didier Lafforgue
3f6e7acda6
fix issue #333
2012-03-28 17:33:20 +02:00
Didier Lafforgue
35e29d0e4b
Merge pull request #331 from pimpin/2.0.0.rc
...
2.0.0.rc
2012-03-27 16:25:49 -07: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
Pierre Merlin
65c570c4aa
Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
2012-03-23 16:53:42 +01:00
Pierre Merlin
8b80a3e840
Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
2012-03-23 15:57:55 +01:00
Didier Lafforgue
a8d57794de
fix issue #292
2012-03-23 01:29:12 +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
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
fad363a92a
use the full witdh when displaying the UI of the has_many type
2012-03-13 16:13:40 +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
37042eaa03
the content_entries API returns always a flat list of entries + fix a bug about cycling dependencies when the content_type has a field named source
2012-03-07 02:56:56 +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
