Software Publico / Noosfero

13 May, 2014

1 commit

a39c63db Replace instance_eval by instance_exec to avoid api break ... Browse File »
```
http://makandracards.com/makandra/14725-instance_eval-behaves-different-in-ruby-1-8-and-ruby-1-9-use-instance_exec-instead
```
Rodrigo Souto
2014-05-13 20:38:15 +0000

06 May, 2014

1 commit

1182476c Merge branch 'rails235' into rails3 ... Browse File »

* rails235: (168 commits)
  L10n: support for custom locales
  enhancements: visualization of suggested usernames
  Allowing translation for url checking string
  Removed unnecessary lines on test
  Removed unit tests from functionals file
  Fixed html and test syntax
  Removed needless condition
  Fixed suggestions of usernames
  Test files should ends with "_test.rb"
  Added pagination on events_by_day on profile agenda
  Fix missing variable in funcional test
  Fix unit tests
  Change routes from embed controller
  Remove unused code
  Autocomplete fields on page load
  Blocks can returns a block of code to be evaluated
  Avoid randomness on tests
  comment-group-plugin: avoid randomness on tests
  community-track-plugin: fix tests by creating a profile with default boxes
  anti-spam-plugin-wrapper: ensure to load concrete wrappers
  ...

Conflicts:
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/contact.rb
	app/models/event.rb
	app/models/mailing.rb
	app/models/organization.rb
	app/models/organization_mailing.rb
	app/models/pending_task_notifier.rb
	app/models/person.rb
	app/models/profile.rb
	app/models/scrap.rb
	app/models/task_mailer.rb
	app/models/user.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/profile_image.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/box_organizer/_link_list_block.rhtml
	app/views/box_organizer/edit.rhtml
	app/views/features/_manage_community_fields.rhtml
	app/views/features/_manage_enterprise_fields.rhtml
	app/views/features/_manage_person_fields.rhtml
	app/views/features/index.rhtml
	app/views/layouts/application-ng.rhtml
	app/views/users/_users_list.rhtml
	db/schema.rb
	features/forum.feature
	lib/feed_handler.rb
	lib/noosfero/plugin.rb
	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	plugins/spaminator/lib/spaminator_plugin/mailer.rb
	test/functional/content_viewer_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/profile_design_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/contact_sender_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/environment_mailing_test.rb
	test/unit/mailing_test.rb
	test/unit/organization_mailing_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
	test/unit/uploaded_file_test.rb
	vendor/plugins/action_tracker/lib/action_tracker_model.rb

2014-05-06 18:00:26 -0300

07 Apr, 2014

1 commit

9780bfac Blocks can returns a block of code to be evaluated ... Browse File »
```
(ActionItem3031)
```
Joenio Costa
2014-04-07 17:30:33 -0300

31 Mar, 2014

3 commits

367d38e3 Do not allow edition in textarea with the EMBED code ... Browse File »
```
(ActionItem3031)
```
Joenio Costa
2014-03-31 23:15:10 -0300
74944844 Mark string for translation ... Browse File »
```
(ActionItem3031)
```
Joenio Costa
2014-03-31 23:09:16 -0300
37b0a694 Merge branch 'rails235' into AI3031-community_track_embed_block ... Browse File »
```
Conflicts:
	test/unit/block_test.rb
```
Joenio Costa
2014-03-31 18:36:45 -0300

28 Mar, 2014

1 commit

1cad9339 Revert "Added a filter to display blocks depending on user" ... Browse File »

This reverts commit 22d3d9d34034136b344cd6b58270a6b49bf61dbd.

Conflicts:
	public/stylesheets/application.css
	test/functional/environment_design_controller_test.rb

2014-03-28 14:36:59 -0300

26 Mar, 2014

1 commit

75e83af7 Merge branch 'rails235' into AI3037-block_filter_user ... Browse File »
```
Conflicts:
	public/stylesheets/application.css
	test/functional/environment_design_controller_test.rb
	test/unit/block_test.rb
```
Joenio Costa
2014-03-26 11:01:19 -0300

17 Mar, 2014

1 commit

88b02d90 Fix cloning blocks at environment_design ... Browse File »
```
(ActionItem3046)
```
Victor Costa
2014-03-17 13:53:01 -0300

12 Mar, 2014

3 commits

4e9672e7 fix typo method name Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-03-12 15:35:57 -0300
22d3d9d3 Added a filter to display blocks depending on user Browse File »

Victor Costa
2014-03-12 15:00:58 -0300
bce11413 Added a way to display blocks only to logged/not logged users Browse File »

