Software Publico / Noosfero

07 Mar, 2014

4 commits

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

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 Code »

Daniela Feitosa
2014-03-07 13:04:39 +0000
c34cadf1 Fixed failing tests Browse Code »

Daniela Feitosa
2014-03-07 10:25:18 +0000
ebdbd8ac Removed unused method ... Browse Code »
```
It's not used anymore since:
ca5ebf95375cd5dbb80a047dc79f4c31e36df899
```
Daniela Feitosa
2014-03-07 10:11:05 +0000

05 Mar, 2014

1 commit

ffbf0914 Merge branch 'AI2943_container_block_fixes' into 'stable' ... Browse Code »
```
Ai2943 Container Block Fixes

Fix broken edition for container block with the new css for sideboxes view.
```
Daniela Feitosa
2014-03-05 17:53:53 +0000

03 Mar, 2014

1 commit

abdf6fab Moved style of elements to CSS file ... Browse Code »
```
Also removed wrong class from link-title

(ActionItem2925)
```
Daniela Feitosa
2014-03-03 02:28:04 +0000

02 Mar, 2014

2 commits

5ff853b4 Merge branch 'AI2925-add_tittle_field_on_link_list_block' of https://gitlab.com/… ... Browse Code »
```
…unb-gama/noosfero into AI2925-add_tittle_field_on_link_list_block

Conflicts:
	app/views/box_organizer/_link_list_block.rhtml
```
Daniela Feitosa
2014-03-02 13:38:51 +0000
7b1dae3c Merge commit 'refs/merge-requests/398' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/398

Conflicts:
	app/views/content_viewer/view_page.rhtml
```
Daniela Feitosa
2014-03-02 09:55:41 +0000

01 Mar, 2014

2 commits

c1fce26e Removed unnecessary assertion on test ... Browse Code »
```
(ActionItem2909)
```
Daniela Feitosa
2014-03-01 15:40:24 +0000
a508d544 fix: failing test on first and last day of a month Browse Code »

Daniela Feitosa
2014-03-01 15:32:57 +0000

28 Feb, 2014

1 commit

f15193c3 Merge branch 'ActionItem2909-SortUsersAlphabetically' of https://gitlab.com/unb-… ... Browse Code »
```
…gama/noosfero into ActionItem2909-SortUsersAlphabetically
```
Daniela Feitosa
2014-02-28 22:09:05 +0000

24 Feb, 2014

2 commits

cf53d339 comment_classification: added dependency on README Browse Code »

Daniela Feitosa
2014-02-24 10:52:17 +0000
4bd118d0 Merge remote branch 'danielafeitosa/comment_classification' Browse Code »

Daniela Feitosa
2014-02-24 10:46:07 +0000

20 Feb, 2014

1 commit

2e49a4f6 Bumping version 0.46.0 Browse Code »

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

13 Feb, 2014

11 commits

a8a8780b themes-controller-test: add test to sort themes Browse Code »

Rodrigo Souto
2014-02-13 22:41:31 -0300
781ee37c themes-controller-test: test themes are not duplicated when allowed by the envir… ... Browse Code »
```
…onment and by the user
```
Rodrigo Souto
2014-02-13 22:41:25 -0300
a24f068a array-ext: add test to uniq_by method Browse Code »

Rodrigo Souto
2014-02-13 22:41:24 -0300
a38702e3 Merge branch 'ai2992' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai2992 Browse Code »

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

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

Rodrigo Souto
2014-02-13 21:44:46 -0300
5c115a98 macros: add macro tests Browse Code »

Rodrigo Souto
2014-02-13 20:51:04 -0300

b096aa74 Revert "add the nokogiri gem as dependency" ... Browse Code »

This reverts commit a3fb85d903790d565983e4e0f22acf557d8292dc.

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

Conflicts:

	INSTALL
	script/install-dependencies/debian-squeeze.sh

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

e95275da Revert "application_helper: use Nokogiri in convert_macro() instead of Hpricot" ... Browse Code »

This reverts commit d726e40eb2b02f88051c1695596738a42c0eb561.

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

Conflicts:

	app/helpers/application_helper.rb

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

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

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

5cd7e54d container_block: fixed resize of children Browse Code »

Victor Costa
2014-02-13 10:51:48 -0300

12 Feb, 2014

2 commits

4c1ac095 container_block: render block title Browse Code »

Victor Costa
2014-02-12 17:09:05 -0300
10ab44f4 Sort theme listing Browse Code »

Braulio Bhavamitra
2014-02-12 14:35:58 -0300

11 Feb, 2014

10 commits

c51270d7 users-controller: default filter to all_users ... Browse Code »
```
(ActionItem2995)
```
Rodrigo Souto
2014-02-11 23:28:10 +0000
f8b1f66d users-controller: order users by name ... Browse Code »
```
Also adding a new assert helper to test the order of a collection
without assuming all elements inside it.

(ActionItem2996)
```
Rodrigo Souto
2014-02-11 23:27:45 +0000
27ef9853 Don't duplicate themes Browse Code »

Braulio Bhavamitra
2014-02-11 18:06:18 -0300
ff47927a Added comment_classification plugin ... Browse Code »
```
Status and Labels for comments

http://noosfero.org/Development/CommentClassificationPlugin
```
Daniela Feitosa
2014-02-11 13:56:35 +0000
adc4f4fd Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Code »

Rodrigo Souto
2014-02-11 01:00:30 -0300
895776ac Merge branch 'ai2988' into 'stable' ... Browse Code »
```
require_auth_to_comment plugin break dom's ready when not logged

http://noosfero.org/Development/ActionItem2988
```
Rodrigo Souto
2014-02-11 02:39:01 +0000

712b5f51 Merge branch 'ai2977' into 'stable' ... Browse Code »

Don't render layout for javascript format

This is the default behaviour for Rails when rendering .js.erb files. Check http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug

2014-02-11 02:36:16 +0000

840db72a Merge branch 'ai2981' into 'stable' ... Browse Code »
```
Don't let firefox show broken images name breaking layout

http://noosfero.org/Development/ActionItem2981
```
Rodrigo Souto
2014-02-11 01:53:51 +0000
e066c0a5 Merge branch 'ai2961' into 'stable' ... Browse Code »
```
Remove extra div close tag on location block

http://noosfero.org/Development/ActionItem2961
```
Rodrigo Souto
2014-02-11 01:45:54 +0000

13b60da3 Merge branch 'AI2897-environment_theme' into 'master' ... Browse Code »

Ai2897 Environment Theme

http://noosfero.org/Development/ActionItem2897

The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb.

2014-02-11 01:27:07 +0000

10 Feb, 2014

3 commits

3639698b Merge branch 'unb-gama/noosfero-AI2897-environment_theme' Browse Code »

Rodrigo Souto
2014-02-10 22:26:31 -0300
09db6ba7 Merge branch 'AI2897-environment_theme' of https://gitlab.com/unb-gama/noosfero … ... Browse Code »
```
…into unb-gama/noosfero-AI2897-environment_theme
```
Rodrigo Souto
2014-02-10 22:15:25 -0300
1d8eeefb Merge branch 'noosfero_0.46.0' Browse Code »

Rodrigo Souto
2014-02-10 22:13:58 -0300