Permalink
Commits on Feb 23, 2010
  1. admin panel: when adding new presentation, select speaker from select…

    … list instead of writing their email
    committed Feb 23, 2010
  2. admin: browse and list users

    new cucumber tests
    committed Feb 23, 2010
  3. Merge branch 'master' of git://github.com/bragi/euruko

    Fixed conflicts:
    	config/routes.rb
    
    Not using resource_controller
    committed Feb 23, 2010
  4. added feedback for administrator when logged in

    added logout link for admin
    removed failing and poinless home controller spec
    committed Feb 23, 2010
  5. made root_path show current user page when logged in

    made cucumber green again
    added haml plugin
    made sass more pretty
    removed ugly inline javascript (logout link)
    committed Feb 23, 2010
Commits on Feb 22, 2010
  1. Merge branch 'master' of git://github.com/bragi/euruko

    Fixed conflicts:
    	.gitignore
    	app/controllers/application_controller.rb
    	app/controllers/billing_informations_controller.rb
    	app/controllers/presentations_controller.rb
    	app/controllers/users_controller.rb
    	app/views/layouts/application.html.haml
    	app/views/presentations/_form.html.haml
    	app/views/presentations/_presentation.html.haml
    	app/views/user_sessions/_form.html.haml
    	app/views/user_sessions/new.html.haml
    	app/views/users/show.html.haml
    	config/environment.rb
    	features/billing.feature
    	features/editing_presentations.feature
    	features/user_authentication.feature
    	features/user_page.feature
    
    Removed config.gem's from config files. Now application depends on bundler.
    committed Feb 22, 2010
  2. Merge branch 'tjeden'

    bragi committed Feb 22, 2010
  3. added simple password changing

    Aleksander Dabrowski committed Feb 22, 2010
  4. merge upstream into master

    Aleksander Dabrowski committed Feb 22, 2010
Commits on Feb 21, 2010
  1. Styled avatars a bit

    bragi committed Feb 21, 2010
  2. Cleaned up styling a bit

    bragi committed Feb 21, 2010
Commits on Feb 20, 2010
  1. layout for showing data

    Aleksander Dabrowski committed Feb 20, 2010
Commits on Feb 19, 2010
  1. merge

    Aleksander Dabrowski committed Feb 19, 2010
  2. Added support for gravatars

    bragi committed Feb 19, 2010
  3. Implemented listing users

    bragi committed Feb 19, 2010
  4. layout initialization

    Aleksander Dabrowski committed with bragi Feb 19, 2010
  5. gitignore conflicts

    Aleksander Dabrowski committed Feb 19, 2010
  6. layout initialization

    Aleksander Dabrowski committed Feb 19, 2010
Commits on Feb 18, 2010
  1. got rid off resource_controller

    committed Feb 18, 2010
  2. minor ui and ux improvements

    committed Feb 18, 2010
  3. validate format of email

    committed Feb 18, 2010
  4. general layout improvements

    committed Feb 18, 2010
  5. Implemented Uploading speaker photos story

    kazjote committed Feb 18, 2010
  6. Implemented Editing presentation submission story

    kazjote committed with Feb 18, 2010
  7. Regenerated cucumber files

    kazjote committed with Feb 18, 2010