NoosferoGov / noosfero

11 Sep, 2014

1 commit

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

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

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

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

12 Aug, 2014

2 commits

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

3 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

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

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

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

25 Jul, 2014

2 commits

d5905fc4 Merge branch 'master' into rails3 Browse Dir »

Victor Costa
2014-07-25 18:43:06 -0300
b3c54259 relevant_content: fix mass assignment on edition Browse Dir »

Victor Costa
2014-07-25 10:55:17 -0300

24 Jul, 2014

2 commits

3f79e19c Update work_assignment to new author scheme Browse Dir »

Rodrigo Souto
2014-07-24 14:18:24 +0000
391b7c0f AI3204: Fixing People block plugin bug Browse Dir »

Arthur Esposte
2014-07-24 13:27:28 +0000

21 Jul, 2014

1 commit

b55ea6ae display_content: fix performance issue Browse Dir »

Victor Costa
2014-07-21 14:59:27 -0300

18 Jul, 2014

1 commit

6e116602 rails3: fix display_content plugin Browse Dir »

Victor Costa
2014-07-18 16:27:25 -0300

09 Jul, 2014

1 commit

c54beec9 Merge branch 'ai3168' into 'stable' ... Browse Dir »
```
Improve validation of submissions/answers

http://noosfero.org/Development/ActionItem3168
```
Rodrigo Souto
2014-07-09 14:46:55 +0000

30 Jun, 2014

1 commit

fb090c19 Merge branch 'master' into rails3 Browse Dir »

Victor Costa
2014-06-30 11:51:13 -0300

27 Jun, 2014

2 commits

56a0d4fa rails3: fix people_block translation Browse Dir »

Victor Costa
2014-06-27 15:15:15 -0300
0f4a925e rails3: fix people_block plugin Browse Dir »

Victor Costa
2014-06-27 10:15:17 -0300

26 Jun, 2014

4 commits

f052db05 display_content: include profile when list items Browse Dir »

Victor Costa
2014-06-26 16:45:43 -0300
131e0932 rails3: fix encoding Browse Dir »

Victor Costa
2014-06-26 15:27:04 -0300
879fcd99 stoa-plugin: use file relative path on install Browse Dir »

Rodrigo Souto
2014-06-26 13:06:39 -0300
46ea1799 Merge remote-tracking branch 'larissa/stoa-plugin-rails3' into larissa-stoa-plugin-rails3 Browse Dir »

Rodrigo Souto
2014-06-26 12:53:27 -0300

20 Jun, 2014

2 commits

3133df27 Destroying forms when its profile is destroyed ... Browse Dir »
```
Also added migration to remove existent forms without profile

Signed-off-by: Ana Losnak <analosnak@gmail.com>

(ActionItem3144)
```
Daniela Feitosa
2014-06-20 03:00:43 +0000
4c91f481 Fixed migration: avoid validation on form update ... Browse Dir »
```
(ActionItem3172)
```
Daniela Feitosa
2014-06-20 02:38:52 +0000

17 Jun, 2014

2 commits

21153d13 rails3: fix change image from profile Browse Dir »

Victor Costa
2014-06-17 12:22:11 -0300
f644224e Merge branch 'master' into rails3 ... Browse Dir »
```
Conflicts:
	plugins/display_content/test/unit/display_content_block_test.rb
```
Victor Costa
2014-06-17 10:31:51 -0300

16 Jun, 2014

4 commits

f201ef8a Merge branch 'master' into AI3120-display_content_fix Browse Dir »

Joenio Costa
2014-06-16 16:44:37 -0300
3b5767b1 simplifying regex pattern ... Browse Dir »
```
'\w-' is the same of 'a-zA-Z0-9_-'

(ActionItem3122)
```
Joenio Costa
2014-06-16 16:37:26 -0300
a0776e2f Merge branch 'master' into AI3122-video_y2b_id Browse Dir »

Joenio Costa
2014-06-16 16:27:15 -0300
5450e1d8 Fix double submission load (remove ||=) ... Browse Dir »
```
This makes possible to move controllers' code to the model, where it
should be in first place

(ActionItem3168)
```
Braulio Bhavamitra
2014-06-16 14:01:11 -0300

14 Jun, 2014

1 commit

2d804325 fix default title of frieds block ... Browse Dir »
```
(ActionItem2859)
```
Joenio Costa
2014-06-14 23:26:54 -0300