Charles Oliveira / noosfero

18 Sep, 2014

1 commit

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

Daniela Feitosa
2014-09-18 08:19:26 -0300

11 Sep, 2014

2 commits

6bc2c9c5 Merge branch 'stable' into stable-merge ... Browse Dir »

Conflicts:
	AUTHORS
	app/controllers/public/content_viewer_controller.rb
	debian/changelog
	lib/noosfero.rb
	po/de/noosfero.po
	po/eo/noosfero.po
	po/es/noosfero.po
	po/fr/noosfero.po
	po/hy/noosfero.po
	po/it/noosfero.po
	po/noosfero.pot
	po/pt/noosfero.po
	po/ru/noosfero.po

2014-09-11 19:53:28 -0300

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

03 Sep, 2014

1 commit

4bf00631 shop-cart-form: displays form in colorbox ... Browse Dir »
```
AI3288
```
Junior Silva
2014-09-03 12:05:47 -0300

02 Sep, 2014

1 commit

8ab2662b [suborganization] css now working only on plugin ... Browse Dir »
```
(ActionItem3296)
```
Daniela Feitosa
2014-09-02 17:30:16 -0300

19 Aug, 2014

1 commit

b1d5a85f stoa-plugin: not test ssl connection on Noosfero ... Browse Dir »

Our default ssl setup uses a reverse proxy (pound) that treats https
connection and passes clean http connections to Noosfero. That way,
even using https connections Noosfero will only see http connections. So
we can't test if the connection is ssl inside Noosfero.

2014-08-19 12:27:30 -0300

18 Aug, 2014

1 commit

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

3 commits

3512ab2f Fixed the reorder of form submissions ... Browse Dir »

- storing the author_name when logged users submit a form
- migration to insert =author_name= on existent submissions

(ActionItem3263)

2014-08-13 14:45:32 -0300

94c1d5ec Merge branch 'AI3262-custom_form_plugin_bug' into 'master' ... Browse Dir »
```
Ai3262 custom form plugin bug

Fixing custom_forms plugin's rails 3 bug -> http://noosfero.org/Development/ActionItem3262

See merge request !293
```
Antonio Terceiro
2014-08-13 14:46:09 +0000
6ccbcfa6 profile-suggestions: final adjustements Browse Dir »

Rodrigo Souto
2014-08-13 11:06:42 -0300

12 Aug, 2014

5 commits

12f1d2a5 profile-suggestions: more style improvements Browse Dir »

Rodrigo Souto
2014-08-12 17:26:12 -0300
87caeeb3 profile-suggestions: suggestions block style improvements Browse Dir »

Rodrigo Souto
2014-08-12 19:52:22 +0000
0ad3346d profile-connections: changes css to connections block ... Browse Dir »
```
  Makes the connections shown in the community / people block less
  crowded.

(ActionItem3234)
```
Larissa Reis
2014-08-12 13:53:52 +0000
2247304b community_track: add color to track name Browse Dir »

Victor Costa
2014-08-12 09:44:07 -0300
53e85962 community_track: added background color to track card Browse Dir »

Victor Costa
2014-08-12 09:44:07 -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

06 Aug, 2014

4 commits

a69db7b5 Change fields_for structure to rails 3 in show_submission view Browse Dir »

Arthur Esposte
2014-08-06 22:13:38 -0300
5f98fb25 Fix custom_forms' buttons escaping HTML properly Browse Dir »

Arthur Esposte
2014-08-06 20:55:15 -0300
bf667380 Add attr_accessible to Alternative's selected_by_default attribute ... Browse Dir »
```
(ActionItem3262)
```
Arthur Esposte
2014-08-06 20:52:52 -0300

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

04 Aug, 2014

5 commits

03abebca [suggestions] Add suggestions on communities block ... Browse Dir »
```
(ActionItem3234)
```
Daniela Feitosa
2014-08-04 22:12:32 -0300
de452eab [suggestions] Added suggestion list on friends block ... Browse Dir »
```
(ActionItem3234)
```
Daniela Feitosa
2014-08-04 22:12:32 -0300
a68c9e40 Merge branch 'networks-interaction' into feedback ... Browse Dir »
```
  Applying changes Ewout and Daniel asked.
```
Larissa Reis
2014-08-04 02:44:42 -0300

d46acfb7 social-share: allows users to set networks they want always on ... Browse Dir »

  I decided to use the local storage approach offered by the plugin and
  not the cookie approach because this information is irrelevant to the
  server so it doesn't make much sense to send it to the server along
  with every request (like cookies).

(ActionItem3238)

2014-08-04 02:41:30 -0300

bc210052 social-share: places the social buttons below the content ... Browse Dir »
```
(ActionItem3238)
```
Larissa Reis
2014-08-04 02:41:12 -0300

01 Aug, 2014

2 commits

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

Antonio Terceiro
2014-08-01 10:01:36 -0300
09d73e72 [social-share] removes unused file after update Browse Dir »

Larissa Reis
2014-08-01 01:30:01 -0300

31 Jul, 2014

4 commits

e9371699 Remove mezuro plugin by request of its authors ... Browse Dir »
```
Mezuro is now a standalone application.
```
Antonio Terceiro
2014-07-31 13:58:03 -0300
6ee23a50 work_assignment plugin: fix tests ... Browse Dir »
```
the assumption on authorship changed from last_changed_by to created_by
```
Antonio Terceiro
2014-07-31 13:56:06 -0300
b83abf7e social-share: removes old files locations Browse Dir »

Larissa Reis
2014-07-31 06:18:58 -0300
d070f74a social-share: updates upstream os it\'s the same as merge request Browse Dir »

Larissa Reis
2014-07-31 06:08:41 -0300

30 Jul, 2014

2 commits

932e054f Add support for base plugins ... Browse Dir »

Base plugins are enanbed by default and cannot be disabled at the system
level, but can be disabled per-environment at the web UI.

A part of the required changes also fix the Noosfero plugin
infrastructure, in special migrations, on Rails 3.

2014-07-30 17:50:49 -0300

47b59b20 comment_group: small fix in macro js Browse Dir »

Victor Costa
2014-07-30 11:30:34 -0300

29 Jul, 2014

1 commit

e44cab7f social-share-privacy: updates css Browse Dir »

Larissa Reis
2014-07-29 12:36:01 -0300

28 Jul, 2014

4 commits

5ceef49f Merge remote-tracking branch 'larissa/networks-interaction' into stoa Browse Dir »

Rodrigo Souto
2014-07-28 11:21:37 -0300
9b45a717 plugin social share privacy Browse Dir »

Larissa Reis
2014-07-28 11:28:07 -0300
7332d0d4 Merge remote-tracking branch 'dani/ActionItem3234' into stoa-merge ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/models/profile.rb
	app/views/friends/index.html.erb
	test/unit/profile_test.rb
```
Rodrigo Souto
2014-07-28 11:09:25 -0300

0409f85d Merge branch 'invite-user-to-community' of https://gitlab.com/larissa/noosfero into invite-user ... Browse Dir »

Conflicts:
	app/views/friends/index.rhtml
	app/views/invite/_select_address_book.rhtml
	app/views/invite/select_friends.rhtml
	app/views/profile/friends.rhtml
	config/routes.rb
	plugins/stoa/lib/ext/person.rb
	test/functional/invite_controller_test.rb
	test/unit/invite_member_test.rb

2014-07-28 10:53:39 -0300