22 Feb, 2016

1 commit

31 Jul, 2015

1 commit

07 May, 2015

1 commit

08 Apr, 2015

1 commit

23 Mar, 2015

1 commit

10 Feb, 2015

1 commit

26 Jan, 2015

1 commit

21 Jan, 2015

1 commit

  • 5d28b4b3   Add ability to mark blocks as fixed ... Browse File » 
    Fixed blocks can't be modified by regular users, but only by
administrators. The main use case is defining a few blocks in the user
or community templates, so that users and communities can't remove or
change them.

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
    Fabio Teixeira
     

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
    Victor Costa
     

29 Mar, 2014

1 commit

28 Mar, 2014

1 commit

12 Mar, 2014

1 commit

07 Mar, 2014

2 commits

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
    Rodrigo Souto
     

23 Jan, 2014

1 commit

22 Jan, 2014

1 commit

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
    Rodrigo Souto
     

13 Dec, 2013

1 commit

10 Dec, 2013

1 commit

17 Sep, 2013

1 commit

25 Sep, 2012

1 commit

22 Feb, 2011

1 commit

02 Dec, 2010

1 commit

  • f92f835b   Added language for blocks ... Browse File » 
    Blocks will be displayed according to the browser locale:
  * "all": displayed in all languages
  * some language: displayed only in the selected language

(ActionItem1774)

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
    Daniela Feitosa
     

06 Aug, 2010

1 commit

17 Jul, 2010

1 commit

05 Feb, 2010

1 commit

  • d9eb3631   Adding new features to SlideshowBlock, and blocks in general ... Browse File » 
      * added option to shuffle images
  * added navigation buttons
  * other changes:
    * Removed "toggle visibility" button and action in BoxOrganizer
      Controller
    * Bock#visible? now receives an optional context so that blocks can
      decide where they must be shown or not
    * BoxesHelper now passes the context into the Block#visible? method
    * Added title to Uploaded files and displaying it instead of the
      description when viewing files

(ActionItem1358)
    Antonio Terceiro
     

02 Dec, 2009

1 commit

  • c6761125   More improvements to agenda ... Browse File » 
     - Button to create new event
 - Displaying header and footer even without side boxes
 - Display links to events in bold
 - Fixing previous and next month boxes on IE
 - Display environment name in header of global agenda

(ActionItem1255)
    Joenio Costa
     

31 Oct, 2009

1 commit

  • e243950f   Making tests run faster ... Browse File » 
      * Moved all object creation helper methods into Noosfero::Factory
  * Added a new and faster version of create_user.
  * Adjusted some test cases tests to use the new factory methods
    This comprised removing a lot of bad smells from the tests, involving
    eliminating uneeded database hits.
  * reviewed ProfileTest for speed as a case study. The test suite used to
    take ~ 40 seconds to run, now it takes ~ 14 seconds. If we do this to
    all test suites, we can dramatically reduce the time we need to run
    all the tests
  * Added a rake task test:smells to list potential test smells. Started
    with probably unecessary and/or too slow database hits
  * In the end, running all the tests now takes ~ 13 minutes on Colivre's
    development machine, instead of the ~ 30 minutes it used to.

(ActionItem1279)
    Antonio Terceiro
     

17 Feb, 2009

1 commit

22 Dec, 2008

1 commit

30 Jul, 2008

1 commit