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
e2b73d786a
Merge pull request #345 from locomotivecms/no_require
...
Require the engine on gem load.
2012-04-13 05:48:22 -07:00
7a595208aa
fix issue #338
2012-04-13 14:38:00 +02:00
106cc6fc50
fix issue #346
2012-04-11 00:26:59 +02:00
4bf16b00f9
Require the engine on gem load.
2012-04-10 18:06:28 +08:00
95eb58bb36
Merge pull request #341 from dsapala/master
...
misspelled wizzard
2012-04-08 08:26:53 -07:00
f74306503b
Use unidecoder for converting non ascii charcters for page slugs. Fixes #340
2012-04-08 15:13:07 +08:00
22d55cf0e0
Slugs should not have 'dot' in them.
2012-04-08 14:42:19 +08:00
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
ad9bd5f5f3
support cyrilic in slug
2012-04-08 14:40:43 +08:00
087f9c6c55
fixing misspelled word wizard
2012-04-07 15:59:50 -04:00
63c17313fb
Test the 1.0 stable branch.
2012-04-06 23:39:29 +08:00
7260f36be7
Downcase subdomains and domains when given as user input.
2012-04-06 23:10:16 +08:00
e413373858
Test the master and 1.0 stable branches.
2012-04-06 16:13:24 +08:00
98f48c00c5
Merge branch '2.0.0.rc'
2012-04-06 16:10:56 +08:00
760687d3fe
Small cucumber steps fix that was messing with routing.
2012-04-06 16:08:06 +08:00
7be37cf8d2
Merge branch 'bufix/336_custom_mounting_path' into 2.0.0.rc
2012-04-06 15:55:13 +08:00
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
22f34a5a60
Added a failing feature for #336 .
2012-04-06 15:36:19 +08:00
6bd1154886
use the last version of mongoid / rails + bump the new gem version (rc.4)
2012-04-02 21:46:23 +02:00
ea62835b2e
Fixed up some deprication warnings.
2012-04-02 21:56:00 +08:00
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
4c1e9fa9c4
Fix the problem where the last domain could not be removed. Closes #335 .
2012-04-02 21:11:30 +08:00
f134601306
Added a passing feature for adding a domain. Failing one for removing a domain.
2012-04-02 19:57:24 +08:00
114218b8c4
Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc
2012-04-02 19:28:21 +08:00
60d253bd93
Test the 2.0.0rc branch on travis.
2012-04-02 19:27:44 +08:00
b06b7b50aa
the filter base file was missing, my bad (thanks Joel)
2012-04-02 11:57:52 +02:00
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
f0e41205fd
re-organize filters + drop unused tags
2012-04-02 02:41:52 +02:00
21c5e8a627
small optimization when retrieving a page from a path
2012-03-29 16:17:09 +02:00
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
3f6e7acda6
fix issue #333
2012-03-28 17:33:20 +02:00
35e29d0e4b
Merge pull request #331 from pimpin/2.0.0.rc
...
2.0.0.rc
2012-03-27 16:25:49 -07:00
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
2329f26e4d
new liquid filter: default
2012-03-26 18:12:16 +02:00
90e1c4f438
preserve GET parameters when paginating a collection
2012-03-26 17:58:01 +02:00
ed15c0d6b5
templatized pages can have now sub pages
2012-03-26 16:31:28 +02:00
9cb48a3ad9
Adding public admin_ui.fr.yml for toolbar
2012-03-23 18:54:42 +01:00
65c570c4aa
Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
2012-03-23 16:53:42 +01:00
8b80a3e840
Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
2012-03-23 15:57:55 +01:00
a8d57794de
fix issue #292
2012-03-23 01:29:12 +01:00
e9bf29f297
the last commit broke the test suite: fixed now
2012-03-23 00:41:04 +01:00
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
b7424b1fd4
implement the auto_discovery_link_tag liquid filter (feature #206 )
2012-03-23 00:18:32 +01:00
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
6b8e3db8c3
add missing files for the last commit about the control editable element + implement feature #326
2012-03-22 02:13:24 +01:00
b3b0a5ac16
new editable element for a page: the control
2012-03-22 00:50:34 +01:00
ab5a4755b8
make the editable elements more robust when working with localization + write tests to prove it
2012-03-21 03:21:29 +01:00
e2f60f2e15
the template of related pages were not updated for the non default locale
2012-03-19 09:15:12 -07:00
cfbe68564d
fixed editable elements (wip)
2012-03-19 02:29:59 +01:00
Alex Sanford
Didier Lafforgue
Didier Lafforgue
Mario Visic
Sergey Kuleshov
Dan Sapala
Pierre Merlin