Commit Graph

1458 Commits

Author SHA1 Message Date
PitOn d78f99703e added missing ru translations for upcoming 2.0 version 2012-04-18 16:20:36 +04:00
PitOn 06c1317acb added missing ru translations for upcoming 2.0 version 2012-04-18 16:18:38 +04:00
PitOn 23f162f0b3 added missing ru translations for upcoming 2.0 version 2012-04-18 16:16:46 +04:00
PitOn 0719a8bb76 added missing ru translations for upcoming 2.0 version 2012-04-18 16:14:01 +04:00
Didier Lafforgue 9f2cab94cb the very first tests for the API 2012-04-18 02:07:48 +02:00
Didier Lafforgue 792ebd142b bump version to 2.0.0.rc6 (forgot something) 2012-04-17 18:43:14 +02:00
Didier Lafforgue b053ba5a26 bump version to 2.0.0.rc6 2012-04-17 18:42:27 +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
Alex Sanford 494e3c9b51 Fixed author page update scenario 2012-04-17 12:02:29 -03:00
Didier Lafforgue 1d19d606b8 closing textarea tags do not break the page form anymore 2012-04-17 16:13:21 +02:00
Alex Sanford edd236b202 Got authorization working for pages 2012-04-17 10:12:42 -03:00
Didier Lafforgue 67c36191d2 was breaking the API (tests are coming) 2012-04-17 13:53:15 +02:00
Didier Lafforgue 39bb85d163 forgot to push the Gemfile.lock too 2012-04-17 03:11:09 +02:00
Didier Lafforgue bc919ed544 bump version to 2.0.0.rc5 2012-04-17 03:09:17 +02:00
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
Alex Sanford 97edb0e4b7 Added show action to page API and fixed some features 2012-04-16 15:36:39 -03:00
Alex Sanford 4f12c2cd10 Created some initial features for API authentication 2012-04-16 15:17:11 -03: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