11 Feb, 2014

2 commits

  • 1f0194be   Merge branch 'master' into rails3-merge ... Browse Dir » 
    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
     
  • e9fea38f   Merge branch 'master' into rails3-merge ... Browse Dir » 
    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
     

06 Feb, 2014

1 commit

20 Jan, 2014

1 commit

17 Jan, 2014

1 commit

16 Jan, 2014

1 commit

15 Jan, 2014

3 commits

09 Jan, 2014

1 commit

  • 9f616e0b   access_level: Custom permission for community users to access an article ... Browse Dir » 
    - 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
     

08 Jan, 2014

1 commit

  • 2c251ae8   join_button: Join/Leave/Login Button ... Browse Dir » 
    - Added buttons at members block.
- Added checkbox to show or not the buttons on the community members.
- Removed the render button "enter/leave" when the checkbox that enables the button is unchecked
- Adjusted style CSS and display button
- Added cucumber and unit tests.
- Removed some spaces.
- There are two cucumber tests that wasn't done by the our team that fail if you don't use selenium. The files are publish_article.feature line 20 and search_enterprises.feature line 33 and we didn't modify them.

(ActionItem2844)

Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
    Carlos Andre de Souza
     

07 Jan, 2014

1 commit

16 Dec, 2013

1 commit

24 Nov, 2013

1 commit

14 Oct, 2013

1 commit

07 Oct, 2013

1 commit

27 Sep, 2013

1 commit

19 Sep, 2013

1 commit

29 Jul, 2013

1 commit

17 Jul, 2013

3 commits

16 Jul, 2013

3 commits

08 Jul, 2013

3 commits

01 Jul, 2013

1 commit

28 Jun, 2013

3 commits

27 Jun, 2013

1 commit

31 May, 2013

1 commit

29 May, 2013

1 commit

15 May, 2013

1 commit

10 May, 2013

1 commit

  • cfb0d900   Fixed chat ... Browse Dir » 
    - Syntax error on chat
- Reviewed INSTALL.chat
- Added function to update the list of users online on main window

(ActionItem2667)
    Daniela Feitosa
     

09 May, 2013

1 commit

17 Apr, 2013

1 commit

15 Apr, 2013

1 commit