NoosferoGov / noosfero

03 Oct, 2016

1 commit

87ccdfde Merge branch 'master' into staging Browse Dir »

Victor Costa
2016-10-03 09:03:51 -0300

30 Aug, 2016

1 commit

cee435f6 passing params to task_information helper Browse Dir »

Leandro Santos
2016-08-30 18:49:12 -0300

11 Aug, 2016

1 commit

6eb736e0 Remove TinyMce, RawHTML and Textile article types and create the possibility to … ... Browse Dir »
```
…choose wich editor will be used to create new text articles
```
Leandro Santos
2016-08-11 16:23:44 -0300

22 Jul, 2016

1 commit

8efc035e Merge branch 'master' into staging Browse Dir »

Leandro Santos
2016-07-22 12:39:04 -0300

21 Jul, 2016

1 commit

dee85e78 api: return organization roles Browse Dir »

Victor Costa
2016-07-21 17:29:08 -0300

05 Jul, 2016

2 commits

9247134c Merge branch 'master' into staging Browse Dir »

Leandro Santos
2016-07-05 14:06:24 -0300
f5e79695 fix wrong html parser Browse Dir »

Leandro Santos
2016-07-05 13:45:06 -0300

17 May, 2016

1 commit

71faccf7 Merge branch 'master' into staging ... Browse Dir »
```
Conflicts:
	app/views/shared/not_found.html.erb
```
Victor Costa
2016-05-17 13:22:32 -0300

16 May, 2016

1 commit

776ca7bc html_safe: Always return button_bar value to template Browse Dir »

Braulio Bhavamitra
2016-05-16 11:47:10 -0300

06 May, 2016

2 commits

a4b1f989 Merge branch 'master' into staging Browse Dir »

Leandro Santos
2016-05-06 09:12:24 -0300
c8dae131 html safe fix in accept new friend Browse Dir »

Leandro Santos
2016-05-06 09:07:24 -0300

05 May, 2016

1 commit

c09dd81f Merge branch 'master' into staging Browse Dir »

Leandro Santos
2016-05-05 16:30:55 -0300

04 May, 2016

1 commit

7949d4e8 Adds required email moderation option ... Browse Dir »

- Confirmation modal when joining community
- Moderation option in community control panel

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

2016-05-04 17:44:59 -0300

25 Apr, 2016

1 commit

13e6bd4a Merge branch 'master' into staging ... Browse Dir »

Conflicts:
	.travis.yml
	app/controllers/my_profile/tasks_controller.rb
	app/helpers/application_helper.rb
	app/views/profile_editor/_pending_tasks.html.erb
	app/views/tasks/processed.html.erb
	test/functional/tasks_controller_test.rb

2016-04-25 10:15:32 -0300

22 Apr, 2016

1 commit

8df1c088 Merge branch 'new_security' into 'master' ... Browse Dir »

Fixing html_safe for noosfero

This MR treats of Noosfero's safe strings (with html_safe), because at the moment Noosfero treats all strings as safe, which allows users to inject malicious code.

See merge request !859

2016-04-22 19:46:42 +0000

20 Apr, 2016

1 commit

e6634cb3 Refactors processed task filter fields ... Browse Dir »
```
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
```
Marcos Pereira
2016-04-20 14:41:06 -0300

18 Apr, 2016

3 commits

dcea12d2 fix wrong syntax Browse Dir »

Leandro Santos
2016-04-18 14:10:11 -0300
af86ac8d merging with master Browse Dir »

Leandro Santos
2016-04-18 10:43:28 -0300

dab58951 Fixing html_safe for noosfero core ... Browse Dir »

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>

2016-04-18 07:50:07 -0300

15 Apr, 2016

1 commit

be57a405 Improves listing of processed tasks ... Browse Dir »

 - Filters for processed tasks

  Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
  Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

2016-04-15 16:04:34 -0300

14 Apr, 2016

1 commit

13635dd8 Autocomplete tasks by name in administration area. ... Browse Dir »

  - Create a text field to autocomplete administration tasks.

