Thiago Ribeiro / Noosfero

27 Jan, 2015

2 commits

a9c67a1b Merge branch 'chat' into master-with-chat ... Browse Dir »
```
Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css
```
Rodrigo Souto
2015-01-27 19:15:59 -0300
f5f1059d Merge branch 'AI3297-ClassCommunity' into 'master' ... Browse Dir »
```
Ai3297 class community

Fix the reviewed code in  https://gitlab.com/noosfero/noosfero/merge_requests/348

See merge request !404
```
Antonio Terceiro
2015-01-27 17:50:31 +0000

26 Jan, 2015

2 commits

b6d2e88c Merge branch 'master' into AI3268_template_management Browse Dir »

Leandro Santos
2015-01-26 17:37:36 -0300
4f321345 Merge branches 'master' and 'AI3268_template_management' into AI3268_template_management Browse Dir »

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

22 Jan, 2015

2 commits

d9a2d31d Merge branch 'product-qualifier-fix' into 'master' ... Browse Dir »

Fixes Edit Product page

'Add new qualifiers' in edit product was broken in rails 3 for two reasons: lack of escaping html characters and the qualifiers list wasn't accessible through mass assignment.

I came across this while working on another issue but I decided to extract the commits and submit to the master branch so we don't have to wait the other merge request.

See merge request !401

2015-01-22 16:43:24 +0000

0ac87b78 Merge branch 'body_loggedin' into 'master' ... Browse Dir »
```
Append logged-in class in body when user is logged in

See merge request !387
```
Leandro Santos
2015-01-22 13:41:01 +0000

21 Jan, 2015

6 commits

0c38e980 Adds ClassCommunityPlugin ... Browse Dir »
```
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
```
Arthur Esposte
2015-01-21 22:42:24 +0000
a6151343 Merge branch 'article_privacity_to_followers' into 'master' ... Browse Dir »
```
Article privacity to followers

https://gitlab.com/participa/noosfero/issues/324

Feitos para amigos de perfis de pessoas também!

See merge request !422
```
Antonio Terceiro
2015-01-21 18:54:19 +0000

45964060 Merge branch 'fix_block_links' into 'master' ... Browse Dir »

Fix block links

Fixing the URL from the article block and fixing the path of the New event button of the agenda.

When Noosfero is used in a subdirectory, it crashes without this modification.

See merge request !395

2015-01-21 18:29:39 +0000

1f3cc39f Merge branch 'move_list_of_profile' into 'master' ... Browse Dir »
```
Move list of profile

Move list of profiles that are included in the search css to SearchHelper

See merge request !394
```
Antonio Terceiro
2015-01-21 18:26:51 +0000

5d28b4b3 Add ability to mark blocks as fixed ... Browse Dir »

Fixed blocks can't be modified by regular users, but only by
administrators. The main use case is defining a few blocks in the user
or community templates, so that users and communities can't remove or
change them.

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
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: Gustavo Jaruga <darksshades@gmail.com>

2015-01-21 16:20:44 -0200

b3068b11 Add option to all community and users followers view a private article ... Browse Dir »

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
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: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>

2015-01-21 15:45:34 -0200

19 Jan, 2015

1 commit

76f856ad Escapes html in translations link ... Browse Dir »
```
  Escapes html so the javascript doesn't break
```
Larissa Reis
2015-01-19 10:05:22 -0300

08 Jan, 2015

4 commits

d1926f54 Cache theme renderings Browse Dir »

Braulio Bhavamitra
2015-01-08 22:22:09 -0300
0085008d Move theme js into head Browse Dir »

Braulio Bhavamitra
2015-01-08 22:22:05 -0300
bb166e4b Add method to return theme javascript source Browse Dir »

Braulio Bhavamitra
2015-01-08 22:22:05 -0300
25e3ce14 Add getter for current layout template Browse Dir »

Braulio Bhavamitra
2015-01-08 22:22:05 -0300

23 Dec, 2014

1 commit

6c59ac4a Fix: avoid crashing when displaying articles ... Browse Dir »

On environments created before including =spam_comments_count=, the visualization
of number of comments was crashing because it was nil

Fixes #31

2014-12-23 01:58:20 +0000

22 Dec, 2014

