Omar Junior / Noosfero

02 Apr, 2014

5 commits

f6eb6fd1 article-versions: change button text Browse Dir »

Rodrigo Souto
2014-04-02 20:23:27 +0000
93ecef8d article-versions: use versioned author_url too instead of only name Browse Dir »

Rodrigo Souto
2014-04-02 20:19:42 +0000
845ae13e minor: removing empty lines and trailing whitespaces Browse Dir »

Rodrigo Souto
2014-04-02 20:18:43 +0000
a739edce Merge branch 'article-version' of https://gitlab.com/juniorsilva1001/noosfero in… ... Browse Dir »
```
…to juniorsilva1001/noosfero-article-version

Conflicts:
	app/views/content_viewer/versioned_article.rhtml
	db/schema.rb
	public/stylesheets/application.css
```
Rodrigo Souto
2014-04-02 19:52:23 +0000

48038fc5 Merge branch 'stable' into noosfero_0.47.0 ... Browse Dir »

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/categories_block.feature
	po/eo/noosfero.po
	po/es/noosfero.po
	po/it/noosfero.po
	test/unit/block_test.rb

2014-04-02 19:40:37 +0000

28 Mar, 2014

1 commit

4825fe87 article-version: improvements in article versions navegability. Added buttons ... Browse Dir »
```
and warnings.
AI2822
```
Junior Silva
2014-03-28 18:39:43 -0300

27 Mar, 2014

1 commit

47669af4 article-version: implementing improvements in user navigation ... Browse Dir »
```
AI2822
```
Junior Silva
2014-03-27 20:59:32 -0300

26 Mar, 2014

1 commit

fe3ebd1c Added pagination on events ... Browse Dir »

agenda_improvements: Changed the limit to show the events

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>

(ActionItem3048)

2014-03-26 10:17:05 +0000

25 Mar, 2014

1 commit

341aff13 fix: added more info on cache_key of members_block ... Browse Dir »
```
(ActionItem3058)
```
Daniela Feitosa
2014-03-25 02:17:26 +0000

20 Mar, 2014

4 commits

f35ac46d article-version: added file versions_diff.html.erb ... Browse Dir »
```
AI2822
```
Junior Silva
2014-03-20 14:19:00 -0300
9c9e90ee Merge branch 'master' of https://gitlab.com/noosfero/noosfero into merging Browse Dir »

Rodrigo Souto
2014-03-20 11:55:03 -0300
68426a08 Merge branch 'master' into AI2694-network_activity_email Browse Dir »

Joenio Costa
2014-03-20 11:41:07 -0300

6e10728c Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/views/themes/index.rhtml
	db/schema.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	test/unit/person_test.rb

2014-03-20 10:58:42 -0300

19 Mar, 2014

4 commits

5f683224 Merge branch 'ai3028' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai3028 ... Browse Dir »
```
Conflicts:
	db/schema.rb
```
Rodrigo Souto
2014-03-19 20:28:07 +0000
67fdc2f1 small-enhancement: changed name of attribute ... Browse Dir »
```
(ActionItem2998)
```
Daniela Feitosa
2014-03-19 14:56:04 +0000

964df626 Merge branch 'signup_redirect_improvements' into 'master' ... Browse Dir »

Signup Redirect Improvements

Add environment feature for choosing where to redirect the user after signup. The options are the same as the ones for the login redirection options existing today.

This feature takes in consideration that the usar may have to follow a confirmation URL recieved by eletronic mail.

2014-03-19 14:56:00 +0000

c586c3b5 Cosmetic changes and removing trailing whitespaces ... Browse Dir »
```
(ActionItem2694)
```
Joenio Costa
2014-03-19 11:22:34 -0300

18 Mar, 2014

5 commits

edc5d4c5 Translate layout template strings Browse Dir »

Braulio Bhavamitra
2014-03-18 17:49:36 -0300
02b13044 Merge branch 'AI2997-create_topics_forum' of https://gitlab.com/unb-gama/noosfero Browse Dir »

