Charles Oliveira / noosfero

25 Sep, 2014

2 commits

b76a4336 Merge branch 'rails3_community_dashboard' into rails3_stable ... Browse Dir »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
```
Victor Costa
2014-09-25 11:43:30 -0300
e37bc72b community_dashboard: fix view_page Browse Dir »

Victor Costa
2014-09-25 11:41:22 -0300

24 Sep, 2014

1 commit

0cd81fcc Fix article rendering for UploadedFile Browse Dir »

Victor Costa
2014-09-24 12:54:38 -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

15 Sep, 2014

1 commit

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

12 Sep, 2014

2 commits

ac6f9bd3 Merge branch 'AI1954-Manage-Friends-shows-the-wrong-number-of-persosns-per-page' into 'master' ... Browse Dir »

Ai1954 manage friends shows the wrong number of persosns per page

Changed the number of friends shown per page, to improve usability.

ActionItem1954: http://noosfero.org/Development/ActionItem1954

See merge request !219

2014-09-12 17:54:07 +0000

d3ade277 ChatController: fix assumption about default avatar Browse Dir »

Antonio Terceiro
2014-09-12 10:41:09 -0300

11 Sep, 2014

1 commit

6bc2c9c5 Merge branch 'stable' into stable-merge ... Browse Dir »

Conflicts:
	AUTHORS
	app/controllers/public/content_viewer_controller.rb
	debian/changelog
	lib/noosfero.rb
	po/de/noosfero.po
	po/eo/noosfero.po
	po/es/noosfero.po
	po/fr/noosfero.po
	po/hy/noosfero.po
	po/it/noosfero.po
	po/noosfero.pot
	po/pt/noosfero.po
	po/ru/noosfero.po

2014-09-11 19:53:28 -0300

09 Sep, 2014

2 commits

adc8efa4 Merge branch 'ai3299' into 'master' ... Browse Dir »
```
Fix support of custom layout in themes

http://noosfero.org/Development/ActionItem3299

See merge request !315
```
Antonio Terceiro
2014-09-09 21:30:35 +0000
85bd2779 gettext: fix string extraction and runtime usage ... Browse Dir »
```
Closes #307

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
```
Victor Costa
2014-09-09 16:22:24 -0300

05 Sep, 2014

3 commits

3a320e4b Merge branch 'rails3-custom_fields' into rails3_stable Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-09-05 17:08:13 -0300
3193dfa1 Merge branch 'master' into rails3-custom_fields Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-09-05 15:29:56 -0300
5d6ae4ae fixes Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-09-05 15:15:26 -0300

03 Sep, 2014

1 commit

3951277f Fix support of custom layout in themes Browse Dir »

Braulio Bhavamitra
2014-09-03 15:37:52 -0300

02 Sep, 2014

1 commit

181fc268 Check whitelist members only if environment is restricted ... Browse Dir »
```
(ActionItem3191)
```
Joenio Costa
2014-09-02 12:17:24 -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

2 commits

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

(ActionItem3045)
```
Joenio Costa
2014-08-27 20:41:41 -0300
78f9202e minor fixes Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-08-27 19:03:02 -0300

26 Aug, 2014

2 commits

8cc18ab5 change solution: custom fields per profile Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-08-26 18:49:08 -0300
01c0f483 adding some functional tests ... Browse Dir »
```
also:
* keep the tip about separate tags by comma
* include the css in the header page to have cache

(ActionItem3280)
```
Joenio Costa
2014-08-26 18:01:28 -0300

25 Aug, 2014

5 commits

8d44bb72 add infra Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-08-25 17:03:41 -0300
26e347c9 Merge branch 'master' into AI3280-tagging Browse Dir »

Joenio Costa
2014-08-25 17:02:00 -0300
e7fa90d6 Merge branch 'rails3_stable' of gitlab.com:participa/noosfero into rails3_stable Browse Dir »

Victor Costa
2014-08-25 12:24:38 -0300
32968c83 Merge branch 'master' into rails3_stable Browse Dir »

Victor Costa
2014-08-25 12:24:07 -0300
3ae3a209 Merge branch 'AI3280-tagging' into rails3_stable Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-08-25 10:58:41 -0300

22 Aug, 2014

1 commit

c8906716 add infra Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-08-22 18:12:51 -0300

21 Aug, 2014

3 commits

f1a6c012 Merge branch 'rails3_chat' into rails3_stable Browse Dir »

Victor Costa
2014-08-21 18:45:25 -0300
2598c37e Merge branch 'master' into rails3_stable Browse Dir »

Victor Costa
2014-08-21 18:45:21 -0300
10662c2c Chat improvement Browse Dir »

Victor Costa
2014-08-21 18:42:50 -0300

20 Aug, 2014

11 commits

8af1ea81 AI3036 Fixed bugs on User Moderation ... Browse Dir »

Solved code duplication that creates the Task for moderation.
Fixed the signup page to show the correct messages in case of any combination of the features "Admin Must Approve New Users" and "Skip Email Activation"

Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2014-08-20 21:44:29 -0300

fa585a8c User Moderation new support ... Browse Dir »

Added support for using User Moderation and Skip user email activation features together

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2014-08-20 21:44:29 -0300

c034e703 Fixed selenium tests and signup join in community check. ... Browse Dir »
```
(AI3036)

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
```
Hebert Santos
2014-08-20 21:44:29 -0300
bdeb37d3 Fixed redirecting after signup. ... Browse Dir »
```
(AI3036)

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
```
André Guedes
2014-08-20 21:44:28 -0300
65f294e1 Changed when user is created on moderation and removed unused user data ... Browse Dir »
```
from task.

(AI3036)

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
```
André Guedes
2014-08-20 21:44:28 -0300

ccfe5f79 Fixing person identifier not saving and validation of user attributes. ... Browse Dir »

(AI3036)

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
Signed-off-by: Renan Costa <renan2727@hotmail.com>
Signed-off-by: Rodrigo Medeiros <rodrigo.mss01@gmail.com>
Signed-off-by: Iolane Andrade <andrade.icaa@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2014-08-20 21:44:28 -0300

24c79664 Refactoring "perform" method on CreateUser task and "signup" method on AccountController ... Browse Dir »
```
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
```
tallys
2014-08-20 21:44:28 -0300
d9a22bdf user_registration: Add CreateUser type on task.rb ... Browse Dir »
```
Signed-off-by: Álvaro Fernando<alvarofernandoms@gmail.com>
```
Gabriela Navarro
2014-08-20 21:44:28 -0300
52ab5d7f user_registration: Creates task for the admin to process and cucumber test. ... Browse Dir »
```
(ActionItem3036)

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Wilton Rodrigues <braynwilton@gmail.com>
```
Gabriela Navarro
2014-08-20 21:39:41 -0300
ad80b504 Tasks: fix filtering by task type Browse Dir »

Antonio Terceiro
2014-08-20 20:47:36 -0300
f2305c51 Tell the user his community creation will be moderated Browse Dir »

Antonio Terceiro
2014-08-20 20:46:53 -0300