06 Apr, 2015

1 commit

24 Mar, 2015

1 commit

03 Feb, 2015

4 commits

28 Jan, 2015

1 commit

15 Jan, 2015

3 commits

19 Dec, 2014

1 commit

08 Dec, 2014

1 commit

20 Nov, 2014

2 commits

31 Oct, 2014

1 commit

14 Oct, 2014

1 commit

08 Sep, 2014

1 commit

  • 79e1ad7b   Merge branch 'master' into stoa ... Browse Dir » 
    Conflicts:
	app/controllers/application_controller.rb
	app/controllers/my_profile/memberships_controller.rb
	app/controllers/public/account_controller.rb
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/helpers/token_helper.rb
	app/views/account/signup.html.erb
	app/views/layouts/_javascript.html.erb
	db/schema.rb
	test/functional/application_controller_test.rb
    Rodrigo Souto
     

18 Aug, 2014

2 commits

28 Jul, 2014

1 commit

22 Jul, 2014

1 commit

04 Jul, 2014

2 commits

03 Jun, 2014

1 commit

13 May, 2014

1 commit

  • 23914711   Merge branch 'master' into rails3 ... Browse Dir » 
    Conflicts:
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/models/community.rb
	app/models/enterprise.rb
	app/models/product_category.rb
	app/views/account/change_password.html.erb
	config/boot.rb
	config/environment.rb
	config/routes.rb
	lib/noosfero/plugin.rb
	test/unit/enterprise_activation_test.rb
	test/unit/person_notifier_test.rb
    Rodrigo Souto
     

06 May, 2014

2 commits

  • 1182476c   Merge branch 'rails235' into rails3 ... Browse Dir » 
    * rails235: (168 commits)
  L10n: support for custom locales
  enhancements: visualization of suggested usernames
  Allowing translation for url checking string
  Removed unnecessary lines on test
  Removed unit tests from functionals file
  Fixed html and test syntax
  Removed needless condition
  Fixed suggestions of usernames
  Test files should ends with "_test.rb"
  Added pagination on events_by_day on profile agenda
  Fix missing variable in funcional test
  Fix unit tests
  Change routes from embed controller
  Remove unused code
  Autocomplete fields on page load
  Blocks can returns a block of code to be evaluated
  Avoid randomness on tests
  comment-group-plugin: avoid randomness on tests
  community-track-plugin: fix tests by creating a profile with default boxes
  anti-spam-plugin-wrapper: ensure to load concrete wrappers
  ...

Conflicts:
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/contact.rb
	app/models/event.rb
	app/models/mailing.rb
	app/models/organization.rb
	app/models/organization_mailing.rb
	app/models/pending_task_notifier.rb
	app/models/person.rb
	app/models/profile.rb
	app/models/scrap.rb
	app/models/task_mailer.rb
	app/models/user.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/profile_image.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/box_organizer/_link_list_block.rhtml
	app/views/box_organizer/edit.rhtml
	app/views/features/_manage_community_fields.rhtml
	app/views/features/_manage_enterprise_fields.rhtml
	app/views/features/_manage_person_fields.rhtml
	app/views/features/index.rhtml
	app/views/layouts/application-ng.rhtml
	app/views/users/_users_list.rhtml
	db/schema.rb
	features/forum.feature
	lib/feed_handler.rb
	lib/noosfero/plugin.rb
	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	plugins/spaminator/lib/spaminator_plugin/mailer.rb
	test/functional/content_viewer_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/profile_design_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/contact_sender_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/environment_mailing_test.rb
	test/unit/mailing_test.rb
	test/unit/organization_mailing_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
	test/unit/uploaded_file_test.rb
	vendor/plugins/action_tracker/lib/action_tracker_model.rb
    Victor Costa
     
  • 64b33a5d   rails3: fix cucumber tests Browse Dir »
    Victor Costa
     

11 Apr, 2014

1 commit

14 Mar, 2014

1 commit

20 Feb, 2014

1 commit

18 Feb, 2014

1 commit

13 Feb, 2014

1 commit

11 Feb, 2014

2 commits

24 Jan, 2014

1 commit

23 Jan, 2014

2 commits

18 Jan, 2014

1 commit

17 Jan, 2014

1 commit

  • 7bc0a2a4   sub_organizations_plugin: Add related organizations block ... Browse Dir » 
    The following improvements have been made:
  - Created action that displays sub-organization and
  super organizations of a given organization.
  - Created a block that display related organizations.
  - List mother organizations to person's membership if
  he/she is member of a sub-organization.

(ActionItem2499)
(ActionItem2825)

Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br>
Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Daniel
     

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