19 Jul, 2012

1 commit

  • Conflicts:
    	app/models/article.rb
    	app/models/profile.rb
    	app/models/uploaded_file.rb
    	public/javascripts/application.js
    	public/stylesheets/application.css
    	test/unit/article_test.rb
    	test/unit/category_finder_test.rb
    	test/unit/enterprise_test.rb
    Daniela Feitosa
     

18 Jul, 2012

1 commit


21 May, 2012

1 commit


04 Apr, 2012

1 commit


03 Apr, 2012

1 commit


13 Mar, 2012

1 commit


24 Feb, 2012

1 commit


19 Feb, 2012

2 commits

  • Conflicts:
    	app/controllers/application.rb
    	app/controllers/public/browse_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/display_helper.rb
    	app/models/environment_finder.rb
    	app/models/product.rb
    	app/views/layouts/_javascript.rhtml
    	app/views/layouts/application-ng.rhtml
    	public/javascripts/application.js
    	public/stylesheets/application.css
    	test/functional/browse_controller_test.rb
    	test/functional/search_controller_test.rb
    	vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
    Rafael Martins
     
  • Conflicts:
    	INSTALL
    	app/models/environment_finder.rb
    	config/environments/cucumber.rb
    	debian/control
    	features/step_definitions/noosfero_steps.rb
    	test/unit/forum_helper_test.rb
    Rafael Martins
     

27 Jan, 2012

1 commit


30 Dec, 2011

1 commit

  •    * new table production_costs
         * environment and enterprises can have them
       * new table price_details
         * products have price details with a cost and a price
       * updated db/schema
       * included method to display the total value of inputs
       * included partials to display and edit price details
       * allowing users to create new cost from select
       * manage_products.js to separate js codes from application.js
       * numbers_only_javascript
         * created a partial with the js needed to allow only numbers on some fields
      * price composition bar is updated when an user edit some price
    
    (ActionItem1413)
    Daniela Feitosa
     

24 Dec, 2011

3 commits


22 Dec, 2011

1 commit


10 Oct, 2011

1 commit

  • * Refactoring profile management to use tokeninput
      * Also, adding support of tokeninput to the core
    * Adding attributes validated and cnpj to enterprise
    * Environment option to define enterprise as validated by defaul
    * Making profile namedscopes consider subclasses too
    * Adapting enterprise icon and identification to meet Bsc expectations
    * Adapting profile info actions to meet Bsc expectations
    * Adapting control panel buttons to meet Bsc expectations
    * Adapting core product to meed Bsc expectations
    * Adding and fixing plugin hotspots
    
    (ActionItem2085, ActionItem2087, ActionItem2086, ActionItem2088)
    Rodrigo Souto
     

16 Aug, 2011

1 commit


18 May, 2011

1 commit

  • Change acts_as_searcheable to always index schema_path. If multitenancy
    if off or the database isn't PostgreSQL, then schema_path method returns
    an empty string and is not used at find_by_contents.
    
    Change find_by_contents adding options separating options from paginate,
    solr and rails's find. With Solr search capabilities, combined search
    (solr + rails find) won't be necessary in the future.
    Also change find_by_contents to return a hash where there are the
    facets found and also the results.
    
    Related tests pass with this change
    Braulio Bhavamitra
     

12 May, 2011

1 commit


11 May, 2011

2 commits


27 Apr, 2011

1 commit

  •    * new table production_costs
         * environment and enterprises can have them
       * new table price_details
         * products have price details with a cost and a price
       * updated db/schema
       * included method to display the total value of inputs
       * included partials to display and edit price details
       * allowing users to create new cost from select
       * manage_products.js to separate js codes from application.js
       * numbers_only_javascript
         * created a partial with the js needed to allow only numbers on some fields
    
    (ActionItem1413)
    Daniela Feitosa
     

26 Oct, 2010

1 commit


15 Aug, 2010

1 commit


06 Aug, 2010

1 commit


09 Jul, 2010

1 commit


01 Jul, 2010

1 commit

  •  * Fixed fields that weren't in the custom fields options.
     * Included "Display on creation|registration" feature for
       organization fields.
     * Included fields dependencies:
         [field]   -> [dependencies]
         required  -> active, signup
         signup    -> active
     * Javascripts to grant the dependencies on the radioboxes.
     * Changing the validation of fields presence message.
     * Also removing some unwanted endline spaces.
    
    (ActionItem1509)
    Rodrigo Souto
     

16 Apr, 2010

1 commit

  • * The registration has two validation type: region and admin.
    		+ Admin
    			- There is no validator to choose.
    			- The regions to choose are states (This might be changed
    			  in the future).
    			- The admins of the environment recieves the task to approve
    			  the registration of this new enterprise.
    			- The region field isn't displayed.
    		+ Region
    			- If there isn't any validator, shows a message that it's
    			  not possible to register any enterprise and don't show the
    			  form.
    			- Show only the regions where is registered at least one
    			  validator.
    			- The region field is displayed.
       	* The required fields are highlithed.
    	* The fields that are active or required are set through the
    	  administration panel.
    	* Only the fields name and identifier are always required.
       	* After registering a new enterprise, the user is set as an admin of
       	  it.
       	* The cancel button in the register form is working properly.
       	* In the "Validator" step, the radio button is choosing a default
       	  option.
       	* Cancel radio_button in the task validation has a "Rejection
       	  Explanation" field that is required.
       	* Some navigation buttons added.
       	* Changed some buttons to labelled buttons.
    	* The "Register a new enterprise" button is an admin option.
    
    (ActionItem1482)
    Rodrigo Souto
     

15 Mar, 2010

1 commit


06 Nov, 2009

1 commit


05 Aug, 2009

1 commit


20 Jun, 2009

1 commit


06 Jun, 2009

2 commits


27 May, 2009

1 commit


23 Jan, 2009

1 commit


06 Jan, 2009

1 commit


15 Dec, 2008

1 commit

  •   * making fields appear on signup form
      * environment has a list of Category subclasses that must be available for users; if there is only one category type available, no need of asking for category type
      * environment has a setting categories_menu which enables/disables the category menu. If it is disabled, then no need to ask for a color in the menu
      * add a configuration to the environment called disable_gender_icon. When it is false, don't display gender icons.
    
      * adding css for profile_data
      * adding required on label for schooling fixing javascript
      * adding fields on signup and option to admin manage
      * adding required message on required fields
      * adding partials for person/enterprise/community fields
      * adding methods for person/community/enterprise custom_fields
      * adding option to admin manage person fields
    Daniela Feitosa
     

03 Dec, 2008

1 commit

  •    * adding setting on template to define if entreprise template should be changed when enabled
       * adding changing of template when an enterprise is enabled if environment allows
       * fixing bug on footer when applying template
       * removing disabled enterprise message if the enterprise has the block for it
    Daniela Feitosa
     

29 Nov, 2008

1 commit