11 Feb, 2014

1 commit

  • e9fea38f   Merge branch 'master' into rails3-merge ... Browse File » 
    Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb
    Rodrigo Souto
     

04 Feb, 2014

1 commit

30 Jan, 2014

1 commit

  • de0aceaa   rails3: fix assert_kind_of Array ... Browse File » 
    On rails 3.2, the return type of some queries changes from Array to ActiveRecord::Relation.
An assertion that check if these attributes has been assigned (with a value != nil) should be enought.
This avoids future problems with api changes.
    Victor Costa
     

28 Jan, 2014

1 commit

22 Jan, 2014

1 commit

18 Jan, 2014

1 commit

16 Jan, 2014

1 commit

15 Jan, 2014

5 commits

09 Jan, 2014

1 commit

  • 9f616e0b   access_level: Custom permission for community users to access an article ... Browse File » 
    - Added a field on article new/edit to specify which users can access the article
- Added a relationship has_and_belongs_to_many between Article and Person
- Created a new table article_privacy_exceptions for has_and_belongs_to_many
- Added cucumber tests
- Added a new cucumber step to add a user to the exception users list

(ActionItem2852)

Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
    Arthur Del Esposte
     

12 Dec, 2013

1 commit

  • d74aa7ba   blog: add cover image for blog ... Browse File » 
    (ActionItem2849)

Signed-off-by: Marcos Ramos <ms.ramos@outlook.com
Signed-off-by: Valéssio Brito <contato@valessiobrito.com.br>
Signed-off-by: Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
    Marcos Ramos
     

27 Nov, 2013

1 commit

25 Nov, 2013

2 commits

20 Nov, 2013

2 commits

14 Oct, 2013

1 commit

09 Aug, 2013

1 commit

11 Jul, 2013

1 commit

20 Mar, 2013

1 commit

18 Mar, 2013

1 commit

13 Mar, 2013

1 commit

27 Feb, 2013

3 commits

20 Dec, 2012

1 commit

07 Nov, 2012

1 commit

04 Nov, 2012

2 commits

01 Nov, 2012

3 commits

29 Oct, 2012

2 commits

25 Oct, 2012

1 commit

24 Oct, 2012

1 commit

03 Oct, 2012

1 commit