Omar Junior / Noosfero

02 Apr, 2014

1 commit

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

31 Mar, 2014

3 commits

5ffb073c file-presenter: file presenter always displays an html version of the file with … ... Browse Dir »
```
…the link to the original file
```
Rodrigo Souto
2014-03-31 23:40:42 +0000
6f052859 plugins-test: improve infra to allow running tests individually Browse Dir »

Rodrigo Souto
2014-03-31 23:40:37 +0000
9255fbad feed-handler: remove logger flood on processing feed Browse Dir »

Rodrigo Souto
2014-03-31 08:44:34 -0300

20 Mar, 2014

5 commits

aa963d7a Bumping version 0.47.0~rc1 Browse Dir »

Rodrigo Souto
2014-03-20 20:26:56 +0000
11f56769 release-script: update authors before version bump Browse Dir »

Rodrigo Souto
2014-03-20 20:25:44 +0000
10bce648 release-script: ask rc version instead of using timestamp always Browse Dir »

Rodrigo Souto
2014-03-20 20:21:29 +0000
9c9e90ee Merge branch 'master' of https://gitlab.com/noosfero/noosfero into merging Browse Dir »

Rodrigo Souto
2014-03-20 11:55:03 -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

3 commits

ca78d2e2 Bumping version 0.46.2 Browse Dir »

Rodrigo Souto
2014-03-19 23:41:10 +0000
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
d5d9e7da Merge branch 'search-optimizations' into stable Browse Dir »

Rodrigo Souto
2014-03-19 17:16:20 +0000

18 Mar, 2014

3 commits

0dc835a3 action_tracker: moving activities_count triggers to a lib ... Browse Dir »
```
(ActionItem3039)
```
Rodrigo Souto
2014-03-18 20:28:12 +0000
c124eb8e organization: register and use members_count to fetch most_popular organizations ... Browse Dir »
```
(ActionItem3039)
```
Rodrigo Souto
2014-03-18 20:28:02 +0000
8eb914c0 action_tracker: register and use activities_count to fetch most_active profile ... Browse Dir »
```
(ActionItem3039)
```
Rodrigo Souto
2014-03-18 20:27:44 +0000

17 Mar, 2014

3 commits

74d02a29 file_presenter: display unknown type when file has no content_type ... Browse Dir »
```
(ActionItem3049)
```
Rodrigo Souto
2014-03-17 23:15:52 +0000
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

10 Mar, 2014

2 commits

c68b621c file-presenter: pass kind_of? to the encapsulated file Browse Dir »

Rodrigo Souto
2014-03-10 13:45:56 -0300
f1afd938 file-presenter: add base_class to allow encapsulated content polymorphic relations Browse Dir »

Rodrigo Souto
2014-03-10 13:45:21 -0300

07 Mar, 2014

2 commits

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

Conflicts:
	app/controllers/my_profile/profile_themes_controller.rb
	test/unit/comment_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2014-03-07 13:17:54 +0000

49e6135e Bumping version 0.46.1 Browse Dir »

Daniela Feitosa
2014-03-07 13:04:39 +0000

03 Mar, 2014

1 commit

0497c662 Rename contact_email with noreply_email when pertinent Browse Dir »

Braulio Bhavamitra
2014-03-03 15:28:51 -0300

20 Feb, 2014

2 commits

61af39c0 Merge branch 'master_colivre' into AI2694-network_activity_email ... Browse Dir »
```
Conflicts:
	test/unit/person_test.rb
```
Victor Costa
2014-02-20 10:55:47 -0300
2e49a4f6 Bumping version 0.46.0 Browse Dir »

Rodrigo Souto
2014-02-20 17:56:20 -0300

13 Feb, 2014

4 commits

a38702e3 Merge branch 'ai2992' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai2992 Browse Dir »

Rodrigo Souto
2014-02-13 22:05:32 -0300
7635668e routes: avoid test failure due to unexpected param profile Browse Dir »

Rodrigo Souto
2014-02-13 22:00:43 -0300
a66293bb Merge branch 'ai2938' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai2938 Browse Dir »

Rodrigo Souto
2014-02-13 21:44:46 -0300

ca5e7eb8 Revert "macro: fix attributes after nokogiri change and write some tests" ... Browse Dir »

This reverts commit 25018e09d903cb9a6cb064ea447888fe2e1c1d39.

Reverting substitution of hpricot for nokogiri on macros infra due to
segfault problem with nokogiri 1.4.0.

2014-02-13 20:34:03 -0300

11 Feb, 2014

1 commit

27ef9853 Don't duplicate themes Browse Dir »

Braulio Bhavamitra
2014-02-11 18:06:18 -0300

10 Feb, 2014

2 commits

1d8eeefb Merge branch 'noosfero_0.46.0' Browse Dir »

Rodrigo Souto
2014-02-10 22:13:58 -0300
bfaf1bdd Added hotspots for comments Browse Dir »

Daniela Feitosa
2014-02-10 10:13:28 +0000

28 Jan, 2014

3 commits

25018e09 macro: fix attributes after nokogiri change and write some tests Browse Dir »

Rodrigo Souto
2014-01-28 21:34:24 +0000
66d9f7d8 plugins-infra: load extensions with configuration.to_prepare Browse Dir »

Rodrigo Souto
2014-01-28 15:35:30 +0000
caf8c081 Merge branch 'AI2786-like' of https://gitlab.com/participa/noosfero into partici… ... Browse Dir »
```
…pa/noosfero-AI2786-like
```
Rodrigo Souto
2014-01-28 14:44:47 +0000

23 Jan, 2014

1 commit

4b01e9da Merge remote-tracking branch 'danielbucher/sub_organizations_improvements' into … ... Browse Dir »
```
…sub_organizations_improvements
```
Joenio Costa
2014-01-23 22:03:46 -0300

22 Jan, 2014

1 commit

99c4da00 Merge commit 'refs/merge-requests/342' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/342

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
```
Rodrigo Souto
2014-01-22 22:03:11 +0000

20 Jan, 2014

1 commit

407ec1dc Bumping version 0.46.0~rc20140120171635 Browse Dir »

Rodrigo Souto
2014-01-20 17:17:04 +0000

17 Jan, 2014

2 commits

4ad91064 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2014-01-17 18:08:25 +0000

7bc0a2a4 sub_organizations_plugin: Add related organizations block ... Browse Dir »

The following improvements have been made:
  - Created action that displays sub-organization and
  super organizations of a given organization.
  - Created a block that display related organizations.
  - List mother organizations to person's membership if
  he/she is member of a sub-organization.

(ActionItem2499)
(ActionItem2825)

Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br>
Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>

2014-01-17 14:43:37 -0200