Commits on Jul 22, 2016
  1. @thomasdarde

    Prepare 2.0.0-pre release

    thomasdarde committed Jul 22, 2016
  2. @thomasdarde

    Merge pull request #126 from NomNomCameron/master

    Use before_action instead of deprecated before_filter
    thomasdarde committed on GitHub Jul 22, 2016
Commits on Jul 21, 2016
  1. @NomNomCameron
  2. @NomNomCameron

    Bump required ruby version

    NomNomCameron committed Jul 21, 2016
  3. @NomNomCameron
Commits on Jan 25, 2016
  1. @thomasdarde

    Merge pull request #122 from dnrce/rails5beta

    Add Rails 5.0 beta support
    thomasdarde committed Jan 25, 2016
Commits on Jan 21, 2016
  1. @dnrce

    Add Rails 5.0 beta support

    Fixes #121
    dnrce committed Jan 21, 2016
Commits on Jan 19, 2016
  1. @dnrce

    Merge pull request #120 from dnrce/ci-update-bundler

    CI: Update bundler before installing gems
    dnrce committed Jan 19, 2016
  2. @dnrce

    Merge pull request #119 from edgarhenriquez/fix-typos-in-readme

    Minor changes and typo fixes in README
    dnrce committed Jan 19, 2016
  3. @dnrce

    CI: Update bundler before installing gems

    Some versions of bundler are affected by a bug that causes them to throw
    
        NoMethodError: undefined method `spec' for nil:NilClass
    
    during installation of the tolk gem. This bug was fixed in bundler@a0c90cd, but several of
    Travis's Ruby environments are based on older affected versions. To resolve, we force an update.
    dnrce committed Jan 19, 2016
  4. @edgarhenriquez
Commits on Jan 7, 2016
  1. @thomasdarde

    Merge pull request #117 from fernandomm/strip-texts-config

    Add a config variable that allows user to disable text strip
    thomasdarde committed Jan 7, 2016
Commits on Dec 5, 2015
  1. @fernandomm
Commits on Jul 6, 2015
  1. @thomasdarde

    Merge pull request #112 from UgoMare/settings_readme

    Add settings section to ReadMe
    thomasdarde committed Jul 6, 2015
Commits on Jul 5, 2015
  1. @UgoMare

    Add settings section to ReadMe

    UgoMare committed Jul 5, 2015
Commits on May 25, 2015
  1. @thomasdarde

    Fix #108 backported

    thomasdarde committed May 4, 2015
Commits on May 21, 2015
  1. @thomasdarde

    Version 1.9.3

    thomasdarde committed May 21, 2015
  2. @thomasdarde

    Merge pull request #111 from wpp/pagination_constant

    Pagination constant (before load_missing_constant is called).
    thomasdarde committed May 21, 2015
Commits on May 20, 2015
  1. @wpp
Commits on May 4, 2015
  1. @thomasdarde

    1.9.2

    thomasdarde committed May 4, 2015
  2. @thomasdarde

    Merge pull request #109 from lime/gem-initializers

    Include initializers in gem files
    thomasdarde committed May 4, 2015
  3. @lime

    Include initializers in gem files

    lime committed May 4, 2015
Commits on Apr 21, 2015
  1. @thomasdarde

    Merge pull request #106 from matfiz/master

    fixes require statements to match sprockets style
    thomasdarde committed Apr 21, 2015
  2. @matfiz
Commits on Apr 1, 2015
  1. @thomasdarde

    Version 1.9.1

    thomasdarde committed Apr 1, 2015
  2. @thomasdarde

    Error on path detection

    thomasdarde committed Apr 1, 2015
Commits on Mar 28, 2015
  1. @thomasdarde
  2. @thomasdarde

    Version 1.8

    thomasdarde committed Mar 28, 2015
  3. @thomasdarde

    Merge branch 'exclude-gems-token' of git://github.com/tsai146/tolk in…

    …to tsai146-exclude-gems-token
    
    # Conflicts:
    #	lib/tolk/config.rb
    thomasdarde committed Mar 28, 2015
  4. @thomasdarde

    Tolk 1.7 rails 2 compat

    thomasdarde committed Nov 12, 2014
Commits on Mar 12, 2015
  1. @thomasdarde

    Merge pull request #102 from raouldevil/master

    Updated usage and dump instructions.
    thomasdarde committed Mar 12, 2015
  2. @raouldevil
  3. @thomasdarde

    Merge pull request #97 from lime/pagination-agnostic

    Make Tolk able to use either Kaminari or will_paginate
    thomasdarde committed Mar 12, 2015
Commits on Feb 24, 2015
  1. @lime

    Make Tolk able to use either Kaminari or will_paginate

    As a solution for #62, neither gem is required as a dependency.
    Instead, the user gets to pick which one to use, thus avoiding
    conflicts between the two gems.
    
    Heavily borrowed from https://github.com/radar/forem.
    lime committed Feb 24, 2015
Commits on Jan 5, 2015
  1. @thomasdarde

    Merge pull request #95 from luislee818/master

    Remove assigned but unused variables in sync_test
    thomasdarde committed Jan 5, 2015