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

03 Jul, 2015

1 commit

ea468c0e Merge branch 'block-admin-mail' into production ... Browse Dir »
```
Conflicts:
	app/models/event.rb
	app/models/profile.rb
	po/fr/noosfero.po
```
Victor Costa
2015-07-03 10:45:54 -0300

01 Jul, 2015

1 commit

3331bbc7 Implemented the administrator task notification option Browse Dir »

Carlos Purificação
2015-07-01 16:28:48 -0300

17 Jun, 2015

1 commit

01a73fbc Merge branch 'email_template' into production ... Browse Dir »
```
Conflicts:
	Gemfile
	public/proposal-app
	public/stylesheets/application.css
```
Victor Costa
2015-06-17 11:01:44 -0300

16 Jun, 2015

1 commit

d215b232 Option to choose template to send email to members Browse Dir »

Victor Costa
2015-06-16 11:10:38 -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

7ebda177 Adds optional html options to control_panel_buttons hotspot ... Browse Dir »
```
  Plugins can set aditional html options like id, class or data
  attributes for control panel buttons.
```
Larissa Reis
2015-05-28 23:46:13 -0300

21 May, 2015

1 commit

ac8f7163 Limit pending tasks Browse Dir »

Victor Costa
2015-05-21 15:02:57 -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

27 Apr, 2015

1 commit

ea03b2d7 Merge branch 'api' into stable ... Browse Dir »
```
Conflicts:
	test/unit/block_test.rb
```
Victor Costa
2015-04-27 19:54:43 -0300

22 Apr, 2015

1 commit

379057c0 Remove unused javascript tag that was breaking profile edition page. ... Browse Dir »
```
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Gabriela Navarro
2015-04-22 12:18:19 +0000

19 Mar, 2015

1 commit

3e5d8c76 Merge branch 'serpro-context' into stable ... Browse Dir »
```
Conflicts:
	app/models/profile.rb
	app/views/profile_editor/edit.html.erb
```
Victor Costa
2015-03-19 17:52:01 -0300

26 Feb, 2015

1 commit

49716023 Add Secret type to communities' privacy options ... Browse Dir »

- created 'secret' attribute for profiles
- redefined scope for secret communities

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-02-26 12:53:07 +0000

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

2 commits

d2029dc6 Merge branch 'invitation' into stoa ... Browse Dir »
```
Conflicts:
	db/schema.rb
```
Rodrigo Souto
2015-02-03 18:11:15 -0300

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

02 Feb, 2015

1 commit

6b78cf93 profile: add allow_members_to_invite and invite_friends_only configurations Browse Dir »

Rodrigo Souto
2015-02-02 19:51:46 -0300

28 Jan, 2015

2 commits

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

1672fd6e suggestions: send email only if user enabled the email_suggestions option Browse Dir »

Rodrigo Souto
2015-01-28 14:30:30 -0300

20 Jan, 2015

1 commit

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

09 Jan, 2015

2 commits

e5947c70 rename option label Browse Dir »

Francisco Júnior
2015-01-09 16:56:15 -0300
b17cbf22 add option to hide community Browse Dir »

Francisco Júnior
2015-01-09 16:04:27 -0300

19 Dec, 2014

1 commit

7270935f Merge branch 'master' into stoa Browse Dir »

Larissa Reis
2014-12-19 14:49:16 -0300

11 Dec, 2014

1 commit

04ae2fd2 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-12-11 16:25:22 -0300

08 Dec, 2014

1 commit

fd23e874 curriculum_lattes_plugin: Refactorign plugin structure ... Browse Dir »

- Indent files properly
- Fix signup page changing lambda to proc
- Create the needed plugin's hotspots
- Fix academic_info attributes update
- Fix hotspot to work in edit page

2014-12-08 20:10:02 -0300

20 Nov, 2014

1 commit

94eaff08 Merge branch 'master' into stoa ... Browse Dir »
```
Conflicts:
	Gemfile.lock
	script/development
```
Larissa Reis
2014-11-20 01:24:55 -0300

26 Sep, 2014

1 commit

faa13355 Merge branch 'rails3-custom_fields' into rails3_stable Browse Dir »

Victor Costa
2014-09-26 13:54:11 -0300

22 Sep, 2014

1 commit

9804917f Merge branch 'master' into rails3_stable ... Browse Dir »
```
Conflicts:
	Gemfile
	Gemfile.lock
	lib/tasks/gettext.rake
	test/unit/dates_helper_test.rb
```
Victor Costa
2014-09-22 16:38:12 -0300

17 Sep, 2014

1 commit

d50d9438 bug fixes Browse Dir »

Francisco Júnior
2014-09-17 16:54:13 -0300

15 Sep, 2014

2 commits

8ee125a8 signup_image_upload: Add image on user signup ... Browse Dir »

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-09-15 15:56:21 -0300

dfe39540 signup_image_upload: Put file_field as a optional_field. ... Browse Dir »
```
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
```
David Silva
2014-09-15 14:23:04 -0300