Charles Oliveira / noosfero

15 Aug, 2014

2 commits

cec25930 Merge branch 'rails3' into rails3_stable ... Browse Dir »
```
Conflicts:
	db/schema.rb
	public/javascripts/application.js
```
Victor Costa
2014-08-15 12:10:31 -0300
35bf1408 Upgrade strophe.js to 1.1.3 Browse Dir »

Victor Costa
2014-08-15 09:32:54 -0300

13 Aug, 2014

2 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

08 Aug, 2014

6 commits

4240874a Merge branch 'AI2915-category_color' into rails3_stable ... Browse Dir »

Conflicts:
	plugins/community_track/lib/community_track_plugin/track_helper.rb
	plugins/community_track/test/unit/community_track_plugin/track_helper_test.rb

2014-08-08 16:59:12 -0300

70dcb5e9 community_track: add color to track name Browse Dir »

Victor Costa
2014-08-08 16:58:15 -0300
c8ce3566 community_track: added background color to track card Browse Dir »

Victor Costa
2014-08-08 16:57:45 -0300
3b18ff42 Merge branch 'AI2915-category_color' into rails3_stable ... Browse Dir »
```
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/categories_helper.rb
	db/migrate/20140807134625_change_category_display_color_to_string.rb
```
Victor Costa
2014-08-08 15:02:45 -0300
09811012 Added background color to track card Browse Dir »

Victor Costa
2014-08-08 14:59:39 -0300
08c7da41 Merge branch 'AI3269_link-article' into rails3_stable Browse Dir »

Victor Costa
2014-08-08 10:44:20 -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

6 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
e57b9392 Merge branches 'rails3_AI3033-serpro_integration' and 'rails3_stable' into rails3_stable Browse Dir »

Leandro Santos
2014-08-06 11:12:01 -0300
43924df5 fixing conflit Browse Dir »

Leandro Santos
2014-08-06 11:10:32 -0300
3275c783 add hook for gitlab projects Browse Dir »

Leandro Santos
2014-08-06 11:03:07 -0300

01 Aug, 2014

2 commits

cab02175 serpro_integration: fix jenkins integration Browse Dir »

Victor Costa
2014-08-01 15:14:27 -0300
944c01f8 Merge remote-tracking branch 'origin/rails3' Browse Dir »

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

31 Jul, 2014

2 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

30 Jul, 2014

3 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

dfdbb0ea Merge branch 'rails3' into rails3_stable Browse Dir »

Victor Costa
2014-07-30 13:23:11 -0300
47b59b20 comment_group: small fix in macro js Browse Dir »

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