16 Jul, 2016

1 commit

05 Jul, 2016

2 commits

06 May, 2016

1 commit

  • 26a6adaf   Send email to environment and profile admins ... Browse Dir » 
    - Environment admins can now choose the recipients
that will recieve an email sent throw the admin panel.
There are now 3 options: All users(exclusive with other options)
			 Environment Admins(inclusive with opt below)
			 Profile Admins(inclusive with opt above)

Signed-off-by: Artur Bersan de Faria <arturbersan@gmail.com>
Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
Signed-off-by: Omar Junior <omarroinuj@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Sabryna Sousa <sabryna.sousa1323@gmail.com>
    Tallys Martins
     

22 Apr, 2016

1 commit

01 Apr, 2016

1 commit

03 Mar, 2016

1 commit

26 Feb, 2016

1 commit

  • 80ebad1f   Added filter section on profile members list ... Browse Dir » 
    - Adds use of filtered members to mailing queue executed by send_mail action

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
    Michel Felipe
     

14 Sep, 2015

1 commit

11 Sep, 2015

1 commit

  • 296a549d   improvements in core required for the newsletter plugin ... Browse Dir »
    1 
    * models should use acts_as_having_image transparently
* force margin zero in HTML mailing
* using require_dependency instead of require to avoid error:
  "superclass mismatch for class MailingJob"
* now plugins can schedule jobs via whenever rubygem
* improve 'sample-data' scripts to create some blog posts

signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Larissa Reis
     

15 Aug, 2015

1 commit

13 Aug, 2015

1 commit

11 Aug, 2015

1 commit

24 Jul, 2015

3 commits

23 Mar, 2015

1 commit

25 Feb, 2015

4 commits

04 Aug, 2014

1 commit

27 Jul, 2014

1 commit

26 Jun, 2014

1 commit

13 May, 2014

1 commit

08 May, 2014

1 commit

06 May, 2014

1 commit

  • 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
     

03 Feb, 2014

1 commit

31 Jan, 2014

1 commit

09 Jan, 2014

1 commit

10 Oct, 2013

1 commit

06 Sep, 2013

9 commits