Victor Costa
2014-03-12 12:47:24 -0300

07 Mar, 2014

5 commits

1da8268c improvements on embed block Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-03-07 16:25:56 -0300
019bbf17 add infra to embed track block Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-03-07 16:24:40 -0300
705a8ec6 add infra to embed feature Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-03-07 16:22:33 -0300
423aba17 Merge branch 'master' into rails3 ... Browse File »
```
Conflicts:
	config/initializers/dependencies.rb
	debian/control
	lib/noosfero/core_ext.rb
	lib/noosfero/plugin/routes.rb
```
Daniela Feitosa
2014-03-07 14:35:37 +0000

d0561132 Merge branch 'stable' ... Browse File »

Conflicts:
	app/controllers/my_profile/profile_themes_controller.rb
	test/unit/comment_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2014-03-07 13:17:54 +0000

05 Mar, 2014

1 commit

ffbf0914 Merge branch 'AI2943_container_block_fixes' into 'stable' ... Browse File »
```
Ai2943 Container Block Fixes

Fix broken edition for container block with the new css for sideboxes view.
```
Daniela Feitosa
2014-03-05 17:53:53 +0000

11 Feb, 2014

1 commit

e9fea38f Merge branch 'master' into rails3-merge ... Browse File »

Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb

2014-02-11 17:35:19 -0300

30 Jan, 2014

1 commit

19945d2e rails3: fix some functional tests ... Browse File »
```
Output fields_for tags
```
Victor Costa
2014-01-30 11:30:12 -0300

23 Jan, 2014

1 commit

cf94bc1e container_block: do not show its boxes at add_block view Browse File »

Victor Costa
2014-01-23 13:56:21 -0300

22 Jan, 2014

1 commit

43535f4f boxes-helper: add params to context passed to the block Browse File »

Rodrigo Souto
2014-01-22 20:04:18 +0000

21 Jan, 2014

1 commit

e80da508 Merge commit 'refs/merge-requests/339' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/339

Conflicts:
	app/models/block.rb
	public/designs/icons/tango/style.css
	test/unit/block_test.rb
```
Rodrigo Souto
2014-01-21 16:45:31 -0300

13 Jan, 2014

1 commit

e1e9b53a boxes-helper: fix wrong variable name Browse File »

Rodrigo Souto
2014-01-13 21:36:46 +0000

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse File »

Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb

2014-01-09 15:17:55 +0000

13 Dec, 2013

1 commit

d9620af2 string-ext: convert class name to valid css class Browse File »

Rodrigo Souto
2013-12-13 20:21:38 -0300

10 Dec, 2013

1 commit

5683f417 boxes-helper: convert slash to underscore on namespaced blocks class Browse File »

Rodrigo Souto
2013-12-10 17:26:31 -0300

20 Nov, 2013

1 commit

9b3332e5 Merge branches 'ActionItem2738' and 'ActionItem2738_merge' into ActionItem2738_merge Browse File »

Leandro Nunes dos Santos
2013-11-20 15:44:19 -0300

04 Nov, 2013

1 commit

9f1c4507 Render the container block box at container view ... Browse File »

Render container block box and do not override children boxes
makes drag and drop functional.

Also fix article block to not use direct box attribute
and use owner method instead.

2013-11-04 17:08:41 -0300

31 Oct, 2013

1 commit

419bcf2a filter_html: parse only sources that have macros ... Browse File »

This solves every problem related with Hpticot breaking pages since the
parse was happening on the MainBlock too. But this does not changes the
fact tha Hpricot is currently dead and we should move on to nokogiri.

(ActionItem2873)

2013-10-31 17:40:53 -0300

07 Oct, 2013

2 commits

2a82af5f Reverting c0f97fc83 since it breaks the admin features panel Browse File »

Rodrigo Souto
2013-10-07 15:49:55 -0300
c0f97fc8 send_email: fix features tests Browse File »

Rodrigo Souto
2013-10-07 10:13:30 -0300

19 Jul, 2013

2 commits

18a8487d rails3: fix deprecated reference to @controller Browse File »

Antonio Terceiro
2013-07-19 15:51:33 -0300

b05904aa Merge branch 'master' into rails3 ... Browse File »

Conflicts:
	app/helpers/boxes_helper.rb
	app/models/comment.rb
	app/views/comment/_comment.rhtml
	app/views/comment/_comment_form.rhtml
	app/views/content_viewer/_comment.html.erb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/_comment_form.html.erb
	app/views/content_viewer/_comment_form.rhtml
	app/views/profile/send_mail.html.erb
	config/routes.rb
	debian/control

2013-07-19 15:36:31 -0300