Commit Graph

  • 35e2fd2d57 Merge branch 'master' of git://github.com/locomotivecms/engine Sharagoz 2011-10-08 21:17:03 +0200
  • f864980685 norwegian JS translations Sharagoz 2011-10-08 21:09:08 +0200
  • 6b9d2317da adding .published? and .listed? methods for the liquid Page drop class Rytis Lukoševičius 2011-10-04 04:35:40 +0300
  • 85cabafe67 Merge pull request #218 from corgibytes/ensure_rails_3_0 Mario Visic 2011-10-01 08:52:01 -0700
  • 016d773b2d fix issue #217 (memberships not correctly removed) did 2011-09-28 18:27:29 +0200
  • 544e9e5c3c fix issue #225 (bson_ext version) did 2011-09-28 11:57:48 +0200
  • d5534a4a2b Bugfix in snippets with block and editable_elements. Andrea Frigido 2011-09-27 09:01:55 +0200
  • 718b3c67bb improve the with_scope tag based on the work on the editor did 2011-09-27 00:25:47 +0200
  • c18dfa035e Prevent rails 3.1 from getting pulled in as a dependency. M. Scott Ford 2011-09-25 21:03:50 -0400
  • ce24270948 fix issue #193 did 2011-09-22 01:38:23 +0200
  • a843f16be0 norwegian locale Sharagoz 2011-09-19 17:43:23 +0200
  • 2b474626b6 add crack to gemspec Sharagoz 2011-09-19 16:28:21 +0200
  • ffc7057669 "no" locale added to config options Sharagoz 2011-09-19 16:15:25 +0200
  • cb43a878c8 add crack to gemfile Sharagoz 2011-09-19 16:10:29 +0200
  • c6ab499664 added norwegian locale Sharagoz 2011-09-19 15:48:43 +0200
  • aa21cea13b Typo in the current site feature. Mario Visic 2011-09-17 22:31:50 +0800
  • 03b6649742 Designers cannot set others to admins, fixes #197 Mario Visic 2011-09-17 22:23:43 +0800
  • 4c55401728 Merge pull request #209 from GarPit/master Mario Visic 2011-09-16 19:02:03 -0700
  • 6945bed820 liquid syntax translated mistake PitOn 2011-09-16 11:23:03 +0400
  • ca2ad98cd0 Merge pull request #208 from karlbright/next_previous_content Mario Visic 2011-09-15 21:04:22 -0700
  • 93667018c1 Updated with hashrocket Karl Brightman 2011-09-16 11:55:30 +0800
  • 769b0569db Added examples Karl Brightman 2011-09-16 11:37:48 +0800
  • 75f4835d3e Integrated next and previous methods for content in content types Karl Brightman 2011-09-16 11:35:40 +0800
  • 13b82e66fe fix httparty version to 0.7.8 did 2011-09-15 16:59:14 +0200
  • 8658f4229a a non optimized solution to fix problems with localized boolean and category custom types i18n did 2011-09-15 01:36:46 +0200
  • 5dd9481ec2 merging with the last version of the master branch did 2011-09-14 16:44:59 +0200
  • b89d6f2dbd enable i18n for the category custom type did 2011-09-14 16:37:20 +0200
  • 8dfefe5094 fix issue #201 did 2011-09-14 11:32:14 +0200
  • efc843c2d9 Merge branch 'feature/frontend_edit_authentication' Mario Visic 2011-09-04 01:15:52 +0800
  • 8dbd51734a Visiting /edit when not authenticated now sends users to the login page. Mario Visic 2011-09-04 01:15:43 +0800
  • 82b763c1bf Added a failing cucumber scenario for frontend editing auth. Mario Visic 2011-09-04 01:08:39 +0800
  • 1b86150042 Merge branch 'feature/aloha_integration_tests' Mario Visic 2011-09-03 22:38:16 +0800
  • 3113fbc9f0 Completed the cucumbet feature for the front end inline editor. Mario Visic 2011-09-03 22:37:08 +0800
  • d586d0eff4 Added an incomplete test for the front end inline editor. Mario Visic 2011-09-01 20:30:59 +0800
  • eb2d25e2f9 Ruby 1.9 require the correct debug. Mario Visic 2011-09-01 19:28:46 +0800
  • f6609a699b Removed an old cucumber scenario. Mario Visic 2011-09-01 18:51:09 +0800
  • aa6eb1ea9d Removed a duplicate step. Mario Visic 2011-09-01 18:45:30 +0800
  • f81d3a698f Merge pull request #190 from corgibytes/media_dialog_fixes Didier Lafforgue 2011-08-31 14:53:16 -0700
  • 6a2f0f17dd complete the Russian version of the engine (#188): add the Russian flag + translate the Russian word in all the other locales did 2011-08-31 23:43:52 +0200
  • 4a82935b46 Merge pull request #188 from GarPit/master Didier Lafforgue 2011-08-31 14:21:47 -0700
  • c84a571afc new gems for rails and custom_fields (it fixes a bug with the has_many custom field) did 2011-08-31 23:14:30 +0200
  • 761a64b130 Merge pull request #185 from themgt/patch-1 Didier Lafforgue 2011-08-30 15:11:46 -0700
  • d121a56efc Merge pull request #184 from colibri-software/ie_fix_options Didier Lafforgue 2011-08-30 15:06:02 -0700
  • cd5f3b9712 a couple of Dutch translation keys were missing (issue #181) did 2011-08-30 23:39:45 +0200
  • dea0b67fe1 fix another bug related to the issue #179 did 2011-08-30 23:13:34 +0200
  • c83c6828a9 Merge pull request #186 from Arjeno/allow_htc_file_content_type Mario Visic 2011-08-30 06:39:04 -0700
  • acd731347c should sort by Page#depth so slug parts are in the right order Paul 2011-08-29 16:17:18 +0300
  • 1e5e151be6 russian translation GarPit 2011-08-29 16:54:21 +0400
  • 367b0aab4f formtastic.ru.yml finished PitOn 2011-08-30 00:35:56 +0400
  • db5cb0950d devise.ru.tml finished PitOn 2011-08-30 00:03:47 +0400
  • a1d976ace1 default.ru.yml finished PitOn 2011-08-29 23:52:42 +0400
  • a46019da40 admin_ui.ru.yml finished PitOn 2011-08-29 23:48:33 +0400
  • a78bcdaf38 Added .htc file content type to white list Added .htc file content type javascripts folder Arjen Oosterkamp 2011-08-29 10:46:31 +0200
  • 988323b1d0 Extracted DOM option creation into function to apply IE workaround Alex Sanford 2011-08-28 22:37:16 -0300
  • ff901ca3d3 Merge branch 'feature/unauthorized_admin_login' Mario Visic 2011-08-28 01:15:25 +0800
  • cd464e604c Logging in as an account without membership no longer infinetly redirects. Mario Visic 2011-08-28 01:14:02 +0800
  • 63c30bc135 Added a failing cucumber scenario for logging in without a membership to the site. Mario Visic 2011-08-27 13:28:51 +0800
  • d49453dfc8 Adjusted the interaction with the media dialog. M. Scott Ford 2011-08-27 01:15:07 -0400
  • ef75d4acef devise transaltions PitOn 2011-08-27 06:33:33 +0400
  • d9dafd2222 default.yml translations PitOn 2011-08-27 06:27:14 +0400
  • e8bea2844b more translations PitOn 2011-08-27 00:45:25 +0400
  • 265525c1a7 fix issue #175 + the liquid template of content types (back-office) were broken did 2011-08-26 00:30:34 +0200
  • bb48552b51 Ruby MRI 1.9.3 Compatability Fixes did 2011-08-25 23:28:56 +0200
  • aa5c5f0092 tweak the spec_helper.rb file (see issue #157) did 2011-08-25 22:15:23 +0200
  • 201063aae0 Merge pull request #180 from mariovisic/cache_double_render_error Didier Lafforgue 2011-08-25 12:56:17 -0700
  • 71a592eec1 fix issue #177 did 2011-08-25 18:27:43 +0200
  • fdf55aee88 Do not render twice for cached pages. Mario Visic 2011-08-25 22:11:57 +0800
  • c990a89e57 db/seeds.rb is not needed anymore did 2011-08-25 15:33:06 +0200
  • 01f6a0aad5 fix issue #171 did 2011-08-25 15:32:00 +0200
  • 7a9caabc41 new custom_fields gem version (beta 24) did 2011-08-25 15:15:42 +0200
  • d0566f917e fix issue #179 did 2011-08-25 14:58:49 +0200
  • aff1d23d90 Merge branch 'master' of github.com:locomotivecms/engine did 2011-08-24 15:16:33 +0200
  • e111e2c1f9 Merge pull request #174 from mariovisic/hide_unauthorized_links Didier Lafforgue 2011-08-22 15:55:41 -0700
  • f140fcc260 Merge pull request #172 from colibri-software/tablerow_fix Didier Lafforgue 2011-08-22 15:48:42 -0700
  • 22445856ec The add account link is now hidden unless admins have permission. Mario Visic 2011-08-20 17:41:00 +0800
  • 8a5241f265 Updated a scenario to fail. Mario Visic 2011-08-20 17:37:58 +0800
  • a7bc648333 Implemented the site ability fix for designers. Mario Visic 2011-08-20 17:33:13 +0800
  • 5c3cf83082 Added a failing scenario for the new site button when the account is a designer. Mario Visic 2011-08-20 17:31:16 +0800
  • 24c9752018 Implemenation for hiding the destroy asset button. Mario Visic 2011-08-20 17:13:06 +0800
  • 0ed6c21f10 Added a failing cucumber test for viewing the delete asset button as an author. Mario Visic 2011-08-20 17:08:37 +0800
  • 88fd17a5aa Fixed issue with tablerow tag Alex Sanford 2011-08-19 09:55:15 -0300
  • 7ea25b3a59 in some circonstances, the site_id disappeared when generating the url of a file in a model did 2011-08-19 12:06:41 +0200
  • 0b27cd5d1b new mongoid settings for dev/test + fix a potential bug wit the fullpath method did 2011-08-19 11:47:59 +0200
  • 0e3d601ea9 fix xss vulnerability issue (#170) did 2011-08-18 16:06:34 +0200
  • 52e78d9b9a fix issue #169 did 2011-08-18 12:32:45 +0200
  • 8e26b922f4 BSON::ObjectId has to be converted in String in liquid templates did 2011-08-18 12:03:34 +0200
  • e9c1c1d98f cleaning a little bit did 2011-08-18 11:02:55 +0200
  • e1c2687681 fix bugs with the nav tag + when adding a new locale + other minor stuff did 2011-08-18 01:28:40 +0200
  • ad68826e84 made very good progress, almost usable did 2011-08-17 22:32:39 +0200
  • 75e6f2cd08 more translations GarPit 2011-08-17 18:28:49 +0400
  • c68eb321ff first draft (not yet fully functional) of the I18n feature did 2011-08-17 04:23:14 +0200
  • e0b9367f10 Got Mongoid and FactoryGirl to stop preloading models (#157) did 2011-08-16 20:58:23 +0200
  • c3ba38216d Merge pull request #167 from pacifists/master Didier Lafforgue 2011-08-15 15:38:20 -0700
  • b3a8916565 upgrade to will_paginate 3.0 (issue #166) did 2011-08-15 15:32:21 -0700
  • 2d4f3df106 has_many target is not exported correctly (issue #165) + fix the import function as well did 2011-08-15 14:39:53 -0700
  • 3ad8101ed6 re-write tests for the (reverse) has_many features (#164) did 2011-08-14 14:07:15 -0700
  • 8d30ba5152 Merge pull request #164 from corgibytes/has_many_issue Didier Lafforgue 2011-08-14 13:37:59 -0700
  • cdf386aac2 fix issue #163 did 2011-08-14 13:33:24 -0700
  • 4543e597ed complete issue #162 did 2011-08-14 12:51:11 -0700
  • acbf481134 Merge pull request #162 from kikito/es-locale-admin-fixes Didier Lafforgue 2011-08-14 12:49:55 -0700