22 Jan, 2015

1 commit

  • 5e1957f3   Merge branch 'work_assignment_master_rebase' into 'master' ... Browse File » 
    Work assignment master rebase

The last version of the Work Assignment plugin, increased by Universidade de Brasília team.

The plugin purpose is to keep versioned files, result of a work and to notify people by email about new uploaded files. Users can also change the visibility of their files, if the feature is set on Work Assignment settings.

See merge request !420
    Antonio Terceiro
     

21 Jan, 2015

8 commits

  • c9b33c17   Refactoring Work Assignment Plugin ... Browse File » 
    - Changed methods and variable names.
- Created work_assignment_plugin_myprofile_controller and undone the cms_controller extension
- Fixed the tests to fit the new structure

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Tallys Martins
     
  • cbed32d2   Refactoring Work Assignment Plugin ... Browse File » 
    - Changed article_extra_fields hotspot name to upload_files_extra_fields
- Fixed some code spacing.
- Fixed uploaded file filter on plugin class
- Fixed after_validation filter on UploadedFile plugin extension class

Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail>
    Tallys Martins
     
  • ae016525   Writting and fixing Work Assignment Plugin tests ... Browse File » 
    - Written tests of work_assignment cms controller.
- Fixed failures on unit tests
- Removed empy lines, spaces and useless code.
- Fixing bugs on edit_visibility filters

Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail>
    Dylan Guedes
     
  • 7aab108a   Refactoring work assignment plugin ... Browse File » 
    Changed privacy edition box to open on a new page.
Fixed cancel buttom to redirect to back page.

    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
    Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
    Tallys Martins
     
  • dfed6005   WorkAssignment privacy edition now works for all users ... Browse File » 
    Refactored Cms Controller inheritance on Work Assignment Plugin.
Added a new method on Cms controller that is extended on Work Assignment Plugin and can allow a plugin action to by pass
the static before filter generated on Cms that denies any other actions outside it's list.
Added a before filter on plugin cms controller  that allows the visibility edition only for the article author and admins.

Signed-off-by Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Arhur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
    Tallys Martins
     
  • 1db348b8   WorkAssignment submissions visibility edition is now working for admins user ... Browse File » 
    - Refactored the name of the action to edit_visibility
- Refactored edit_visibility behavior to apply privacy to also the Folder's children
- Fixed bug on plugin content_viewer filter not passing the right path of article

Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     
  • e6c0328a   Refactoring Work Assignment ... Browse File » 
    Added filters to cms controller to send email
Removed unecessary dispatch on cms controller

Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Tallys Martins
     
  • 27831399   Fixing bugs on Work Assignment plugin ... Browse File » 
    - Removed useless view.
- Fixed problem on page render when file error(e.g. over max size) is detected.
- Fixed bug when no file selected.
- Refactored dispatch on upload_files.html.erb  to have less impact on core.
- Added java script to modify the form action to use the plugin controller on upload_files form.
- Fixed Work Assignment not sending e-mails
- Removing duplicated code
- Added new dispatch on cms_controller

Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Tallys Martins
     

12 Jan, 2015

1 commit

09 Sep, 2014

1 commit

26 Aug, 2014

1 commit

25 Aug, 2014

1 commit

08 Aug, 2014

1 commit

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse File » 
    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
    Antonio Terceiro
     

31 Jul, 2014

1 commit

28 Jul, 2014

1 commit

24 Jul, 2014

1 commit

22 Jul, 2014

1 commit

  • 4bbfef7e   article: author refactoring ... Browse File » 
    I'm adding the author as a record relation instead of calculating it
based on the last_changed_by. This change has a reasonable performance
improvement on pages that access this information, like blog page.

Still saving author_name in order to deal with the problem of the author
being removed.

Including new method to facilitate specific article version retrieval.

ActionItem3201
    Rodrigo Souto
     

16 Jul, 2014

1 commit

15 Jun, 2014

1 commit

13 May, 2014

1 commit

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
     

18 Mar, 2014

2 commits

13 Mar, 2014

1 commit

10 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
     

04 Feb, 2014

1 commit

30 Jan, 2014

1 commit

  • de0aceaa   rails3: fix assert_kind_of Array ... Browse File » 
    On rails 3.2, the return type of some queries changes from Array to ActiveRecord::Relation.
An assertion that check if these attributes has been assigned (with a value != nil) should be enought.
This avoids future problems with api changes.
    Victor Costa
     

28 Jan, 2014

1 commit

22 Jan, 2014

1 commit

18 Jan, 2014

1 commit

16 Jan, 2014

1 commit

15 Jan, 2014

4 commits