Charles Oliveira / noosfero

21 May, 2015

1 commit

f8a595c3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	app/views/content_viewer/_article_toolbar.html.erb
```
Victor Costa
2015-05-21 14:28:17 -0300

20 May, 2015

2 commits

82270a3f Merge branch 'fix_forum' into 'master' ... Browse Dir »

Fix the required_fields_message for forums. It was overlaying the title field

This patch is to fix the overlaying problem the Title field when creating a forum

See merge request !574

2015-05-20 21:41:40 +0000

b464989a Add rake task to activate all available plugins Browse Dir »

Gabriela Navarro
2015-05-20 17:05:27 -0300

19 May, 2015

2 commits

e152b3a2 Enables fullscreen view for article view and edit Browse Dir »

Evandro Junior
2015-05-19 17:51:26 -0300
71cf8bc1 display_filter should return all public content if no profile is passed Browse Dir »

Leandro Santos
2015-05-19 15:07:51 -0300

14 May, 2015

1 commit

91f76fb3 Fix the required_fields_message for forums. It was overlaying the title field ... Browse Dir »
```
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Gabriela Navarro
2015-05-14 14:54:52 +0000

13 May, 2015

2 commits

3e72f54e Merge branch 'bug_subdir_tasks' into 'master' ... Browse Dir »

Fix subdir link when creating a new task.

E-mails sent by the tasks of noosfero do not include the subdirectory in links correctly

See merge request !516

2015-05-13 20:35:28 +0000

a710bcc7 Change logic for showing public articles in private communities ... Browse Dir »

Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-05-13 16:33:41 -0300

12 May, 2015

8 commits

ea5d6c29 merging with master Browse Dir »

Leandro Santos
2015-05-12 21:45:22 -0300
8e131944 adding require-login-popup for actions that must be logged in to work Browse Dir »

Leandro Santos
2015-05-12 17:19:26 -0300
1a6baee6 Infra to display login popup when not logged users click in a link Browse Dir »

Victor Costa
2015-05-12 17:19:26 -0300
8e2f02dc noosfero-steps: fix box fetch on block creation Browse Dir »

Rodrigo Souto
2015-05-12 13:17:02 -0300
9132007f Applying merge request revisions ... Browse Dir »
```
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
```
André Guedes
2015-05-12 13:15:35 -0300
cd1a5cd2 Allow noosfero template system to use javascript ... Browse Dir »
```
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
```
Fabio Teixeira
2015-05-12 13:15:35 -0300

f82f1955 Add new layout template with 4 boxes ... Browse Dir »

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>

2015-05-12 13:15:35 -0300

b084242c Fix profile custom roles management ... Browse Dir »
```
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Gabriela Navarro
2015-05-12 12:49:15 +0000

08 May, 2015

10 commits

55893dbf Merge branch 'custom_roles_management' Browse Dir »

Rodrigo Souto
2015-05-08 18:54:25 -0300
5f7895c3 Merge request revision ... Browse Dir »
```
  - Fixed search method for members
  - Fixed headings and misplaced divs
  - Fixed tests for better reliability
```
André Guedes
2015-05-08 18:53:09 -0300
9304a753 Merge branch 'ldap_fix' Browse Dir »

Rodrigo Souto
2015-05-08 18:50:08 -0300
7b90808f Change role assign icon ... Browse Dir »
```
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
```
André Guedes
2015-05-08 16:13:55 -0300
040516df Fixed custom_roles method replacement on profile_member_controller Browse Dir »

André Guedes
2015-05-08 16:13:55 -0300
cbf24413 Refactoring profile to fix tests ... Browse Dir »
```
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
```
André Guedes
2015-05-08 16:13:55 -0300
8bcf8c4f Added permission to manage_custom_roles and started test for the controller ... 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>
```
André Guedes
2015-05-08 16:13:55 -0300

148b47c5 Added assign option to roles ... 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

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

5f9c2a69 Merge branch 'I4-Video-Gallery-Plugin' into stable ... Browse Dir »
```
Conflicts:
	app/views/content_viewer/_article_toolbar.html.erb
	plugins/video/views/content_viewer/video_plugin/_video.html.erb
```
Evandro Junior
2015-05-08 14:53:15 -0300

07 May, 2015

2 commits

30ffafc5 Merge branch 'block_edit_modes' into next ... Browse Dir »
```
Conflicts:
	test/unit/boxes_helper_test.rb
```
Rodrigo Souto
2015-05-07 13:18:05 -0300

b3632c6b Merge branch 'alternative_redirect_behavior' into 'next' ... Browse Dir »

Add alternative redirect's behavior when user is '~'

This is a new feature to create generic URL's related to usernames in Noosfero. It is useful for internal links on articles and for general links on themes.

Examples:
 - If you're logged in as "test" and you go to /~/blog it will redirect you to /test/blog
 - If you're logged in as "test" and you go to /myprofile/~ it will redirect you to /myprofile/test
 - If you're not logged in and you go to /profile/~ or any other link using "~" it will give you a not found page(404).

See merge request !518

2015-05-07 15:43:10 +0000

05 May, 2015

3 commits

34f625c4 Add template reference when aplly template to profile Browse Dir »

Arthur Esposte
2015-05-05 21:04:59 +0000
fab94568 Merge branch 'api' into stable Browse Dir »

Victor Costa
2015-05-05 14:53:57 -0300
1fdf2205 api: multiple articles hits Browse Dir »

Victor Costa
2015-05-05 13:44:59 -0300

27 Apr, 2015

9 commits

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

Victor Costa
2015-04-27 19:52:48 -0300
fecb92d5 Fix type and parent_id selection for suggest article view Browse Dir »

Victor Costa
2015-04-27 19:22:56 -0300
3c2de986 Validate article type in SuggestArticle Browse Dir »

Victor Costa
2015-04-27 19:04:56 -0300
783e9041 Merge branch 'next' into api Browse Dir »

Victor Costa
2015-04-27 18:01:10 -0300
356ed1a3 Fix inclusion of javascript files from plugins Browse Dir »

Victor Costa
2015-04-27 17:57:35 -0300
7b56aeac Merge branch 'next' into api ... Browse Dir »
```
Conflicts:
	app/models/suggest_article.rb
```
Victor Costa
2015-04-27 17:22:21 -0300

a4d28dc0 Merge branch 'suggest_article_refactor' into 'next' ... Browse Dir »

Refactoring SuggestArticle

Refactoring SuggestArticle and add two new features:

- Accept suggestion from logged in users;
- SuggestArticle model accept other article types.

See merge request !561

2015-04-27 19:42:04 +0000

cbd74497 Merge branch 'master' into next Browse Dir »

Antonio Terceiro
2015-04-27 15:14:54 -0300