Charles Oliveira / noosfero

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

01 Sep, 2014

1 commit

37fcaf75 mergin with master Browse Dir »

Leandro Santos
2014-09-01 11:28:55 -0300

29 Aug, 2014

1 commit

7d5483f1 Merge branch 'master' into rails3_stable ... Browse Dir »
```
Conflicts:
	app/helpers/layout_helper.rb
	db/schema.rb
```
Victor Costa
2014-08-29 11:35:34 -0300

27 Aug, 2014

1 commit

914ea967 Removing EnvironmentStatisticsBlock from core ... Browse Dir »
```
PeopleBlock plugin overrides the EnvironmentStatisticsBlock

(ActionItem3045)
```
Joenio Costa
2014-08-27 20:41:41 -0300

25 Aug, 2014

1 commit

888d94d7 Merge branches 'master' and 'AI3279-block_store' into AI3279-block_store Browse Dir »

Leandro Santos
2014-08-25 17:55:03 -0300

19 Aug, 2014

1 commit

29490ac8 Merge branch 'AI3220_proposals' into rails3_stable Browse Dir »

Victor Costa
2014-08-19 14:19:02 -0300

18 Aug, 2014

1 commit

f1cafcb8 Merge branch 'master' into AI3191-private_environment Browse Dir »

Joenio Costa
2014-08-18 15:02:17 -0300

11 Aug, 2014

2 commits

458348bf Merge branches 'AI3268_template_management' and 'rails3_stable' into rails3_stable Browse Dir »

Leandro Santos
2014-08-11 15:21:28 -0300
3b569fa2 Add set as default method for templates Browse Dir »

Leandro Santos
2014-08-11 14:03:19 -0300

08 Aug, 2014

1 commit

c85446f9 Merge branch 'AI2915-category_color' into rails3_stable ... Browse Dir »
```
Conflicts:
	app/helpers/application_helper.rb
```
Victor Costa
2014-08-08 12:02:46 -0300

07 Aug, 2014

1 commit

8f79b72d Change the category color selection to use a colorpicker component. ... Browse Dir »
```
The field display_color has turned into char(6) and stores the color rgb hex code.
(ActionItem2915)
```
Victor Costa
2014-08-07 18:20:10 -0300

22 Jul, 2014

1 commit

9ec2cf52 improve feature to add or move blocks Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-07-22 10:55:11 -0300

21 Jul, 2014

1 commit

889c79b5 Search by identifier on whitelist edition Browse Dir »

Victor Costa
2014-07-21 14:17:49 -0300

17 Jul, 2014

2 commits

c3964d52 Merge branch 'AI3191-private_environment' into rails3_stable ... Browse Dir »
```
Conflicts:
	app/models/environment.rb
```
Victor Costa
2014-07-17 14:13:45 -0300
5fb014fc Merge branch 'rails3' into AI3191-private_environment ... Browse Dir »
```
Conflicts:
	app/models/environment.rb
	app/views/features/index.rhtml
```
Victor Costa
2014-07-17 14:07:15 -0300

08 Jul, 2014

1 commit

f468e3c4 Use tokeninput to edit members whitelist Browse Dir »

Victor Costa
2014-07-08 09:08:40 -0300

30 Jun, 2014

1 commit

b5e98a04 fixing merge between rails3 and search-improvements branch Browse Dir »

Leandro Santos
2014-06-30 16:03:28 -0300

17 Jun, 2014

1 commit

e77ff7f1 Merge branch 'rails3' into rails3_stable Browse Dir »

Victor Costa
2014-06-17 10:41:19 -0300

15 Jun, 2014

1 commit

c3d1e14e Revert "putting back all references to People, Member and Friends blocks" ... Browse Dir »
```
This reverts commit f8bd2430f86b0b6e3640e2662d1ca689a46ecb98.
```
Joenio Costa
2014-06-15 21:51:18 -0300

14 Jun, 2014

1 commit

f8bd2430 putting back all references to People, Member and Friends blocks ... Browse Dir »
```
the PeopleBlock plugin that comes with these blocks is enabled by
default in any Noosfero's environment

(ActionItem2859)
```
Joenio Costa
2014-06-14 00:46:20 -0300

12 Jun, 2014

1 commit

19c0fa50 Merge branch 'rails3_AI3163-enable_disable_blocks' into rails3_stable ... Browse Dir »
```
Conflicts:
	app/models/environment.rb
```
Victor Costa
2014-06-12 08:31:17 -0300

11 Jun, 2014

1 commit

eb7194d9 invert logic Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-06-11 20:47:15 -0300