Skip to content
Commits on Oct 16, 2013
  1. Added feature that allows for truncating the post body text.

    This feature allows for truncation of the post body text at a
    user-defined point for display on the home page. See the help text
    when creating or updating a post in Enki's admin area.
    
    Thanks to user mcary for his contribution.
    
    Conflicts:
    
    	app/views/admin/posts/_form.html.erb
    	app/views/posts/index.html.erb
    committed Sep 11, 2010
Commits on Oct 15, 2013
  1. @xaviershay

    Merge pull request #94 from gaelian/dot-in-tag-name-fix

    Fixed incorrect tag name behaviour.
    xaviershay committed Oct 15, 2013
  2. @xaviershay

    Merge pull request #95 from gaelian/post-preview-fix

    Fixed post preview feature.
    xaviershay committed Oct 15, 2013
  3. Fixed post preview feature.

    The posts preview feature was broken by the advent of Rails 4 strong
    params. This commit restores the feature back to working order.
    
    Updated specs.
    committed Oct 15, 2013
  4. Filter tag names to contain only expected chars.

    Tag names can now only contain alphanumeric, underscore, space, dot and
    dash characters. Other characters will be filtered out, ampersands will
    be expanded to 'and'. This limitation has been enforced to avoid
    complications with routing where tag names are involved.
    
    Updated specs accordingly.
    committed Oct 15, 2013
  5. Updated for spacing consistency.

    committed Oct 15, 2013
Commits on Oct 12, 2013
  1. Addressed broken Atom format.

    Tags can now be viewed in HTML and Atom format regardless of whether the
    tag name contains a dot character or not. The regular expression that
    matches tag names currently allows upper/lower case letters, numbers,
    dots, dashes, underscores and spaces (URL encoded or not).
    
    Updated relevant specs. Moved routing specs into posts_routing_spec.rb
    as this seems like a more fitting place for them.
    committed Oct 12, 2013
  2. Fixed incorrect tag name behaviour.

    When a tag name contains a dot character, Rails interprets this as the
    separator for a formatted route and splits the tag name into the section
    before the dot which is interpreted as the expected :tag parameter, and
    the section after the dot which is interpreted as an unexpected :format
    parameter.
    
    This commit restores correct behaviour in the event that a tag name
    contains a dot character and includes spec coverage.
    
    Fixes #93.
    committed Oct 12, 2013
Commits on Oct 7, 2013
  1. @xaviershay

    Merge pull request #92 from gaelian/openid-login-fix

    Applied fix for logging in via OpenID to the admin area.
    xaviershay committed Oct 6, 2013
Commits on Oct 6, 2013
  1. Applied fix for logging in via OpenID to the admin area.

    Rails now contains code that resets the session if the CSRF request
    forgery check fails. This was happening on the OpenID callback when
    logging in to the Enki admin area, which broke OpenID login.
    
    This commit disables the CSRF check only for OpenID callbacks when
    logging in to the Enki admin area.
    
    Fixes #91.
    committed Oct 7, 2013
Commits on Sep 29, 2013
  1. @xaviershay

    Merge pull request #90 from gaelian/strong-params-fix

    Whitelisting parameters required for successful display of posts.
    xaviershay committed Sep 29, 2013
Commits on Sep 28, 2013
  1. Spec coverage for Rails 4 strong params functionality.

    Added factory_girl factories for use with update specs on:
    
    admin/comments_controller_spec.rb
    admin/posts_controller_spec.rb
    committed Sep 28, 2013
  2. Fixes related to correct whitelisting of attributes for comments.

    Start making use of the comment_params method in
    admin/comments_controller.rb.
    
    Removed author_url and author_email from the params whitelist in
    comments_controller.rb as according to the spec, these should not be
    able to be set from the front end anyway.
    committed Sep 28, 2013
Commits on Sep 22, 2013
  1. Whitelisting parameters required for successful display of posts.

    The move to Rails 4 and strong parameters necessitates whitelisting of
    parameters being processed by the controller. The exclusion of the
    :tag_list, :published_at_natural and :slug parameters from the
    whitelist means that these data are not being saved to the db and hence
    no new post will be displayed on the front end, no new tags will be
    saved and the post slug cannot be updated after initial creation. This
    commit fixes these issues.
    committed Sep 22, 2013
Commits on Jul 23, 2013
  1. @xaviershay

    Merge pull request #88 from gaelian/ifnull-fix

    Changed SQL function call ifnull() to coalesce().
    xaviershay committed Jul 23, 2013
  2. Changed SQL function call ifnull() to coalesce().

    The SQL function ifnull() is not recognised by PostgreSQL and
    causes an error when Enki is used with PostgreSQL as the backend
    data store. Changing the call to coalesce() seems to work for
    both MySQL and PostgreSQL.
    committed Jul 23, 2013
