Thiago Ribeiro / Noosfero

13 Jan, 2015

1 commit

f862eb4f publish-button: refactor display logic and remove useless tests Browse Dir »

Rodrigo Souto
2015-01-13 13:34:47 -0300

12 Jan, 2015

1 commit

c8dc0297 publish: fix tests Browse Dir »

Rodrigo Souto
2015-01-12 18:33:21 -0300

19 Dec, 2014

1 commit

7270935f Merge branch 'master' into stoa Browse Dir »

Larissa Reis
2014-12-19 14:49:16 -0300

08 Dec, 2014

1 commit

ea021e7f curriculum_lattes_plugin: fixed functionals tests Browse Dir »

Daniela Feitosa
2014-12-08 20:10:02 -0300

20 Nov, 2014

2 commits

f6e59824 Fix environment role edition ... Browse Dir »

An environment role has permissions for both environment and profile but
edition page was displaying only environment permissions.

2014-11-20 10:29:21 -0300

94eaff08 Merge branch 'master' into stoa ... Browse Dir »
```
Conflicts:
	Gemfile.lock
	script/development
```
Larissa Reis
2014-11-20 01:24:55 -0300

31 Oct, 2014

1 commit

1aa32327 Fix broken functional tests Browse Dir »

Antonio Terceiro
2014-10-31 14:29:11 -0200

27 Oct, 2014

1 commit

5b2ae1ea Merge branch 'fix_report_abuse' into 'master' ... Browse Dir »
```
Fix 'Report Abuse' action

See merge request !343
```
Antonio Terceiro
2014-10-27 20:52:45 +0000

22 Oct, 2014

3 commits

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

Conflicts:
	app/helpers/profile_helper.rb
	app/views/content_viewer/_article_toolbar.rhtml
	app/views/profile/_common.rhtml
	app/views/profile/_organization_profile.rhtml
	app/views/profile/_person_profile.rhtml
	db/schema.rb
	public/stylesheets/application.css

2014-10-22 21:39:49 -0300

0f01bf09 Added article tags list on profiles Browse Dir »

Daniela Feitosa
2014-10-22 18:42:24 -0300
e7e132e7 Fix: profile_controller tests Browse Dir »

Daniela Feitosa
2014-10-22 19:11:34 +0000

20 Oct, 2014

1 commit

2cbd78d6 Fix report abuse Browse Dir »

Victor Costa
2014-10-20 16:45:09 -0300

26 Sep, 2014

3 commits

03614d52 fix functional tests that fail without notification emails Browse Dir »

Antonio Terceiro
2014-09-26 13:43:26 -0300
70359d29 ProfileEditorController: fix test that sends email Browse Dir »

Antonio Terceiro
2014-09-26 13:42:21 -0300
8d2e48e9 ProfileController: fix fragile tests Browse Dir »

Antonio Terceiro
2014-09-26 13:42:04 -0300

24 Sep, 2014

1 commit

d9f771c3 Fix broken test Browse Dir »

Antonio Terceiro
2014-09-24 15:02:10 -0300

18 Sep, 2014

2 commits

9372126a [suggestions] Some enhancements ... Browse Dir »

Added title on links
Moved logic from view to model
Added conditions to avoid displaying empty lists
Removed code duplication on js

2014-09-18 08:21:47 -0300

9cc4340d Merge branch 'master' into stoa Browse Dir »

Daniela Feitosa
2014-09-18 08:19:26 -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

b759d641 AccountControllerTest: fix assumptions on call to User.data_hash Browse Dir »

Antonio Terceiro
2014-09-12 10:49:09 -0300
d3ade277 ChatController: fix assumption about default avatar Browse Dir »

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

11 Sep, 2014

1 commit

50e9fe92 social-share-privacy-plugin: use article extra content hotspot ... Browse Dir »
```
Instead of create another hotspot that does the same thing, use the
existing one. If the demand for separation appears in the future than we
may do it.
```
Rodrigo Souto
2014-09-11 11:44:47 -0300

08 Sep, 2014

1 commit

79e1ad7b Merge branch 'master' into stoa ... Browse Dir »

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/my_profile/memberships_controller.rb
	app/controllers/public/account_controller.rb
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/helpers/token_helper.rb
	app/views/account/signup.html.erb
	app/views/layouts/_javascript.html.erb
	db/schema.rb
	test/functional/application_controller_test.rb

2014-09-08 12:36:01 -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

27 Aug, 2014

1 commit

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

(ActionItem3045)
```
Joenio Costa
2014-08-27 20:41:41 -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

18 Aug, 2014

2 commits

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

Joenio Costa
2014-08-18 15:02:17 -0300
b7823262 Merge branch 'master' into stoa ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
	db/schema.rb
```
Rodrigo Souto
2014-08-18 12:31:32 -0300

14 Aug, 2014

1 commit

eec782d0 Merge branch 'master' into AI2915-category_color Browse Dir »

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

13 Aug, 2014

1 commit

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

1 commit

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

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

06 Aug, 2014

1 commit

f7bab27e Merge remote-tracking branch 'larissa/stoa-rails3' into stoa-merge ... Browse Dir »

Conflicts:
	app/controllers/application_controller.rb
	app/models/profile.rb
	app/views/friends/index.html.erb
	app/views/invite/_personalize_invitation_mail.html.erb
	test/functional/invite_controller_test.rb

2014-08-06 16:59:21 -0300

01 Aug, 2014

1 commit

720fc0fc Merge branch 'networks-interaction' into feedback ... Browse Dir »

[social-share] fixes previous update, that failed to change some files.
now i really did the merge with the "organized" branch, so everything
should be working the same.

Conflicts:
	app/views/content_viewer/view_page.html.erb
	lib/noosfero/plugin.rb

2014-08-01 01:14:08 -0300

31 Jul, 2014

3 commits

3b35e215 [search-term-improvements] Simple query normalization using downcase Browse Dir »

Rodrigo Souto
2014-07-31 17:18:02 +0000

c63abafb Fix author assignment for uploaded files ... Browse Dir »

authorship started being idenfitied by created_by instead of
last_changed_by, but #upload_files was not updated to reflect that and
there were no automated tests for it.

2014-07-31 13:56:06 -0300

1e02838e social-share: hotspot to show social buttons in content view ... Browse Dir »
```
  Plugins can provide social share buttons in content view page.

(ActionItem3238)
```
Larissa Reis
2014-07-31 05:49:10 -0300

28 Jul, 2014

2 commits

f3cd985b Merge branch 'AI3228_spreading_article' into 'master' ... Browse Dir »
```
Ai3228 spreading article

AI 3228 fix spreading article.

http://noosfero.org/Development/ActionItem3228

See merge request !267
```
Antonio Terceiro
2014-07-28 17:53:33 +0000
ea685a17 fix missing validation on spreading article Browse Dir »

David Silva
2014-07-28 17:30:38 +0000