Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Breadcrumbs #723

Closed
wants to merge 191 commits into from
Closed

Add Breadcrumbs #723

wants to merge 191 commits into from

Commits on Oct 22, 2011

  1. add Bootstrap from Twitter

    @WaYdotNET
    WaYdotNET committed Oct 22, 2011
    Copy the full SHA
    3c2f629 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2011

  1. remove xlarge and add span5

    @WaYdotNET
    WaYdotNET committed Oct 25, 2011
    Copy the full SHA
    499f181 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2011

  1. form builder check_box: create hidden value with uncheck_value only if 

    uncheck_value exist
    @WaYdotNET
    WaYdotNET committed Oct 28, 2011
    Copy the full SHA
    07e5aa1 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2011

  1. remove puts sorry :P

    @WaYdotNET
    WaYdotNET committed Oct 31, 2011
    Copy the full SHA
    a05748d View commit details
    Browse the repository at this point in the history

  2. fix

    @WaYdotNET
    WaYdotNET committed Oct 31, 2011
    Copy the full SHA
    a8adddf View commit details
    Browse the repository at this point in the history

  3. New admin based on bootstrap. 

    Thanks to @WaYdotNET.

As requested in issue padrino#568

We added:

* Twitter Bootstrap Support
* Table search
* Table sorting
* Table pagination

Still pending:

* Add Close button flash notices.

Fix padrino#708
    @DAddYE
    DAddYE committed Oct 31, 2011
    1
    Copy the full SHA
    2b437f3 View commit details
    Browse the repository at this point in the history

  4. Improved new admin with: 

    * Close buttons for flashes
