a507d756b7
repair the js slugify method
2012-04-13 18:08:53 +02:00
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
ebd3081205
Merge remote-tracking branch 'origin/master'
2012-04-13 22:14:23 +08:00
edca6323fb
Fixed a regression when updating javascript stringify. Fixes #355 .
2012-04-13 22:11:44 +08:00
9dc3f778a4
Merge pull request #351 from willcosgrove/spinny-toggle-buttons
...
Spinny toggle buttons
2012-04-13 06:40:07 -07:00
d0698b1ffc
fix issue #348
2012-04-13 15:29:06 +02:00
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
560afc6b0a
Fixed my css and javascript problems
2012-04-11 15:35:23 -05:00
cd703970b4
Added new buttons and styling
2012-04-11 14:24:41 -05:00
62e2a5029d
use the last version of FOG
2012-04-11 03:40:00 +02:00
106cc6fc50
fix issue #346
2012-04-11 00:26:59 +02:00
63fd77f950
handle is unique within the scope of a site
2012-04-11 00:21:20 +02:00
14596a5443
fix a couple of annoying engine bugs + implement the first version of the find tag
2012-04-10 17:44:13 +02:00
4d1b986f1b
fix broken tests + make the editing of locales more robust
2012-04-10 04:55:59 -07: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
e26febdaf6
refactoring (wip)
2012-04-06 12:23:11 +02: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
260f9ae4ef
one way to avoid autosave
2012-04-05 18:02:16 +02:00
64ea41cbcd
one way to avoid autosave
2012-04-05 18:01:16 +02:00
64168cad37
wip
2012-04-05 17:12:26 +02: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
Didier Lafforgue
Mario Visic
Didier Lafforgue
Alex Sanford
Will Cosgrove
Sergey Kuleshov
Dan Sapala