Software Público Brasileiro

15 Sep, 2015

1 commit

• c50ccd6e   Merge branch 'noosfero' into rails4 Browse File »
  Braulio Bhavamitra

  2015-09-15 17:46:00 -0300  

14 Sep, 2015

1 commit

• 3d111ca7   Add option to block appearence edit ... Browse File »

  - Add before_filter for check permission for open edit header and footer page
  - Change environment feature name of disable_appearance to enable_appearance
  - Update cucumber test change_appearance.feature
  
  Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
  Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
  Signed-off-by: Omar Junior <omarroinuj@gmail.com>
  Signed-off-by: vitorbaraujo <vitornga15@gmail.com>
  Signed-off-by: Victor Matias Navarro <victor.matias.navarro@gmail.com>

  Luciano Prestes

  2015-09-14 14:49:09 -0300  

24 Jul, 2015

1 commit

• fafb323e   rails4: fix most functional tests Browse File »
  Braulio Bhavamitra

  2015-07-24 17:55:22 -0300  

26 Jan, 2015

1 commit

• 144eab47   test/*: use require_relative for test_helper ... Browse File »

  This needs to be done for all plugins as well, but it's more complicated
  there because several plugins have their own test_helper (which will
  also load the core test_helper).

  Antonio Terceiro

  2015-01-26 14:22:25 -0200  

07 Mar, 2014

2 commits

• 423aba17   Merge branch 'master' into rails3 ... Browse File »

  Conflicts:
  	config/initializers/dependencies.rb
  	debian/control
  	lib/noosfero/core_ext.rb
  	lib/noosfero/plugin/routes.rb

  Daniela Feitosa

  2014-03-07 14:35:37 +0000  
• d0561132   Merge branch 'stable' ... Browse File »

  Conflicts:
  	app/controllers/my_profile/profile_themes_controller.rb
  	test/unit/comment_test.rb
  	vendor/plugins/action_tracker_has_comments/init.rb

  Daniela Feitosa

  2014-03-07 13:17:54 +0000  

11 Feb, 2014

1 commit

• 1f0194be   Merge branch 'master' into rails3-merge ... Browse File »

  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

  2014-02-11 18:00:35 -0300  

23 Jan, 2014

2 commits

• 297b3b72   Fixing AI2897 problems: ... Browse File »

  -Changed update_attribute to setting the attribute then 'save!'
  -Removed some whitespaces
  -The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb.
  
  (ActionItem2897)
  
  Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
  Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>

  Gust

  2014-01-23 16:28:03 -0200  
• b0874b74   Allow the admin users to change the environment theme on the admin panel. Browse File »
  Eduardo Tourinho Edington

  2014-01-23 16:23:02 -0200