Daniela Feitosa
2014-03-18 20:09:30 +0000
a91ba23d Removed unused method ... Browse Dir »
```
Also included tests for meta tags and removed not-needed tests

(ActionItem2610)
```
Daniela Feitosa
2014-03-18 18:40:07 +0000
13b88959 Removed deprecated way to share on facebook ... Browse Dir »
```
Also moved the addthis code to a partial

(ActionItem2610)
```
Daniela Feitosa
2014-03-18 16:38:06 +0000
c6dc9c48 Added meta tags for OpenGraph and Twitter ... Browse Dir »
```
(ActionItem2610)
```
Daniela Feitosa
2014-03-18 10:57:44 +0000

17 Mar, 2014

2 commits

645f9328 Merge branch 'master' into AI2694-network_activity_email Browse Dir »

Joenio Costa
2014-03-17 20:14:21 -0300
12a28da7 Added plugin for mark comment as read ... Browse Dir »
```
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>

(ActionItem2670)
```
Victor Costa
2014-03-17 22:59:07 +0000

16 Mar, 2014

1 commit

a3a68964 Merge branch 'AI3015-fix_profile_controller' of https://gitlab.com/participa/noo… ... Browse Dir »
```
…sfero into AI3015-fix_profile_controller
```
Daniela Feitosa
2014-03-16 23:41:55 +0000

14 Mar, 2014

2 commits

b461081b admin_features: Add redirection options after signup when confirmation ... Browse Dir »
```
email is enabled.

(ActionItem2998)

Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
```
Daniel
2014-03-14 20:03:16 -0300
fd488954 environment_features: Add redirection option for signup on admin ... Browse Dir »
```
features page.

(ActionItem2998)
```
Daniel
2014-03-14 19:20:27 -0300

13 Mar, 2014

6 commits

da22d0c8 Merge branch 'master' into AI2928-categories Browse Dir »

Joenio Costa
2014-03-13 18:21:41 -0300
a72fb5dd Better styles for default layout and small improvements in the UI ... Browse Dir »
```
(ActionItem2928)
```
Joenio Costa
2014-03-13 18:20:39 -0300
9a1bc7ba Merge branch 'AI3021-ban_user' of https://gitlab.com/unb-gama/noosfero into AI3021-ban_user Browse Dir »

Daniela Feitosa
2014-03-13 16:53:29 +0000
cd79e9fb Tabs to display fields for each kind of profile ... Browse Dir »
```
Also fixed tests

(ActionItem2962)
```
Daniela Feitosa
2014-03-13 16:22:25 +0000
da3f1073 Removed inline style from table ... Browse Dir »
```
Also changed selenium tests to use defined steps

(ActionItem2962)
```
Daniela Feitosa
2014-03-13 15:42:41 +0000
ff489c4b Merge branch 'AI2962-check_all_manage_fields' of https://gitlab.com/unb-gama/noo… ... Browse Dir »
```
…sfero into AI2962-check_all_manage_fields
```
Daniela Feitosa
2014-03-13 13:16:47 +0000

12 Mar, 2014

4 commits

d0cd6046 Addded cucumber test ... Browse Dir »

-Added tests for ban user
-Added also tests for activate/deactivate users
-Added also tests for set admin role

(ActionItem3021)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>

2014-03-12 17:27:37 +0000

2915c278 Add confirm message for ban, activate/deactivate ... Browse Dir »

(ActionItem3021)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>

2014-03-12 16:49:56 +0000

377d910b ban_user: Creating ban button and ban method in user controller ... Browse Dir »
```
(ActionItemAI3021)

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
```
David Silva
2014-03-12 16:49:56 +0000
9a799cfa Merge branch 'AI2928-categories' of https://gitlab.com/participa/noosfero into AI2928-categories Browse Dir »

Joenio Costa
2014-03-12 10:57:35 -0300

11 Mar, 2014

1 commit

8e7fe1a5 Improved layout for categories selection ... Browse Dir »
```
(ActionItem2928)
```
Victor Costa
2014-03-11 17:33:42 -0300

10 Mar, 2014

1 commit

1dfa6f09 Merge branch 'master' into AI2928-categories Browse Dir »

Joenio Costa
2014-03-10 10:10:22 -0300

07 Mar, 2014

1 commit

1c211c78 create_topics: Corrections for merge-request. ... Browse Dir »
```
(ActionItem2997)

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Gabriela Navarro
2014-03-07 14:38:31 +0000