* Modal dialogs for `error_messages_for`
    @DAddYE
    DAddYE committed Oct 31, 2011
    Copy the full SHA
    f98ee9d View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' 

    * upstream/master:
  Revert "[padrino-core] to_s route paths before joining"
  Added Mac DS_Store file
  README to be changed once project is generated
  [padrino-core] to_s route paths before joining
  add regexp route generation
    @WaYdotNET
    WaYdotNET committed Oct 31, 2011
    Copy the full SHA
    dc6a3be View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/bootstrap' 

    * upstream/bootstrap:
  Improved new admin with:
  New admin based on bootstrap.
    @WaYdotNET
    WaYdotNET committed Oct 31, 2011
    Copy the full SHA
    967cf76 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2011

  1. Added missing modal as mentioned in padrino#568.

    @DAddYE
    DAddYE committed Nov 1, 2011
    Copy the full SHA
    f0a2d0c View commit details
    Browse the repository at this point in the history

  2. Ruby Style.

    @DAddYE
    DAddYE committed Nov 1, 2011
    Copy the full SHA
    4b2e42c View commit details
    Browse the repository at this point in the history

  3. Wrong insertion into Gemfile fixed, like: 

    gem 'bcrypt-ruby', require => 'bcrypt' (should be :require)
    @sumskyi
    sumskyi committed Nov 1, 2011
    Copy the full SHA
    24e1bf9 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/bootstrap' 

    * upstream/bootstrap:
  Ruby Style.
  Added missing modal as mentioned in padrino#568.
    @WaYdotNET
    WaYdotNET committed Nov 1, 2011
    Copy the full SHA
    0ed4ff7 View commit details
    Browse the repository at this point in the history

  5. Revert 0ed4ff7^..HEAD

    @WaYdotNET
    WaYdotNET committed Nov 1, 2011
    Copy the full SHA
    a6c4f2f View commit details
    Browse the repository at this point in the history

  6. broken markup fix (FF)

    @sumskyi
    sumskyi committed Nov 1, 2011
    Copy the full SHA
    5de461b View commit details
    Browse the repository at this point in the history

  7. Merge pull request padrino#712 from sumskyi/bootstrap 

    insert_into_gemfile() fix
    @achiurizo
    achiurizo committed Nov 1, 2011
    Copy the full SHA
    4712712 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'upstream/bootstrap' 

    * upstream/bootstrap:
  broken markup fix (FF)
  Wrong insertion into Gemfile fixed, like: gem 'bcrypt-ruby', require => 'bcrypt' (should be :require)
    @WaYdotNET
    WaYdotNET committed Nov 1, 2011
    Copy the full SHA
    8d66652 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2011

  1. add slim support change flash style into "index" page

    @WaYdotNET
    WaYdotNET committed Nov 2, 2011
    Copy the full SHA
    c68c6df View commit details
    Browse the repository at this point in the history

  2. after create model, render index page and not edit page

    @WaYdotNET
    WaYdotNET committed Nov 2, 2011
    Copy the full SHA
    eebb5ab View commit details
    Browse the repository at this point in the history

  3. fix redirect after add new model

    @WaYdotNET
    WaYdotNET committed Nov 2, 2011
    Copy the full SHA
    6cf5cc3 View commit details
    Browse the repository at this point in the history

  4. modify redirect after update

    @WaYdotNET
    WaYdotNET committed Nov 2, 2011
    Copy the full SHA
    589548f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:padrino/padrino-framework into bo… 

    …otstrap
    @DAddYE
    DAddYE committed Nov 2, 2011
    Copy the full SHA
    fb715cf View commit details
    Browse the repository at this point in the history

  6. Merge branch 'bootstrap' of github.com:padrino/padrino-framework into… 

    … bootstrap
    @DAddYE
    DAddYE committed Nov 2, 2011
    Copy the full SHA
    5b227cd View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into bootstrap 

    Conflicts:
	padrino-gen/lib/padrino-gen/generators/project.rb
    @DAddYE
    DAddYE committed Nov 2, 2011
    Copy the full SHA
    19ddeab View commit details
    Browse the repository at this point in the history

  8. add save_and_continue button 

    Add save_and_continue button….pls check language translate :D:D:D
    @WaYdotNET
    WaYdotNET committed Nov 2, 2011
    Copy the full SHA
    7208db8 View commit details
    Browse the repository at this point in the history

  9. fix save_and_continue

    @WaYdotNET
    WaYdotNET committed Nov 2, 2011
    Copy the full SHA
    6882dec View commit details
    Browse the repository at this point in the history

  10. refactor code 

    tanks @DAddYE
    @WaYdotNET
    WaYdotNET committed Nov 2, 2011
    Copy the full SHA
    01431fd View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2011

  1. Merge pull request padrino#713 from WaYdotNET/master 

    add slim and save_and_continue button
    @DAddYE
    DAddYE committed Nov 4, 2011
    Copy the full SHA
    8c90f03 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:padrino/padrino-framework into bo… 

    …otstrap
    @DAddYE
    DAddYE committed Nov 4, 2011
    Copy the full SHA
    4f73e31 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'bootstrap' of github.com:padrino/padrino-framework into… 

    … bootstrap
    @DAddYE
    DAddYE committed Nov 4, 2011
    Copy the full SHA
    3664990 View commit details
    Browse the repository at this point in the history

  4. Removed and unused asset.

    @DAddYE
    DAddYE committed Nov 4, 2011
    Copy the full SHA
    56c9be0 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2011

  1. Some new enhancement to the new padrino-admin.

    @DAddYE
    DAddYE committed Nov 12, 2011
    Copy the full SHA
    629320c View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2011

  1. Merge branch 'master' of github.com:padrino/padrino-framework into bo… 

    …otstrap
    @DAddYE
    DAddYE committed Nov 22, 2011
    Copy the full SHA
    e769e66 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2011

  1. Merge branch 'master' into bootstrap 

    Conflicts:
	padrino-gen/lib/padrino-gen/generators/mailer.rb
    @DAddYE
    DAddYE committed Dec 20, 2011
    Copy the full SHA
    54a6487 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2012

  1. Merge branch 'master' into bootstrap

    @DAddYE
    DAddYE committed Jan 3, 2012
    Copy the full SHA
    fabe741 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2012

  1. Merge branch 'master' into bootstrap 

    Conflicts:
	padrino-admin/lib/padrino-admin/generators/templates/app.rb.tt
	padrino-gen/lib/padrino-gen/generators/actions.rb
    @DAddYE
    DAddYE committed Jan 24, 2012
    Copy the full SHA
    67e3a9f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:padrino/padrino-framework into bo… 

    …otstrap
    @DAddYE
    DAddYE committed Jan 24, 2012
    Copy the full SHA
    08610a3 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2012

  1. modify slim template

    @WaYdotNET
    WaYdotNET committed Jan 27, 2012
    Copy the full SHA
    312a02e View commit details
    Browse the repository at this point in the history

  2. add time_ago_in_words when column name is created_at or updated_at in

    @WaYdotNET
    WaYdotNET committed Jan 27, 2012
    Copy the full SHA
    2d4175e View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2012

  1. Breadcrumbs !!

    @WaYdotNET
    WaYdotNET committed Jan 28, 2012
    Copy the full SHA
    75be18c View commit details
    Browse the repository at this point in the history

  2. Replace true or false with relative image

    @WaYdotNET
    WaYdotNET committed Jan 28, 2012
    Copy the full SHA
    a02efca View commit details
    Browse the repository at this point in the history

  3. Upgrade Twitter Bootstrap 2.0-wip

    @WaYdotNET
    WaYdotNET committed Jan 28, 2012
    Copy the full SHA
    0766e52 View commit details
    Browse the repository at this point in the history

  4. fix breadcrumbs

    @WaYdotNET
    WaYdotNET committed Jan 28, 2012
    Copy the full SHA
    702d620 View commit details
    Browse the repository at this point in the history

  5. fix some error

    @WaYdotNET
    WaYdotNET committed Jan 28, 2012
    Copy the full SHA
    693ec84 View commit details
    Browse the repository at this point in the history

  6. Add migration rake for MiniTest, thanks to @dotnetguyuk

    @WaYdotNET
    WaYdotNET committed Jan 28, 2012
    Copy the full SHA
    5dd03a1 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2012

  1. mini-refactor modal code

    @WaYdotNET
    WaYdotNET committed Jan 29, 2012
    Copy the full SHA
    105c7d5 View commit details
    Browse the repository at this point in the history

  2. comment code into progress-bar,less

    @WaYdotNET
    WaYdotNET committed Jan 29, 2012
    Copy the full SHA
    ea18340 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2012

  1. fix js

    @WaYdotNET
    WaYdotNET committed Jan 30, 2012
    Copy the full SHA
    0df808b View commit details
    Browse the repository at this point in the history

  2. fix breadcrumbs "edit"

    @WaYdotNET
    WaYdotNET committed Jan 30, 2012
    Copy the full SHA
    352aaa5 View commit details
    Browse the repository at this point in the history

  3. fix session.new

    @WaYdotNET
    WaYdotNET committed Jan 30, 2012
    Copy the full SHA
    12cff9b View commit details
    Browse the repository at this point in the history

  4. fix less file

    @WaYdotNET
    WaYdotNET committed Jan 30, 2012
    Copy the full SHA
    e4a4b57 View commit details
    Browse the repository at this point in the history

  5. refix sytle

    @WaYdotNET
    WaYdotNET committed Jan 30, 2012
    Copy the full SHA
    bfaf87d View commit details
    Browse the repository at this point in the history

  6. migrate to last twitter bootstrap 2.0 (wip)

    @WaYdotNET
    WaYdotNET committed Jan 30, 2012
    Copy the full SHA
    69243cc View commit details
    Browse the repository at this point in the history

  7. fix breadcrumbs

    @WaYdotNET
    WaYdotNET committed Jan 30, 2012
    Copy the full SHA
    88623eb View commit details
    Browse the repository at this point in the history

  8. padrino-admin haml generator not work now (old code) sorry.

    @WaYdotNET
    WaYdotNET committed Jan 30, 2012
    Copy the full SHA
    6fdd6a1 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2012

  1. upgrade to Twitter Bootstrap v 2.0

    @WaYdotNET
    WaYdotNET committed Feb 1, 2012
    Copy the full SHA
    3632728 View commit details
    Browse the repository at this point in the history

  2. upgrade slim template (work with twitter bootsrap 2.0)

    @WaYdotNET
    WaYdotNET committed Feb 1, 2012
    Copy the full SHA
    28933f4 View commit details
    Browse the repository at this point in the history

  3. fix padrino-modal

    @WaYdotNET
    WaYdotNET committed Feb 1, 2012
    Copy the full SHA
    f4c575c View commit details
    Browse the repository at this point in the history

  4. sync to master

    @WaYdotNET
    WaYdotNET committed Feb 1, 2012
    Copy the full SHA
    56381e2 View commit details
    Browse the repository at this point in the history

  5. refix padrino-modal

    @WaYdotNET
    WaYdotNET committed Feb 1, 2012
    Copy the full SHA
    e0b4642 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'refs/heads/original' 

    * refs/heads/original:
  Bundle update.
  Redis Server is already here.
  Forgot sudo. (Travis)
  Improve Travis support.
  Fix padrino#768
  Bump to prerelease 0.10.6.c
  Fixes type, thanks @ujifgc
  Add stylesheet initializers change to changelog
  Assets from an absolute paths no longer have asset stamps appended
  Updated stylesheets initializers to respect spaces.
    @WaYdotNET
    WaYdotNET committed Feb 1, 2012
    Copy the full SHA
    fbb10e7 View commit details
    Browse the repository at this point in the history

  7. padrino-admin now work also with haml :D (yheaa!!!)

    @WaYdotNET
    WaYdotNET committed Feb 1, 2012
    Copy the full SHA
    208696a View commit details
    Browse the repository at this point in the history

  8. update readme

    @WaYdotNET
    WaYdotNET committed Feb 1, 2012
    Copy the full SHA
    0352d62 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2012

  1. add image and link to demo

    @WaYdotNET
    WaYdotNET committed Feb 2, 2012
    Copy the full SHA
    e45efc5 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/padrino/master' 

    * refs/remotes/padrino/master:
  Travis rbx-19mode
    @WaYdotNET
    WaYdotNET committed Feb 2, 2012
    Copy the full SHA
    71c6abe View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2012

  1. Remove rbx from travis. No way to compile bcrypt-ruby.

    @DAddYE
    DAddYE committed Feb 6, 2012
    Copy the full SHA
    d980b11 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2012

  1. Fix model_attribute_translate example

    jfcixmedia committed Feb 9, 2012
    Copy the full SHA
    afcd5b4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#781 from jfcixmedia/master 

    Documentation for i18n translation helpers
    @nesquena
    nesquena committed Feb 9, 2012
    Copy the full SHA
    cdbb7cb View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2012

  1. [Fix padrino#784] ActiveRecord rake file should not prompt the user t… 

    …o log in as root if database authentication fails
    @jfarmer
    jfarmer committed Feb 11, 2012
    Copy the full SHA
    5c40be1 View commit details
    Browse the repository at this point in the history

  2. Rescue from StandardError vs. Exception, and print out error messages… 

    … to STDERR in a consistent format
    @jfarmer
    jfarmer committed Feb 11, 2012
    Copy the full SHA
    48050b9 View commit details
    Browse the repository at this point in the history

  3. Include timestampe by default in ActiveRecord

    @jfarmer
    jfarmer committed Feb 11, 2012
    Copy the full SHA
    88bdf59 View commit details
    Browse the repository at this point in the history

  4. This is ugly, but use ActiveRecord::Migration#change if we can

    @jfarmer
    jfarmer committed Feb 11, 2012
    Copy the full SHA
    9a3a32a View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2012

  1. Allow nested hash hierarchies for "data" option 

    e.g. :data => {:dojo => {:type => xxx, :props => yyy}}
    @agios
    agios committed Feb 14, 2012
    Copy the full SHA
    25eb60d View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2012

  1. Fix padrino#780 - Admin generator is not completely aware of the user… 

    … defined model name
    @joelcuevas
    joelcuevas committed Feb 15, 2012
    Copy the full SHA
    61e54e8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#788 from joelcuevas/master 

    Fixes padrino#780 - Admin generator is not completely aware of the user defined model name.
    @DAddYE
    DAddYE committed Feb 15, 2012
    Copy the full SHA
    670f8ea View commit details
    Browse the repository at this point in the history

  3. Still trying to fix padrino#780. Some templates wasn't aware of a cus… 

    …tom model name.
    @joelcuevas
    joelcuevas committed Feb 15, 2012
    Copy the full SHA
    417467b View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2012

  1. Update padrino-cache/lib/padrino-cache/helpers/fragment.rb

    Michael Papile committed Feb 16, 2012
    Copy the full SHA
    90e0504 View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#789 from papile/master 

    Fragment caching currently disregards block content when caching is turned off
    @DAddYE
    DAddYE committed Feb 16, 2012
    Copy the full SHA
    f733fce View commit details
    Browse the repository at this point in the history

  3. Merge pull request padrino#785 from jfarmer/master 

    [Fix padrino#784] ActiveRecord rake file should not prompt the user to log in as root if database authentication fails
    @DAddYE
    DAddYE committed Feb 16, 2012
    Copy the full SHA
    f208a8e View commit details
    Browse the repository at this point in the history

  4. Drop support for old ActiveRecord Migration Syntax.

    @DAddYE
    DAddYE committed Feb 16, 2012
    Copy the full SHA
    d1021b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2012

  1. Merge remote-tracking branch 'upstream/master'

    Carlo Bertini committed Feb 17, 2012
    Copy the full SHA
    d53ef16 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2012

  1. update to twitter 2.0.2-wip

    @WaYdotNET
    WaYdotNET committed Feb 21, 2012
    Copy the full SHA
    e86b336 View commit details
    Browse the repository at this point in the history

  2. Correctly report the loaded console environment when set via environm… 

    …ent variables
    David Genord II committed Feb 21, 2012
    Copy the full SHA
    c28ef48 View commit details
    Browse the repository at this point in the history

  3. Merge pull request padrino#791 from xspond/correct-console-env 

    Correctly report the loaded console environment when set via environment variables
    @DAddYE
    DAddYE committed Feb 21, 2012
    Copy the full SHA
    43c52fe View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2012

  1. Fast development mode

    @DAddYE
    DAddYE committed Feb 22, 2012
    Copy the full SHA
    4a09c0e View commit details
    Browse the repository at this point in the history

  2. Add correclty ActiveRecord Middleware. Fix padrino#792

    @DAddYE
    DAddYE committed Feb 22, 2012
    1
    Copy the full SHA
    84f050f View commit details
    Browse the repository at this point in the history

  3. Fix travis.

    @DAddYE
    DAddYE committed Feb 22, 2012
    Copy the full SHA
    b6d9ee9 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2012

  1. Generate middleware only for ActiveRecord orm. Ref.: padrino#680

    @DAddYE
    DAddYE committed Feb 23, 2012
    3
    Copy the full SHA
    e4b9e28 View commit details
    Browse the repository at this point in the history

  2. Revert "Drop support for XHTML flavor tags. HTML 5 supports both" 

    This reverts commit 0327c97.
    @DAddYE
    DAddYE committed Feb 23, 2012
    1
    Copy the full SHA
    cdb92a0 View commit details
    Browse the repository at this point in the history

  3. Correct docs.

    @DAddYE
    DAddYE committed Feb 23, 2012
    Copy the full SHA
    3e874a1 View commit details
    Browse the repository at this point in the history

  4. Bumped version to 0.10.6.d

    @DAddYE
    DAddYE committed Feb 23, 2012
    Copy the full SHA
    ef4b170 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Feb 23, 2012
    Copy the full SHA
    7dfaa5d View commit details
    Browse the repository at this point in the history

  6. Bumped version to 0.10.6.e

    @DAddYE
    DAddYE committed Feb 23, 2012
    Copy the full SHA
    f70cc49 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Feb 23, 2012
    Copy the full SHA
    683e46c View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2012

  1. Fix model directory specification for mongoid tasks.

    @yuya-takeyama
    yuya-takeyama committed Feb 25, 2012
    Copy the full SHA
    8d2b6b9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#795 from yuya-takeyama/fix-rake-mi-create-… 

    …indexes

Mongoid tasks not work
    @DAddYE
    DAddYE committed Feb 25, 2012
    Copy the full SHA
    711bb69 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Feb 26, 2012
    Copy the full SHA
    4fa32e8 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2012

  1. Fix some remaining issues when generating an admin app using a custom… 

    … model

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
    @dcu
    dcu committed Feb 27, 2012
    Copy the full SHA
    0dbf8b5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#794 from dcu/master 

    Fix some remaining issues when generating an admin app using a custom model
    @DAddYE
    DAddYE committed Feb 27, 2012
    Copy the full SHA
    be5759e View commit details
    Browse the repository at this point in the history

  3. merge with upstream/master

    @WaYdotNET
    WaYdotNET committed Feb 27, 2012
    Copy the full SHA
    ae66b5f View commit details
    Browse the repository at this point in the history

  4. fix missing clean code

    @WaYdotNET
    WaYdotNET committed Feb 27, 2012
    Copy the full SHA
    073a02d View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2012

  1. fix

    @WaYdotNET
    WaYdotNET committed Feb 28, 2012
    Copy the full SHA
    d93c018 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2012

  1. Properly detect Windows based hosts for ansi coloring

    Benjamin Bloch committed Mar 2, 2012
    Copy the full SHA
    9eb705a View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#797 from Cirex/master 

    Detecting Windows based hosts for ansi coloring
    @nesquena
    nesquena committed Mar 2, 2012
    Copy the full SHA
    a35faf0 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Mar 2, 2012
    Copy the full SHA
    133087d View commit details
    Browse the repository at this point in the history

  4. add Icon's Bootstrap helper

    @WaYdotNET
    WaYdotNET committed Mar 2, 2012
    Copy the full SHA
    c8da645 View commit details
    Browse the repository at this point in the history

  5. fix Icon's Bootstrap helper

    @WaYdotNET
    WaYdotNET committed Mar 2, 2012
    Copy the full SHA
    f6eca80 View commit details
    Browse the repository at this point in the history

  6. add icon into navbar form

    @WaYdotNET
    WaYdotNET committed Mar 2, 2012
    Copy the full SHA
    9205c5c View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2012

  1. remove default icon

    @WaYdotNET
    WaYdotNET committed Mar 6, 2012
    Copy the full SHA
    51d507f View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2012

  1. Added test for nested data attributes

    @agios
    agios committed Mar 7, 2012
    Copy the full SHA
    21312fe View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	padrino-helpers/test/test_tag_helpers.rb
    @agios
    agios committed Mar 7, 2012
    Copy the full SHA
    d2de420 View commit details
    Browse the repository at this point in the history

  3. Added necessary requires

    @agios
    agios committed Mar 7, 2012
    Copy the full SHA
    106880a View commit details
    Browse the repository at this point in the history

  4. Continue running tests if one fails

    @agios
    agios committed Mar 7, 2012
    Copy the full SHA
    df93b9b View commit details
    Browse the repository at this point in the history

  5. Added nested data attributes test

    @agios
    agios committed Mar 7, 2012
    Copy the full SHA
    b427f2f View commit details
    Browse the repository at this point in the history

  6. Fixes a random error, where 'Less::Parser' was scoped as 'Less::Parse… 

    …r::Less::Parser'.
    @fnordfish
    fnordfish committed Mar 7, 2012
    Copy the full SHA
    5be90e2 View commit details
    Browse the repository at this point in the history

  7. Merge pull request padrino#800 from fnordfish/patch-1 

    Fixes a random error, where 'Less::Parser' was scoped wrongly...
    @skade
    skade committed Mar 7, 2012
    Copy the full SHA
    ef48063 View commit details
    Browse the repository at this point in the history

  8. write cached css files into the default destination for public styles… 

    …heets
    @fnordfish
    fnordfish committed Mar 7, 2012
    Copy the full SHA
    c81b095 View commit details
    Browse the repository at this point in the history

  9. Merge pull request padrino#801 from fnordfish/master 

    write cached css files into the default destination for public stylesheets
    @nesquena
    nesquena committed Mar 7, 2012
    Copy the full SHA
    1a6c9e5 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Mar 7, 2012
    Copy the full SHA
    8fd056e View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2012

  1. Update README.rdoc

    @WaYdotNET
    WaYdotNET committed Mar 9, 2012
    Copy the full SHA
    0f59583 View commit details
    Browse the repository at this point in the history

  2. Update README.rdoc

    @WaYdotNET
    WaYdotNET committed Mar 9, 2012
    Copy the full SHA
    4f237ca View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2012

  1. Lumberjack Compat. Fixes padrino#799

    @DAddYE
    DAddYE committed Mar 11, 2012
    Copy the full SHA
    16fa20f View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2012

  1. Fix some reloader issues. Mentioned here padrino#786

    @DAddYE
    DAddYE committed Mar 12, 2012
    Copy the full SHA
    7844404 View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#787 from agios/master 

    Allow nested hashes for "data" property in tag helper
    @DAddYE
    DAddYE committed Mar 12, 2012
    Copy the full SHA
    8173344 View commit details
    Browse the repository at this point in the history

  3. Cleanup nested attributes.

    @DAddYE
    DAddYE committed Mar 12, 2012
    Copy the full SHA
    a7af2e0 View commit details
    Browse the repository at this point in the history

  4. Make 'data' attributes also available in all tags.

    @DAddYE
    DAddYE committed Mar 12, 2012
    Copy the full SHA
    d0845dc View commit details
    Browse the repository at this point in the history

  5. Remove 'data-method' from form_tag since the hidden_field :_method 

    already override it.
    @DAddYE
    DAddYE committed Mar 12, 2012
    Copy the full SHA
    9c8deed View commit details
    Browse the repository at this point in the history

  6. Fix previous commit.

    @DAddYE
    DAddYE committed Mar 12, 2012
    Copy the full SHA
    30e789e View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Mar 13, 2012
    Copy the full SHA
    698ef90 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:WaYdotNET/padrino-framework

    @WaYdotNET
    WaYdotNET committed Mar 13, 2012
    Copy the full SHA
    9c4df04 View commit details
    Browse the repository at this point in the history

  3. Fixes a SyntaxError.

    @fnordfish
    fnordfish committed Mar 13, 2012
    Copy the full SHA
    2fdca28 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from fnordfish/patch-2 

    SyntaxError in admin's application layout
    @WaYdotNET
    WaYdotNET committed Mar 13, 2012
    Copy the full SHA
    9f6ed22 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2012

  1. removes css class "center-block", which is a less mixin, not a real c… 

    …ss class and thus has no effect.

corrects nesting of footer paragraphs which lead to invalid mark generation
    @fnordfish
    fnordfish committed Mar 14, 2012
    Copy the full SHA
    9e03819 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from fnordfish/patch-3 

    admin's haml footer generates invalid markup
    @WaYdotNET
    WaYdotNET committed Mar 14, 2012
    Copy the full SHA
    44dce81 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2012

  1. Update to TwitterBootstrap 2.0.2

    @WaYdotNET
    WaYdotNET committed Mar 15, 2012
    Copy the full SHA
    a07f9f1 View commit details
    Browse the repository at this point in the history

  2. real update to TwitterBootstrap 2.0.2, sorry :P

    @WaYdotNET
    WaYdotNET committed Mar 15, 2012
    Copy the full SHA
    65e1d51 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2012

  1. Update changelog

    @nesquena
    nesquena committed Mar 16, 2012
    Copy the full SHA
    3b18cae View commit details
    Browse the repository at this point in the history

  2. Bumped version to 0.10.6

    @nesquena
    nesquena committed Mar 16, 2012
    Copy the full SHA
    d5f0e2a View commit details
    Browse the repository at this point in the history

  3. Update changelog

    @nesquena
    nesquena committed Mar 16, 2012
    Copy the full SHA
    e650330 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Mar 16, 2012
    Copy the full SHA
    da489f0 View commit details
    Browse the repository at this point in the history

  5. fix lessjs library into session/new

    @WaYdotNET
    WaYdotNET committed Mar 16, 2012
    Copy the full SHA
    6591c76 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2012

  1. Propose a new fix for padrino#807 and padrino#808

    @DAddYE
    DAddYE committed Mar 18, 2012
    3
    Copy the full SHA
    5c2623e View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Mar 19, 2012
    Copy the full SHA
    601f225 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2012

  1. Added a failing test for our routing system.

    @DAddYE
    DAddYE committed Mar 23, 2012
    Copy the full SHA
    41ac060 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Mar 23, 2012
    Copy the full SHA
    e1619a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2012

  1. Added support for activerecord-jdbcmysql-adapter for ActiveRecord tasks 

    ar:create, ar:drop and few others did not work with activerecord-jdbcmysql-adapter when using jruby
    Ramesh Perumalsamy committed Mar 27, 2012
    Copy the full SHA
    c22420c View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#813 from rameshpy/master 

    activerecord-jdbcmysql-adapter tasks support
    @nesquena
    nesquena committed Mar 27, 2012
    Copy the full SHA
    8b02ada View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Mar 27, 2012
    Copy the full SHA
    cf3aab5 View commit details
    Browse the repository at this point in the history

  4. Fix options_for_select result in a corner case.

    @whitequark
    whitequark committed Mar 27, 2012
    Copy the full SHA
    caf5492 View commit details
    Browse the repository at this point in the history

  5. Merge pull request padrino#814 from whitequark/master 

    Fix options_for_select form helper result in a corner case.
    @DAddYE
    DAddYE committed Mar 27, 2012
    Copy the full SHA
    40e0ecc View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Mar 27, 2012
    Copy the full SHA
    f039adc View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2012

  1. Typo in documentation: "Appliocation" -> "Application"

    @Frost
    Frost committed Apr 5, 2012
    Copy the full SHA
    0b52251 View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#825 from Frost/patch-1 

    Typo in documentation: `"Appliocation" -> "Application"`
    @skade
    skade committed Apr 5, 2012
    Copy the full SHA
    3e0af28 View commit details
    Browse the repository at this point in the history

  3. Use _orig_klass_name in reloader to fix pry / jruby

    @nesquena
    nesquena committed Apr 5, 2012
    Copy the full SHA
    865d67c View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Apr 6, 2012
    Copy the full SHA
    8bf5122 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2012

  1. remove tlsmail dependency - already in mail gem 

    mail >= 2.3.0 has:
  gem "tlsmail" if RUBY_VERSION <= '1.8.6'
    @trevor
    trevor committed Apr 12, 2012
    Copy the full SHA
    165743e View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#828 from trevor/patch-1 

    remove tlsmail dependency - already in mail gem
    @joshbuddy
    joshbuddy committed Apr 12, 2012
    Copy the full SHA
    c079e1a View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2012

  1. Adding an options attribute to ProjectModule

    Simon COURTOIS committed Apr 13, 2012
    Copy the full SHA
    35844fc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Apr 13, 2012
    Copy the full SHA
    0c5cb06 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2012

  1. Adds a catch all method to the redis cache.

    @icco
    icco committed Apr 23, 2012
    Copy the full SHA
    a7a21c3 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2012

  1. Merge pull request padrino#832 from joelcuevas/master 

    Fix padrino#780. Found that some templates wasn't aware of the user-defined model name in admin generator.
    @DAddYE
    DAddYE committed Apr 25, 2012
    Copy the full SHA
    50b3f9b View commit details
    Browse the repository at this point in the history

  2. Clean and test code. Fix padrino#780 issue.

    @DAddYE
    DAddYE committed Apr 25, 2012
    Copy the full SHA
    3f7081d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Apr 25, 2012
    Copy the full SHA
    cfd9e46 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2012

  1. [handler] Fixes slim handler capturing

    @nesquena
    nesquena committed Apr 26, 2012
    Copy the full SHA
    8b79d57 View commit details
    Browse the repository at this point in the history

  2. Adds back test for slim for link_to

    @nesquena
    nesquena committed Apr 26, 2012
    Copy the full SHA
    8a670de View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2012

  1. Merge pull request padrino#829 from simonc/adding-options-to-project-… 

    …module

Adding an options attribute to ProjectModule
    @DAddYE
    DAddYE committed Apr 27, 2012
    Copy the full SHA
    fd716cb View commit details
    Browse the repository at this point in the history

  2. Update changelog with new additions

    @nesquena
    nesquena committed Apr 27, 2012
    Copy the full SHA
    08a77a5 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Apr 27, 2012
    Copy the full SHA
    f5f7556 View commit details
    Browse the repository at this point in the history

  4. fix identation

    @WaYdotNET
    WaYdotNET committed Apr 27, 2012
    Copy the full SHA
    02e2430 View commit details
    Browse the repository at this point in the history

  5. fix haml

    @WaYdotNET
    WaYdotNET committed Apr 27, 2012
    Copy the full SHA
    ef52c11 View commit details
    Browse the repository at this point in the history

  6. update to Twitter Bootstrap 2.0.3

    @WaYdotNET
    WaYdotNET committed Apr 27, 2012
    Copy the full SHA
    b98a5d2 View commit details
    Browse the repository at this point in the history

  7. Update readme

    @WaYdotNET
    WaYdotNET committed Apr 27, 2012
    Copy the full SHA
    4d32797 View commit details
    Browse the repository at this point in the history

  8. remove Improve slim template block capturing fix padrino#777

    @WaYdotNET
    WaYdotNET committed Apr 27, 2012
    Copy the full SHA
    82a8253 View commit details
    Browse the repository at this point in the history

  9. fix icons path

    @WaYdotNET
    WaYdotNET committed Apr 27, 2012
    Copy the full SHA
    b9a1e5d View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2012

  1. Passes function calls along as suggested in padrino#836

    @icco
    icco committed Apr 28, 2012
    Copy the full SHA
    168f1c2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of git://github.com/padrino/padrino-framework i… 

    …nto redis-extension
    @icco
    icco committed Apr 28, 2012
    Copy the full SHA
    910ab1b View commit details
    Browse the repository at this point in the history

  3. Adds a test for the new method_missing function in redis.

    @icco
    icco committed Apr 28, 2012
    Copy the full SHA
    15cd12d View commit details
    Browse the repository at this point in the history

  4. Actually passes a method name into respond_to?

    @icco
    icco committed Apr 28, 2012
    Copy the full SHA
    459c73c View commit details
    Browse the repository at this point in the history

  5. Changes the method declaration to be a little more specific.

    @icco
    icco committed Apr 28, 2012
    Copy the full SHA
    54409cc View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2012

  1. Patched to fix rake use in padrino templates.

    @jasonm23
    jasonm23 committed Apr 30, 2012
    Copy the full SHA
    aac2135 View commit details
    Browse the repository at this point in the history

  2. Merge pull request padrino#841 from jasonm23/patch-1 

    Patched to fix rake use in padrino templates.
    @DAddYE
    DAddYE committed Apr 30, 2012
    Copy the full SHA
    9e34b16 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Apr 30, 2012
    Copy the full SHA
    4039f3b View commit details
    Browse the repository at this point in the history

  4. Merge pull request padrino#836 from icco/redis-extension 

    Expand Padrino::Cache to support all features of underlying cache
    @DAddYE
    DAddYE committed Apr 30, 2012
    Copy the full SHA
    7832933 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed May 2, 2012
    Copy the full SHA
    968b485 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2012

  1. fix login demo :D

    @WaYdotNET
    WaYdotNET committed May 22, 2012
    Copy the full SHA
    01b0a94 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2012

  1. Fixes admin generator padrino#846

    @WaYdotNET
    WaYdotNET committed May 23, 2012
    Copy the full SHA
    68e901d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:WaYdotNET/padrino-framework

    @WaYdotNET
    WaYdotNET committed May 23, 2012
    Copy the full SHA
    2b8467a View commit details
    Browse the repository at this point in the history

  3. clean code for twbootstrap

    @WaYdotNET
    WaYdotNET committed May 23, 2012
    Copy the full SHA
    fa4bec5 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2012

  1. Make mysql2 a alias of mysql when DataMapper is selected 

    DataMapper has `do_mysql' that is the version of MySQL driver.
So `mysql2' should be considered as a alias of `mysql' adapter.
    aereal committed May 29, 2012
    Copy the full SHA
    61753fa View commit details
    Browse the repository at this point in the history

Commits on May 30, 2012

  1. Merge pull request padrino#856 from aereal/fix/datamapper-mysql2 

    Make mysql2 a alias of mysql when DataMapper is selected
    @nesquena
    nesquena committed May 30, 2012
    Copy the full SHA
    41d67ef View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @WaYdotNET
    WaYdotNET committed Jun 1, 2012
    Copy the full SHA
    77d9b3b View commit details
    Browse the repository at this point in the history