31 Jul, 2015

1 commit


24 Feb, 2015

1 commit


28 Jan, 2015

1 commit


12 May, 2014

1 commit


16 Mar, 2014

2 commits


13 Mar, 2014

4 commits


12 Mar, 2014

2 commits


10 Mar, 2014

1 commit


07 Mar, 2014

6 commits


05 Mar, 2014

1 commit


02 Mar, 2014

1 commit


01 Mar, 2014

2 commits


28 Feb, 2014

1 commit


25 Feb, 2014

1 commit


21 Feb, 2014

3 commits


20 Feb, 2014

1 commit


19 Feb, 2014

1 commit


13 Feb, 2014

7 commits


11 Feb, 2014

3 commits

  • (ActionItem2995)
    Rodrigo Souto
     
  • Also adding a new assert helper to test the order of a collection
    without assuming all elements inside it.
    
    (ActionItem2996)
    Rodrigo Souto
     
  • Conflicts:
    	app/views/profile_themes/add_css.rhtml
    	app/views/profile_themes/add_image.rhtml
    	app/views/profile_themes/css_editor.rhtml
    	app/views/profile_themes/edit.rhtml
    	app/views/profile_themes/new.rhtml
    	app/views/themes/add_css.html.erb
    	app/views/themes/add_css.rhtml
    	app/views/themes/add_image.html.erb
    	app/views/themes/add_image.rhtml
    	app/views/themes/css_editor.html.erb
    	app/views/themes/css_editor.rhtml
    	app/views/themes/edit.html.erb
    	app/views/themes/edit.rhtml
    	app/views/themes/index.html.erb
    	app/views/themes/new.html.erb
    	app/views/themes/new.rhtml
    	test/factories.rb
    	test/functional/profile_themes_controller_test.rb
    Rodrigo Souto