Signed-off-by: Leandro Nunes <lenadronunes@gmail.com>
Signed-off-by: Michel Felipe <mfelipeof@gmail.com>

2016-04-14 14:44:20 -0300

11 Apr, 2016

1 commit

29151d66 merging with master Browse Dir »

Leandro Santos
2016-04-11 22:05:29 -0300

01 Apr, 2016

1 commit

f59633f4 New feature: manage email templates Browse Dir »

Victor Costa
2016-04-01 11:02:07 -0300

31 Mar, 2016

1 commit

39a3f520 Adds custom_fields details to moderation tasks ... Browse Dir »

Uses custom fields for create community moderation
Uses custom fields for user creation moderation

    Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
    Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

2016-03-31 15:28:16 -0300

24 Mar, 2016

1 commit

ed6f20bb fix merge with master conflit Browse Dir »

Leandro Santos
2016-03-24 16:23:23 -0300

23 Mar, 2016

1 commit

355a1dfc task: keep filters applied to tasks after close action ... Browse Dir »

- Rename TasksHelper file
- Referencing TasksHelper in TaskController
- Refactoring task_action/url helper method
- Manage tasks feature
- Update SuggetstArticle step
- Adds functional test for keeping tasks filter

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
Signed-off-by: Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

2016-03-23 10:52:13 -0300

04 Dec, 2015

2 commits

2dd9c858 Merge branch 'master' into staging_rails4 Browse Dir »

Victor Costa
2015-12-04 12:24:12 -0300

0c7ed580 Organization Ratings plugin improvements ... Browse Dir »

- Adds hostspot in Organization Rating task details
- Improvements on task and organization ratings layout
- Added one hotspot for task contents and another for ratings container content
- Rejected rating comments are only displayed to env admins and comment owners
- All task messages now refers to "a Report" instead of Comment:
  i.g. "Report waiting for approval" instead of "Comment waiting for approval"
- Also added css style to auto expand task div

Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>

See merge request !737

2015-12-04 01:35:00 -0300

17 Jul, 2015

4 commits

a6472ba8 Merge branch 'processed_tasks' into production Browse Dir »

Victor Costa
2015-07-17 16:46:00 -0300
1cf1f45b Accept specific view for tasks Browse Dir »

Victor Costa
2015-07-17 15:28:34 -0300
0c93a29d merge with master - changed to keep tasks filter after tasks close action Browse Dir »

Ábner Silva de Oliveira
2015-07-17 15:23:11 -0300
0a6daa95 changed to keep the filter applyed to tasks after action close Browse Dir »

Ábner Silva de Oliveira
2015-07-17 15:16:44 -0300

08 Jul, 2015

2 commits

df9cc0e2 Merge branch 'api' into production ... Browse Dir »
```
Conflicts:
	Gemfile
```
Evandro Junior
2015-07-08 19:05:52 -0300
2b942cdf merge with noosfero api branch Browse Dir »

Ábner Silva de Oliveira
2015-07-08 17:06:37 -0300

07 Jul, 2015

4 commits

5b6a4ead Merge branch 'email_template' into production Browse Dir »

Victor Costa
2015-07-07 15:24:13 -0300
ba00654d Fix acceptance templates for suggest article task Browse Dir »

Victor Costa
2015-07-07 15:23:43 -0300
20c6f6e1 Merge branch 'email_template' into production Browse Dir »

Victor Costa
2015-07-07 10:18:02 -0300
0f9307fe Move email template selection to task partials Browse Dir »

Victor Costa
2015-07-07 10:16:19 -0300

06 Jul, 2015

2 commits

933d3771 Merge branch 'email_template' into production ... Browse Dir »
```
Conflicts:
	app/models/article.rb
	test/functional/tasks_controller_test.rb
```
Victor Costa
2015-07-06 17:03:26 -0300
8a4dc901 Choose email template when accept a task Browse Dir »

Victor Costa
2015-07-06 17:00:43 -0300