Commits on Jul 22, 2013
  1. @xaviershay

    Merge pull request #85 from joneslee85/rails4

    Bump to Rails 4.
    xaviershay committed Jul 21, 2013
  2. @joneslee85

    Bump to Rails 4.

    [Closes #83]
    joneslee85 committed Jul 21, 2013
Commits on Jul 20, 2013
  1. @xaviershay

    Merge pull request #84 from joneslee85/patch-3

    Support Ruby 2
    xaviershay committed Jul 20, 2013
  2. @joneslee85

    Support Ruby 2

    * Bump to Rails 3.2.13 (known to support Ruby 2)
    * Remove Psych engine code
    * Fix tests related to YAML.load
    joneslee85 committed Jul 18, 2013
Commits on Jul 18, 2013
  1. @xaviershay

    Merge pull request #81 from joneslee85/patch-1

    Add Travis Status Badge [ci skip]
    xaviershay committed Jul 17, 2013
  2. @joneslee85
  3. @xaviershay

    Merge pull request #82 from joneslee85/patch-2

    Test against Ruby 2.0
    xaviershay committed Jul 17, 2013
  4. @joneslee85

    Test against Ruby 2.0

    joneslee85 committed Jul 18, 2013
Commits on Jul 10, 2013
  1. @xaviershay

    Merge pull request #80 from RyanTG/master

    New textile manual link
    xaviershay committed Jul 9, 2013
  2. updated textile manual link

    RyanTG committed Jul 9, 2013
Commits on May 22, 2013
  1. @xaviershay

    Merge pull request #79 from gaelian/raw-html-fix

    Fix addressing the issue where HTML is too eagerly escaped with relation to comments, pages and posts.
    xaviershay committed May 22, 2013
  2. Fix addressing the issue where HTML is too eagerly escaped with

    relation to comments, pages and posts.
    committed May 22, 2013
Commits on Apr 21, 2013
  1. @xaviershay

    Merge pull request #77 from gaelian/superfluous-equals-signs

    Removed superfluous equals signs from ERB syntax.
    xaviershay committed Apr 21, 2013
Commits on Apr 20, 2013
Commits on Apr 18, 2013
  1. @xaviershay

    Merge pull request #75 from mcary/allow-path-prefix

    Allow running Enki under a URL path prefix
    xaviershay committed Apr 18, 2013
  2. Tweak URL path prefix patch to address feedback from xaviershay

    When reviewing my pull request, xaviershay requested these changes:
    
    * Use ActionController::Base.config.relative_url_root instead of
      ENV['RAILS_RELATIVE_URL_ROOT'] in the UrlHelper and rackup.ru
    * Mention the feature in the README, because it won't be found in
      config/application.rb
    
    Implement these, but use Rails.configuration instead of
    ActionController::Base.config, as it seems like the current Rails best
    practice.
    Marcel M. Cary committed Apr 18, 2013
  3. @xaviershay

    Merge pull request #73 from mcary/draft-posts

    Allow draft posts by special-casing blank published_at_natural
    xaviershay committed Apr 17, 2013
  4. Tweak draft posts patch to address feedback from xaviershay

    When reviewing my pull request, xaviershay requested these
    changes:
    
    * Add hint to published_at field on admin post edit form
    * Favor '&&' over 'and'
    * Stop stubbing Chronic.parse unnecessarily
    
    Implement these changes.
    Marcel M. Cary committed Apr 16, 2013
Commits on Apr 16, 2013
  1. Allow running Enki under a URL path prefix

    I run my blog in a subsdirectory of my web server.  That is,
    instead of blog.example.com, I use example.com/blog.  Rails 3 no longer
    supports that as an out-of-the-box configuration option.
    
    (There is an action_controller.relative_url_root key, but it doesn't
    handle asset helper paths or, under some servers, the top-level route
    rewriting.)
    
    Tweak routing and URLs in several places:
    
    * config.ru -- addresses most routing
    * Set RAILS_RELATIVE_URL_ROOT to make asset helpers work
    * Fix Enki-specific URLs in post_path helper and admin view to work
      in a non-root-path deployment
    
    In config/application.rb, comment an example line that sets
    RAILS_RELATIVE_URL_ROOT.  The line is commented so that the app still
    runs in "/", but a one-line config change or setting that environment
    variable would change that.
    Marcel M. Cary committed Apr 16, 2013
Something went wrong with that request. Please try again.