Thiago Ribeiro / Noosfero

26 Jun, 2014

1 commit

4bb32eac user-mailer: move mailer views to correct folder ... Browse Dir »
```
ActionItem3174
```
Rodrigo Souto
2014-06-26 18:37:56 +0000

02 Jun, 2014

1 commit

b207e834 Merge branch 'rails235' Browse Dir »

Daniela Feitosa
2014-06-02 20:52:11 -0300

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

2014-05-06 18:00:26 -0300

16 Apr, 2014

1 commit

3923d48a social_network: Join community on login/signup ... Browse Dir »
```
Join community if user log in or sign up after following a "Join" link within
a community.

(ActionItem3096)
```
Daniel
2014-04-16 18:14:34 -0300

19 Mar, 2014

1 commit

67fdc2f1 small-enhancement: changed name of attribute ... Browse Dir »
```
(ActionItem2998)
```
Daniela Feitosa
2014-03-19 14:56:04 +0000

14 Mar, 2014

1 commit

b461081b admin_features: Add redirection options after signup when confirmation ... Browse Dir »
```
email is enabled.

(ActionItem2998)

Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
```
Daniel
2014-03-14 20:03:16 -0300

25 Dec, 2012

1 commit

645651de Rename *.rhtml -> *.html.erb ... Browse Dir »
```
*.rhtml is deprecated in Rails 3
```
Antonio Terceiro
2012-12-25 15:13:43 -0300

29 Oct, 2012

1 commit

877d26ae Environment admin can configure the message after signup ... Browse Dir »

Added field sigup_welcome_text on environment
New tab on admin panel to edit the text
When the environment doesn't have a text, will use the default text
Added content_type to email

(ActionItem2497)

2012-10-29 02:07:56 -0200

30 Sep, 2011

1 commit

de2fad9c Done Browse Dir »

Caio SBA
2011-09-30 01:24:56 -0300

05 Aug, 2010

1 commit

6979130d Better wording in notification e-mails ... Browse Dir »
```
(ActionItem1610)
```
Antonio Terceiro
2010-08-05 11:48:49 -0300

27 Jan, 2009

1 commit

b9707472 ActionItem434: must create mailbox just after enabling mail for the first time Browse Dir »

Joenio Costa
2009-01-27 17:28:53 -0300