github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,392 Commits 13 Branches 7 Tags 15 MiB
662e359acb
Commit Graph

1392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Didier Lafforgue
60df273e4b fix tests for issue #366 2012-04-17 03:02:31 +02:00
Didier Lafforgue
3fca9fa2d3 Merge pull request #366 from dimonzozo/master 
Bug while sending notification email
 2012-04-16 17:54:52 -07:00
Dmitriy
a74a0045a3 Wrong arguments order fixed. 2012-04-17 02:44:19 +04:00
Didier Lafforgue
26662acae9 force version of the multi_json gem (1.2.0) 2012-04-16 20:50:07 +02:00
Didier Lafforgue
3eb521ba75 upgrade FOG 2012-04-16 12:36:30 +02:00
Didier Lafforgue
256a0e4bc0 Merge branch 'master' of github.com:locomotivecms/engine 2012-04-16 12:35:44 +02:00
Didier Lafforgue
b25332b262 disable the inline editor launch button if the page to display enabled the cache (quick patch for #353) 2012-04-16 11:49:04 +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
f973ccef1b preserve whitespace in textarea tags (HAML/Rails bug) 2012-04-14 17:35:11 +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
Didier Lafforgue
d0698b1ffc fix issue #348 2012-04-13 15:29:06 +02: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
e2b73d786a Merge pull request #345 from locomotivecms/no_require 
Require the engine on gem load.
 2012-04-13 05:48:22 -07: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
Mario Visic
4bf16b00f9 Require the engine on gem load. 2012-04-10 18:06:28 +08:00
Mario Visic
95eb58bb36 Merge pull request #341 from dsapala/master 
misspelled wizzard
 2012-04-08 08:26:53 -07:00
Mario Visic
f74306503b Use unidecoder for converting non ascii charcters for page slugs. Fixes #340 2012-04-08 15:13:07 +08:00
Mario Visic
22d55cf0e0 Slugs should not have 'dot' in them. 2012-04-08 14:42:19 +08: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
Dan Sapala
087f9c6c55 fixing misspelled word wizard 2012-04-07 15:59:50 -04:00
Mario Visic
63c17313fb Test the 1.0 stable branch. 2012-04-06 23:39:29 +08:00
Mario Visic
7260f36be7 Downcase subdomains and domains when given as user input. 2012-04-06 23:10:16 +08:00
Mario Visic
e413373858 Test the master and 1.0 stable branches. 2012-04-06 16:13:24 +08:00
Mario Visic
98f48c00c5 Merge branch '2.0.0.rc' 2012-04-06 16:10:56 +08:00
Mario Visic
760687d3fe Small cucumber steps fix that was messing with routing. 2012-04-06 16:08:06 +08:00
Mario Visic
7be37cf8d2 Merge branch 'bufix/336_custom_mounting_path' into 2.0.0.rc 2012-04-06 15:55:13 +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
22f34a5a60 Added a failing feature for #336. 2012-04-06 15:36:19 +08:00
Didier Lafforgue
6bd1154886 use the last version of mongoid / rails + bump the new gem version (rc.4) 2012-04-02 21:46:23 +02:00
Mario Visic
ea62835b2e Fixed up some deprication warnings. 2012-04-02 21:56:00 +08:00
Mario Visic
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
Mario Visic
4c1e9fa9c4 Fix the problem where the last domain could not be removed. Closes #335. 2012-04-02 21:11:30 +08:00
Mario Visic
f134601306 Added a passing feature for adding a domain. Failing one for removing a domain. 2012-04-02 19:57:24 +08:00
Mario Visic
114218b8c4 Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc 2012-04-02 19:28:21 +08:00
Mario Visic
60d253bd93 Test the 2.0.0rc branch on travis. 2012-04-02 19:27:44 +08:00
Didier Lafforgue
b06b7b50aa the filter base file was missing, my bad (thanks Joel) 2012-04-02 11:57:52 +02:00
Mario Visic
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
Didier Lafforgue
f0e41205fd re-organize filters + drop unused tags 2012-04-02 02:41:52 +02:00
Didier Lafforgue
21c5e8a627 small optimization when retrieving a page from a path 2012-03-29 16:17:09 +02:00