AvaliaSPB / Noosfero

11 Sep, 2014

1 commit

c29b0edc shopping-cart-plugin: instance_exec instead of instance_eval ... Browse Dir »
```
AI3286
```
Junior Silva
2014-09-11 12:50:39 -0300

26 Aug, 2014

1 commit

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

1 commit

26e347c9 Merge branch 'master' into AI3280-tagging Browse Dir »

Joenio Costa
2014-08-25 17:02:00 -0300

20 Aug, 2014

5 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

ba453de5 Fixed welcome message when the feature is on. ... 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:29 -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

ad80b504 Tasks: fix filtering by task type Browse Dir »

Antonio Terceiro
2014-08-20 20:47:36 -0300

fbbb2470 Tasks: need to filter only on actual list of tasks ... Browse Dir »

Let's quite this string programming there. We do not need to keep a list
of all types of tasks, we just need to take the actual list of tasks,
and create the filter list accordingly.

2014-08-20 09:22:14 -0300

18 Aug, 2014

2 commits

f1cafcb8 Merge branch 'master' into AI3191-private_environment Browse Dir »

Joenio Costa
2014-08-18 15:02:17 -0300
206bd7b9 Merge branch 'AI2915-category_color' Browse Dir »

Joenio Costa
2014-08-18 13:52:43 -0300

14 Aug, 2014

2 commits

3b3e0243 Remove paginate from ArticleBlock blog's presentation ... Browse Dir »
```
(ActionItem3218)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
```
Arthur Esposte
2014-08-14 16:46:37 -0300
eec782d0 Merge branch 'master' into AI2915-category_color Browse Dir »

Joenio Costa
2014-08-14 14:55:04 -0300

13 Aug, 2014

6 commits

bb128631 versioned_article: remove extra </div> Browse Dir »

Antonio Terceiro
2014-08-13 16:54:18 -0300
13f3dd76 Merge branch 'AI3250-fix_comment_form_captcha' into 'master' ... Browse Dir »
```
Ai3250 fix comment form captcha

http://noosfero.org/Development/ActionItem3250

See merge request !280
```
Antonio Terceiro
2014-08-13 19:20:14 +0000
d2e9a99b Merge branch 'AI3189-fix_versions_back_button' into 'master' ... Browse Dir »
```
Ai3189 fix versions back button

https://noosfero.org/Development/ActionItem3189

See merge request !266
```
Antonio Terceiro
2014-08-13 19:19:47 +0000
72a59859 Merge branch 'AI3223-fix_article_versions' into 'master' ... Browse Dir »
```
Ai3223 fix article versions

http://noosfero.org/Development/ActionItem3223

See merge request !265
```
Antonio Terceiro
2014-08-13 18:54:45 +0000

203c5675 Merge branch 'new_highlight' into 'master' ... Browse Dir »

New highlight

First commit for "#3243: HighlightsBlock edit mode is not creating image fields"
http://noosfero.org/Development/ActionItem3243

Second commit for "#3260: Remove a highlight item from the list"
http://noosfero.org/Development/ActionItem3260

See merge request !290

2014-08-13 14:41:56 +0000

ea7132de Merge branch 'AI3251_edit_header_footer' into 'master' ... Browse Dir »
```
Ai3251 edit header footer

AI 3251 fix edit header footer
http://noosfero.org/Development/ActionItem3251

See merge request !276
```
Antonio Terceiro
2014-08-13 13:25:15 +0000

12 Aug, 2014

1 commit

2620604b Change the category color selection to use a colorpicker component. ... Browse Dir »
```
The field display_color has turned into char(6) and stores the color rgb hex code.
(ActionItem2915)
```
Victor Costa
2014-08-12 09:44:00 -0300

11 Aug, 2014

3 commits

1c92a457 Fix "My networks" block Browse Dir »

Antonio Terceiro
2014-08-11 18:37:01 -0300

782b123f Fix header/footer disable feature visualization logic ... Browse Dir »

(ActionItem3251)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-08-11 20:35:24 +0000

7ba54a9d Fix merge problems ... Browse Dir »

At least as far as unit tests are concerned. Still missing:

  - 1 failing test in ArticleTest
  - 1 failing test in PersonTest

2014-08-11 16:34:21 -0300

08 Aug, 2014

2 commits

3d9edbbb change tagging ui Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-08-08 18:57:45 -0300
6c86b2a8 Fix naming of profile_info_action partials Browse Dir »

Antonio Terceiro
2014-08-08 13:14:38 -0300

07 Aug, 2014

1 commit

34f8f4d7 Merge remote-tracking branch 'origin/stable' ... Browse Dir »

Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb

2014-08-07 14:20:39 -0300

05 Aug, 2014

1 commit

ba59e832 Highlight block delete highlight row ... Browse Dir »

(ActionItem3260)

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>

2014-08-05 14:55:40 -0300

04 Aug, 2014

1 commit

52f7d6cb Fix Highlight block 'new highlight' button ... Browse Dir »

(ActionItem3243)

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>

2014-08-04 17:20:33 -0300

01 Aug, 2014

1 commit

944c01f8 Merge remote-tracking branch 'origin/rails3' Browse Dir »

Antonio Terceiro
2014-08-01 10:01:36 -0300

31 Jul, 2014

2 commits

b75cdb5c Merge branch 'AI3180-profile-tabs-wrong' into 'master' ... Browse Dir »

AI3180: profile tabs wrong

When we create a new tab to put more informations in profile's informations, we cannot indicate if the tab is shown in the beginning or not.

ActionItem3077: http://noosfero.org/Development/ActionItem3180

See merge request !247

2014-07-31 18:18:25 +0000