Commit Graph

  • 246eadb3fd fix issue #374 Didier Lafforgue 2012-04-20 13:11:50 +0200
  • 682763445c Merge pull request #372 from GarPit/master Didier Lafforgue 2012-04-19 16:05:41 -0700
  • f0e8848ffd repair broken build Didier Lafforgue 2012-04-20 00:35:14 +0200
  • 486c6a12a2 fix issue #367 Didier Lafforgue 2012-04-20 00:31:48 +0200
  • 9b4fc56e82 fix issue #360 Didier Lafforgue 2012-04-19 16:30:16 +0200
  • b0a552dfcf added missing ru translations for upcoming 2.0 version PitOn 2012-04-18 16:41:24 +0400
  • 9267725c9f clean the upgrade script (v1 -> v2) Didier Lafforgue 2012-04-18 14:35:06 +0200
  • d78f99703e added missing ru translations for upcoming 2.0 version PitOn 2012-04-18 16:20:36 +0400
  • 06c1317acb added missing ru translations for upcoming 2.0 version PitOn 2012-04-18 16:18:38 +0400
  • 23f162f0b3 added missing ru translations for upcoming 2.0 version PitOn 2012-04-18 16:16:46 +0400
  • 0719a8bb76 added missing ru translations for upcoming 2.0 version PitOn 2012-04-18 16:14:01 +0400
  • 9f2cab94cb the very first tests for the API Didier Lafforgue 2012-04-18 02:07:48 +0200
  • 792ebd142b bump version to 2.0.0.rc6 (forgot something) v2.0.0.rc6 Didier Lafforgue 2012-04-17 18:43:14 +0200
  • b053ba5a26 bump version to 2.0.0.rc6 Didier Lafforgue 2012-04-17 18:42:27 +0200
  • 47015d3473 write cucumber tests to illustrate how to deal with a contact form + fix a tiny bug about it Didier Lafforgue 2012-04-17 17:48:42 +0200
  • 494e3c9b51 Fixed author page update scenario Alex Sanford 2012-04-17 12:02:29 -0300
  • 1d19d606b8 closing textarea tags do not break the page form anymore Didier Lafforgue 2012-04-17 16:13:21 +0200
  • edd236b202 Got authorization working for pages Alex Sanford 2012-04-17 10:12:42 -0300
  • 67c36191d2 was breaking the API (tests are coming) Didier Lafforgue 2012-04-17 13:53:15 +0200
  • 39bb85d163 forgot to push the Gemfile.lock too v2.0.0.rc5 Didier Lafforgue 2012-04-17 03:11:09 +0200
  • bc919ed544 bump version to 2.0.0.rc5 Didier Lafforgue 2012-04-17 03:09:17 +0200
  • 60df273e4b fix tests for issue #366 Didier Lafforgue 2012-04-17 03:02:31 +0200
  • 3fca9fa2d3 Merge pull request #366 from dimonzozo/master Didier Lafforgue 2012-04-16 17:54:52 -0700
  • a74a0045a3 Wrong arguments order fixed. Dmitriy 2012-04-17 02:44:19 +0400
  • 26662acae9 force version of the multi_json gem (1.2.0) Didier Lafforgue 2012-04-16 20:50:07 +0200
  • 97edb0e4b7 Added show action to page API and fixed some features Alex Sanford 2012-04-16 15:36:39 -0300
  • 4f12c2cd10 Created some initial features for API authentication Alex Sanford 2012-04-16 15:17:11 -0300
  • 3eb521ba75 upgrade FOG Didier Lafforgue 2012-04-16 12:36:30 +0200
  • 256a0e4bc0 Merge branch 'master' of github.com:locomotivecms/engine Didier Lafforgue 2012-04-16 12:35:44 +0200
  • b25332b262 disable the inline editor launch button if the page to display enabled the cache (quick patch for #353) Didier Lafforgue 2012-04-16 11:49:04 +0200
  • 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 Didier Lafforgue 2012-04-16 11:38:32 +0200
  • f973ccef1b preserve whitespace in textarea tags (HAML/Rails bug) Didier Lafforgue 2012-04-14 17:35:11 +0200
  • 1ae9557515 back to the original editable_short_text (#349) Didier Lafforgue 2012-04-14 13:38:47 +0200
  • 21469ce367 do not display the content types select box if a page is not templatized Didier Lafforgue 2012-04-14 11:55:24 +0200
  • 06fa564f37 fix a couple of potential bugs when playing with the site locales Didier Lafforgue 2012-04-13 18:32:55 +0200
  • a507d756b7 repair the js slugify method Didier Lafforgue 2012-04-13 18:08:53 +0200
  • f7388d14e7 Merge pull request #356 from colibri-software/inline_editor_firefox_fix Mario Visic 2012-04-13 07:21:56 -0700
  • ebd3081205 Merge remote-tracking branch 'origin/master' Mario Visic 2012-04-13 22:14:23 +0800
  • edca6323fb Fixed a regression when updating javascript stringify. Fixes #355. Mario Visic 2012-04-13 22:11:44 +0800
  • 9dc3f778a4 Merge pull request #351 from willcosgrove/spinny-toggle-buttons Didier Lafforgue 2012-04-13 06:40:07 -0700
  • d0698b1ffc fix issue #348 Didier Lafforgue 2012-04-13 15:29:06 +0200
  • 56a0affbcb Changed iframe resize function Alex Sanford 2012-04-10 21:29:54 -0300
  • e2b73d786a Merge pull request #345 from locomotivecms/no_require Didier Lafforgue 2012-04-13 05:48:22 -0700
  • 7a595208aa fix issue #338 Didier Lafforgue 2012-04-13 14:38:00 +0200
  • 560afc6b0a Fixed my css and javascript problems Will Cosgrove 2012-04-11 15:35:23 -0500
  • cd703970b4 Added new buttons and styling Will Cosgrove 2012-04-11 14:24:41 -0500
  • 62e2a5029d use the last version of FOG Didier Lafforgue 2012-04-11 03:40:00 +0200
  • 106cc6fc50 fix issue #346 Didier Lafforgue 2012-04-11 00:26:59 +0200
  • 63fd77f950 handle is unique within the scope of a site Didier Lafforgue 2012-04-11 00:21:20 +0200
  • 14596a5443 fix a couple of annoying engine bugs + implement the first version of the find tag Didier Lafforgue 2012-04-10 17:44:13 +0200
  • 4d1b986f1b fix broken tests + make the editing of locales more robust did 2012-04-10 04:55:59 -0700
  • 4bf16b00f9 Require the engine on gem load. no_require Mario Visic 2012-04-10 18:06:28 +0800
  • 95eb58bb36 Merge pull request #341 from dsapala/master Mario Visic 2012-04-08 08:26:53 -0700
  • f74306503b Use unidecoder for converting non ascii charcters for page slugs. Fixes #340 Mario Visic 2012-04-08 15:13:07 +0800
  • 22d55cf0e0 Slugs should not have 'dot' in them. Mario Visic 2012-04-08 14:42:19 +0800
  • 2798e15481 Made JS permalink regexp more generic for non–latin languages. Fixed specs for permalinks generated by stringex. Sergey Kuleshov 2012-04-07 20:25:36 +0300
  • ad9bd5f5f3 support cyrilic in slug Sergey Kuleshov 2012-04-06 18:03:46 +0300
  • 087f9c6c55 fixing misspelled word wizard Dan Sapala 2012-04-07 15:59:50 -0400
  • 63c17313fb Test the 1.0 stable branch. Mario Visic 2012-04-06 23:39:29 +0800
  • 7260f36be7 Downcase subdomains and domains when given as user input. Mario Visic 2012-04-06 23:10:16 +0800
  • e26febdaf6 refactoring (wip) Didier Lafforgue 2012-04-06 12:23:11 +0200
  • e413373858 Test the master and 1.0 stable branches. Mario Visic 2012-04-06 16:13:24 +0800
  • 98f48c00c5 Merge branch '2.0.0.rc' Mario Visic 2012-04-06 16:10:56 +0800
  • 760687d3fe Small cucumber steps fix that was messing with routing. Mario Visic 2012-04-06 16:08:06 +0800
  • 7be37cf8d2 Merge branch 'bufix/336_custom_mounting_path' into 2.0.0.rc Mario Visic 2012-04-06 15:55:13 +0800
  • 6677689902 Load the locomotive mount path earlier in the JS to make it available for backbone models. Fixes #336 Mario Visic 2012-04-06 15:54:54 +0800
  • 22f34a5a60 Added a failing feature for #336. Mario Visic 2012-04-06 15:36:19 +0800
  • 260f9ae4ef one way to avoid autosave Didier Lafforgue 2012-04-05 18:02:16 +0200
  • 64ea41cbcd one way to avoid autosave Didier Lafforgue 2012-04-05 18:01:16 +0200
  • 64168cad37 wip Didier Lafforgue 2012-04-05 17:12:26 +0200
  • 6bd1154886 use the last version of mongoid / rails + bump the new gem version (rc.4) v2.0.0.rc4 Didier Lafforgue 2012-04-02 21:46:23 +0200
  • ea62835b2e Fixed up some deprication warnings. Mario Visic 2012-04-02 21:56:00 +0800
  • 29e40b39ea Removed output when compiling assets. It seems to break vendored assets when running as an engine. Mario Visic 2012-04-02 21:46:08 +0800
  • 4c1e9fa9c4 Fix the problem where the last domain could not be removed. Closes #335. Mario Visic 2012-04-02 21:11:30 +0800
  • f134601306 Added a passing feature for adding a domain. Failing one for removing a domain. Mario Visic 2012-04-02 19:57:24 +0800
  • 114218b8c4 Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc Mario Visic 2012-04-02 19:28:21 +0800
  • 60d253bd93 Test the 2.0.0rc branch on travis. Mario Visic 2012-04-02 19:27:44 +0800
  • b06b7b50aa the filter base file was missing, my bad (thanks Joel) Didier Lafforgue 2012-04-02 11:57:52 +0200
  • 370ec26d65 Allow engine assets to be precompiled when config.assets.initialize_on_precompile is set to false. Mario Visic 2012-04-02 15:31:48 +0800
  • f0e41205fd re-organize filters + drop unused tags Didier Lafforgue 2012-04-02 02:41:52 +0200
  • 21c5e8a627 small optimization when retrieving a page from a path Didier Lafforgue 2012-03-29 16:17:09 +0200
  • 7877f11669 Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc Didier Lafforgue 2012-03-28 17:33:48 +0200
  • 3f6e7acda6 fix issue #333 Didier Lafforgue 2012-03-28 17:33:20 +0200
  • 35e29d0e4b Merge pull request #331 from pimpin/2.0.0.rc Didier Lafforgue 2012-03-27 16:25:49 -0700
  • 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 Didier Lafforgue 2012-03-28 00:26:32 +0200
  • 2329f26e4d new liquid filter: default Didier Lafforgue 2012-03-26 18:12:16 +0200
  • 90e1c4f438 preserve GET parameters when paginating a collection Didier Lafforgue 2012-03-26 17:58:01 +0200
  • ed15c0d6b5 templatized pages can have now sub pages Didier Lafforgue 2012-03-26 16:31:28 +0200
  • 0663aadcf8 Merge remote-tracking branch 'origin/master' Mario Visic 2012-03-24 21:20:24 +0800
  • 86345b281d Bump rails to 3.0.12. Fixes #328. Mario Visic 2012-03-24 21:19:54 +0800
  • 9cb48a3ad9 Adding public admin_ui.fr.yml for toolbar Pierre Merlin 2012-03-23 18:54:42 +0100
  • 65c570c4aa Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss Pierre Merlin 2012-03-23 16:53:42 +0100
  • 8b80a3e840 Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss Pierre Merlin 2012-03-23 15:57:55 +0100
  • a8d57794de fix issue #292 Didier Lafforgue 2012-03-23 01:29:12 +0100
  • e9bf29f297 the last commit broke the test suite: fixed now Didier Lafforgue 2012-03-23 00:41:04 +0100
  • 58c5e9e238 Merge pull request #327 from belighted/2.0.0.rc Didier Lafforgue 2012-03-22 16:21:38 -0700
  • b7424b1fd4 implement the auto_discovery_link_tag liquid filter (feature #206) Didier Lafforgue 2012-03-23 00:18:32 +0100
  • a9aeffba9b it is now possible to change the response type of a page + correct translations in French Didier Lafforgue 2012-03-22 19:20:31 +0100
  • 6b8e3db8c3 add missing files for the last commit about the control editable element + implement feature #326 Didier Lafforgue 2012-03-22 02:13:24 +0100
  • b3b0a5ac16 new editable element for a page: the control Didier Lafforgue 2012-03-22 00:50:34 +0100