Didier Lafforgue
ae16661286
trying to fix cucumber tests
2012-05-26 15:21:47 +02:00
Didier Lafforgue
da2d689bdc
fix issue #412
2012-05-26 14:35:04 +02:00
Didier Lafforgue
c58075b7c3
Merge branch 'master' of github.com:locomotivecms/engine
2012-05-24 19:19:57 +02:00
Didier Lafforgue
662e359acb
fix issue #393
2012-05-24 19:19:46 +02:00
Mario Visic
4c5d6c92d0
Added poltergeist and a small JS fix.
2012-05-25 00:06:07 +08:00
Mario Visic
817ee8b0e5
Merge branch 'master' of github.com:locomotivecms/engine
2012-05-24 23:13:56 +08:00
Mario Visic
13b4d8c606
Do not pass the host option to URL helpers for sitemaps. Fixes #415 .
2012-05-24 23:13:25 +08:00
did
6342b94ede
Merge branch 'master' of github.com:locomotivecms/engine
2012-05-24 06:47:15 -07:00
did
d3e219018b
fix issue #388
2012-05-24 06:46:48 -07:00
Mario Visic
415817e20b
Merge pull request #409 from waynegerard/label_field_name
...
Added a setter method for label_field_id in content_types.rb model
2012-05-24 03:35:30 -07:00
did
04d9fe17f8
Merge branch 'master' of github.com:locomotivecms/engine
2012-05-23 15:03:37 -07:00
did
d90123e321
public forms are now protected from csrf attacks (see issue #382
2012-05-23 15:03:21 -07:00
waynegerard
2fa81112fc
Removing inline rescue in favor of where/try combination for label ID in setter method. Thanks @mariovisic\!
2012-05-22 18:27:38 -07:00
waynegerard
be26ae3059
Added a setter method for label_field_id in content_types.rb model. Should resolve issue where label_field_name was not being updated properly through the UI. Fix for issue #398 .
2012-05-19 13:51:41 -07:00
Didier Lafforgue
e225ad2278
fix issue #385
2012-05-07 00:31:59 +02:00
Didier Lafforgue
a8646e7ef3
date picker was not correctly displayed in the popup form (has_many relationship) + previous form errors remained even within a fresh new popup
2012-04-26 12:12:55 +02:00
Didier Lafforgue
f9a6155c19
content types can auto-reference them (in a many_to_many relationship for instance)
2012-04-26 04:00:46 +02:00
Didier Lafforgue
23600edb1f
performance improvements as described in #383
2012-04-26 03:39:23 +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
Didier Lafforgue
08cf381bc3
simple media plugin for Aloha
2012-04-22 01:14:25 +02:00
Didier Lafforgue
246eadb3fd
fix issue #374
2012-04-20 13:11:50 +02:00
Didier Lafforgue
486c6a12a2
fix issue #367
2012-04-20 00:31:48 +02:00
Didier Lafforgue
47015d3473
write cucumber tests to illustrate how to deal with a contact form + fix a tiny bug about it
2012-04-17 17:48:42 +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
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
