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 tagging controller (have yet to add tagging to motions views). #65

Merged
24 commits merged into from
Dec 19, 2010
Merged

Add tagging controller (have yet to add tagging to motions views). #65

24 commits merged into from
Dec 19, 2010

Commits on Dec 9, 2010

  1. Refactor flashes, place them into a partial.

    @btelles
    btelles committed Dec 9, 2010
    Configuration menu
    Copy the full SHA
    d1b3060 View commit details
    Browse the repository at this point in the history

  2. add ability to delete members through ui.

    @btelles
    btelles committed Dec 9, 2010
    Configuration menu
    Copy the full SHA
    a55df4c View commit details
    Browse the repository at this point in the history

  3. Improve motions#index a little bit.

    @btelles
    btelles committed Dec 9, 2010
    Configuration menu
    Copy the full SHA
    9dfaae8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/wycats/jquery-governance 

    Conflicts:
	app/views/motions/_motion.html.haml
    @btelles
    btelles committed Dec 9, 2010
    Configuration menu
    Copy the full SHA
    50daccd View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2010

  1. Merge branch 'master' of https://github.com/wycats/jquery-governance 

    Conflicts:
	app/stylesheets/application.scss
	public/stylesheets/application.css
    @btelles
    btelles committed Dec 10, 2010
    Configuration menu
    Copy the full SHA
    182ab9f View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2010

  1. Merge branch 'master' of https://github.com/wycats/jquery-governance 

    Conflicts:
	app/views/motions/_motion.html.haml
	public/stylesheets/application.css
    @btelles
    btelles committed Dec 11, 2010
    Configuration menu
    Copy the full SHA
    43da542 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/wycats/jquery-governance

    @btelles
    btelles committed Dec 11, 2010
    Configuration menu
    Copy the full SHA
    59afe95 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2010

  1. Merge branch 'master' of https://github.com/wycats/jquery-governance 

    Conflicts:
	public/stylesheets/application.css
    @btelles
    btelles committed Dec 12, 2010
    Configuration menu
    Copy the full SHA
    8b7a9a9 View commit details
    Browse the repository at this point in the history

  2. Revert "add ability to delete members through ui." 

    This reverts commit a55df4c.
    @btelles
    btelles committed Dec 12, 2010
    Configuration menu
    Copy the full SHA
    38c064f View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2010

  1. Merge branch 'master' of https://github.com/wycats/jquery-governance

    @btelles
    btelles committed Dec 14, 2010
    Configuration menu
    Copy the full SHA
    85e8254 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2010

  1. Remove acts_as_paranoid.

    @btelles
    btelles committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    89e3676 View commit details
    Browse the repository at this point in the history

  2. Move current_member helpers to controller 

    and keep them as helpers.
    @btelles
    btelles committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    1d59255 View commit details
    Browse the repository at this point in the history

  3. Add tag model and default seeds 

    ('swag' was in the PT story, not sure if it's necessary).
    @btelles
    btelles committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    402ed6d View commit details
    Browse the repository at this point in the history

  4. Add tag story that is to be implemented.

    @btelles
    btelles committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    46cf2b9 View commit details
    Browse the repository at this point in the history

  5. Add blueprint grid for easy layouts.

    @btelles
    btelles committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    f80b11c View commit details
    Browse the repository at this point in the history

  6. Add jQueryUI & highlight fade js.

    @btelles
    btelles committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    5f5a7dc View commit details
    Browse the repository at this point in the history

  7. Add remove image button.

    @btelles
    btelles committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    56f0909 View commit details
    Browse the repository at this point in the history

  8. Add tag functionality and make cucumber feature work.

    @btelles
    btelles committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    9fb750a View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2010

  1. Merge branch 'master' of https://github.com/wycats/jquery-governance 

    Conflicts:
	app/stylesheets/application.scss
	app/views/admin/members/edit.html.haml
	app/views/admin/members/index.html.haml
	app/views/admin/members/new.html.haml
	app/views/motions/_motion.html.haml
	app/views/motions/_motion_list.html.haml
	app/views/motions/index.html.haml
	public/stylesheets/application.css
    @btelles
    btelles committed Dec 17, 2010
    Configuration menu
    Copy the full SHA
    6d3bf70 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2010

  1. Merge branch 'master' of https://github.com/wycats/jquery-governance 

    Conflicts:
	db/schema.rb
    @btelles
    btelles committed Dec 18, 2010
    Configuration menu
    Copy the full SHA
    82d9eaf View commit details
    Browse the repository at this point in the history

  2. Remove member spec commit.

    @btelles
    btelles committed Dec 18, 2010
    Configuration menu
    Copy the full SHA
    6f1788a View commit details
    Browse the repository at this point in the history

  3. move tag count query to model and add tests

    @btelles
    btelles committed Dec 18, 2010
    Configuration menu
    Copy the full SHA
    0fc5c65 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2010

  1. thought we'd already deleted application.css. Here goes again

    @btelles
    btelles committed Dec 19, 2010
    Configuration menu
    Copy the full SHA
    2d9a67e View commit details
    Browse the repository at this point in the history

  2. remove duplicate navigation link

    @btelles
    btelles committed Dec 19, 2010
    Configuration menu
    Copy the full SHA
    35cc359 View commit details
    Browse the repository at this point in the history