Charles Oliveira / noosfero

23 Nov, 2015

1 commit

95fdfbab Add custom field feature to core ... Browse Dir »

Custom fields can be added to any profile through the admin panel
in the 'Fields' section. They have the same behaviour as the current
Noosfero's fields (active, signup, required and privacy).

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-11-23 16:39:59 -0300

17 Nov, 2015

1 commit

92fbfd94 Merge branch 'master_rails4' into staging ... Browse Dir »

Conflicts:
	Gemfile
	Rakefile
	app/controllers/box_organizer_controller.rb
	app/controllers/my_profile/tasks_controller.rb
	app/controllers/public/profile_controller.rb
	app/mailers/user_mailer.rb
	app/models/article.rb
	app/models/person.rb
	app/models/product_category.rb
	app/models/task.rb
	config/application.rb
	config/routes.rb
	lib/acts_as_having_settings.rb
	lib/noosfero/api/entities.rb
	lib/noosfero/api/helpers.rb
	lib/noosfero/api/session.rb
	lib/noosfero/api/v1/articles.rb
	lib/noosfero/api/v1/contacts.rb
	lib/noosfero/api/v1/search.rb
	lib/noosfero/api/v1/users.rb
	test/functional/tasks_controller_test.rb
	test/unit/api/articles_test.rb
	test/unit/api/helpers_test.rb
	test/unit/api/people_test.rb
	test/unit/api/search_test.rb
	test/unit/api/session_test.rb
	test/unit/api/users_test.rb
	test/unit/person_notifier_test.rb
	test/unit/task_test.rb
	vendor/plugins/access_control/lib/acts_as_accessible.rb

2015-11-17 09:23:22 -0300

13 Sep, 2015

1 commit

d486c3ff rails4: replace update_attributes with the new update Browse Dir »

Braulio Bhavamitra
2015-09-13 19:55:23 -0300

24 Jul, 2015

2 commits

0e75f1c2 rails4: fix remaining funcionals tests Browse Dir »

Braulio Bhavamitra
2015-07-24 17:55:22 -0300
a1dad6ba rails4: replace :conditions by where ... Browse Dir »
```
:conditions will replace previous scopes in rails4
```
Braulio Bhavamitra
2015-07-24 17:55:18 -0300

16 Jul, 2015

1 commit

fa6ea4bd Merge branch 'email_template' into production ... Browse Dir »
```
Conflicts:
	app/views/admin_panel/index.html.erb
```
Victor Costa
2015-07-16 14:53:46 -0300

15 Jul, 2015

1 commit

331869b0 Manage environment email templates Browse Dir »

Victor Costa
2015-07-15 19:33:23 -0300

02 Jun, 2015

1 commit

b39a1a37 merging with master Browse Dir »

Leandro Santos
2015-06-02 14:15:49 -0300

28 May, 2015

1 commit

4c1e0c9f admin-panel: refactoring of manage organizations ... Browse Dir »

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>

2015-05-28 12:49:23 -0300

12 May, 2015

1 commit

ea5d6c29 merging with master Browse Dir »

Leandro Santos
2015-05-12 21:45:22 -0300

08 May, 2015

1 commit

77ffeee2 Added custom roles management for organizations ... Browse Dir »

Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>

2015-05-08 16:13:55 -0300

24 Feb, 2015

1 commit

0531c6a2 merging with master Browse Dir »

Leandro Santos
2015-02-24 11:37:25 -0300

04 Feb, 2015

1 commit

60262a33 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/controllers/public/search_controller.rb
	app/models/profile.rb
	app/views/cms/edit.html.erb
	public/stylesheets/application.css

2015-02-04 13:02:40 -0300

03 Feb, 2015

1 commit

71439c6c Merge branch 'master' into stoa ... Browse Dir »

Conflicts:
	app/controllers/my_profile/profile_editor_controller.rb
	app/helpers/search_helper.rb
	app/models/invitation.rb
	app/models/person.rb
	app/views/cms/view.html.erb
	app/views/templates/index.html.erb
	plugins/community_track/views/content_viewer/_step_item.html.erb
	test/functional/home_controller_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb

2015-02-03 18:06:21 -0300

28 Jan, 2015

1 commit

d9a3fdb3 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/helpers/article_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/block.rb
	app/views/content_viewer/view_page.html.erb
	db/schema.rb
	plugins/community_track/views/blocks/_track_list_more.html.erb
	plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb
	public/javascripts/article.js
	test/unit/block_test.rb
	test/unit/person_notifier_helper_test.rb

2015-01-28 15:22:56 -0300

26 Jan, 2015

2 commits

242318b0 Avoid template definition of another environment Browse Dir »

Leandro Santos
2015-01-26 12:04:18 -0300
4f321345 Merge branches 'master' and 'AI3268_template_management' into AI3268_template_management Browse Dir »

Leandro Santos
2015-01-26 10:46:57 -0300

20 Jan, 2015

2 commits

46080e93 Merge branch 'AI3287_deactive_and_active_profile' into 'master' ... Browse Dir »

Ai3287 deactive and active profile

Feature: https://noosfero.org/Development/ActionItem3287

This patch add the activate/deactivate feature for organizations. It also add a new administrator feature to manage organizations status in admin pannel.

See merge request !357

2015-01-20 19:52:28 +0000

6984558b Add UI to activate and deactivate profiles ... Browse Dir »

(ActionItem3287)
It can be done while edit a profile or in environment administration panel

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
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: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>

2015-01-20 19:45:29 +0000

19 Jan, 2015

2 commits

24909c1e Merge branch 'fix_plugin_admin' into stable Browse Dir »

Victor Costa
2015-01-19 17:14:17 -0300

7c541b4a Base controller for plugins administration ... Browse Dir »

The PluginAdminController protect by default users that didn't have
edit_environment_features permission against access plugin administration.

2015-01-19 17:10:20 -0300

16 Dec, 2014

2 commits

2aace982 Merge branch 'AI3279-block_store' into stable ... Browse Dir »

Conflicts:
	app/controllers/box_organizer_controller.rb
	app/controllers/my_profile/profile_design_controller.rb
	app/helpers/layout_helper.rb

2014-12-16 13:21:30 -0300

dfad044a Merge branch 'master' into AI3279-block_store ... Browse Dir »

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/admin/environment_design_controller.rb
	app/helpers/layout_helper.rb
	app/models/block.rb
	script/quick-start

2014-12-16 10:19:11 -0300

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

2014-09-08 12:36:01 -0300