1 commit

a4fefc0c Merge branch 'stable' Browse Dir »

Daniela Feitosa
2014-12-22 23:21:51 -0300

15 Dec, 2014

1 commit

b6ca02d8 Move hard coded list of profiles from view to SearchHelper ... Browse Dir »
```
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
```
Luciano Prestes
2014-12-15 17:33:50 -0200

12 Dec, 2014

1 commit

fc14aa9d Major refactoring on chat interface Browse Dir »

Rodrigo Souto
2014-12-12 17:10:50 -0300

08 Dec, 2014

1 commit

8cd9c0af Add subdirectory to link "Read more" on article block. ... Browse Dir »
```
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Parley Martins <parleypachecomartins@gmail.com>
```
Parley
2014-12-08 15:07:12 -0200

04 Dec, 2014

1 commit

88c93107 Merge branch 'fix_role_edition' of https://gitlab.com/participa/noosfero into role-edition Browse Dir »

Antonio Terceiro
2014-12-04 12:00:59 -0200

03 Dec, 2014

1 commit

57e4738a Fix XSS possibility caused by quotes in article title/body Browse Dir »

Antonio Terceiro
2014-12-03 10:28:35 -0200

24 Nov, 2014

1 commit

05e56cd3 Append logged-in class in body when user is logged in Browse Dir »

Victor Costa
2014-11-24 10:39:46 -0300

20 Nov, 2014

1 commit

f6e59824 Fix environment role edition ... Browse Dir »

An environment role has permissions for both environment and profile but
edition page was displaying only environment permissions.

2014-11-20 10:29:21 -0300

18 Nov, 2014

1 commit

1843b53f filter_html: fix crash on nil input Browse Dir »

Antonio Terceiro
2014-11-18 13:10:59 -0200

13 Nov, 2014

1 commit

22b0889f fix presentation of raw HTML article Browse Dir »

Antonio Terceiro
2014-11-13 19:10:22 -0200

12 Nov, 2014

1 commit

bef9c7c4 people_block: fix tests Browse Dir »

Victor Costa
2014-11-12 14:55:05 -0300

05 Nov, 2014

2 commits

7212de73 Small fixes for chat Browse Dir »

Victor Costa
2014-11-05 18:54:02 -0300
0b674b6d New chat layout ... Browse Dir »
```
Conflicts:
	app/helpers/layout_helper.rb
```
Victor Costa
2014-11-05 18:54:01 -0300

27 Oct, 2014

2 commits

5b2ae1ea Merge branch 'fix_report_abuse' into 'master' ... Browse Dir »
```
Fix 'Report Abuse' action

See merge request !343
```
Antonio Terceiro
2014-10-27 20:52:45 +0000
49ab47a7 Merge branch 'stable' ... Browse Dir »
```
Ignored changes on po file

Conflicts:
	debian/changelog
	lib/noosfero.rb
	po/pt/noosfero.po
```
Daniela Feitosa
2014-10-27 14:20:57 -0300

22 Oct, 2014

5 commits

3600569d Added translation markup on profile fields Browse Dir »

Daniela Feitosa
2014-10-22 23:05:15 -0300

ad4f98b3 Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/helpers/profile_helper.rb
	app/views/content_viewer/_article_toolbar.rhtml
	app/views/profile/_common.rhtml
	app/views/profile/_organization_profile.rhtml
	app/views/profile/_person_profile.rhtml
	db/schema.rb
	public/stylesheets/application.css

2014-10-22 21:39:49 -0300

0f01bf09 Added article tags list on profiles Browse Dir »

Daniela Feitosa
2014-10-22 18:42:24 -0300
9dcfa5de Removed debug lines Browse Dir »

Daniela Feitosa
2014-10-22 19:21:35 +0000
e7e132e7 Fix: profile_controller tests Browse Dir »

Daniela Feitosa
2014-10-22 19:11:34 +0000

20 Oct, 2014

1 commit

2cbd78d6 Fix report abuse Browse Dir »

Victor Costa
2014-10-20 16:45:09 -0300

13 Oct, 2014

1 commit

d54e2a0d Remove debug statements left behind Browse Dir »

Antonio Terceiro
2014-10-13 19:09:27 -0300