23 Nov, 2015

2 commits

  • Custom fields can be added to any profile through the admin panel
    in the 'Fields' section. They have the same behaviour as the current
    Noosfero's fields (active, signup, required and privacy).
    
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     
  • Leandro Santos
     

17 Nov, 2015

1 commit

  • Conflicts:
    	Gemfile
    	Rakefile
    	app/controllers/box_organizer_controller.rb
    	app/controllers/my_profile/tasks_controller.rb
    	app/controllers/public/profile_controller.rb
    	app/mailers/user_mailer.rb
    	app/models/article.rb
    	app/models/person.rb
    	app/models/product_category.rb
    	app/models/task.rb
    	config/application.rb
    	config/routes.rb
    	lib/acts_as_having_settings.rb
    	lib/noosfero/api/entities.rb
    	lib/noosfero/api/helpers.rb
    	lib/noosfero/api/session.rb
    	lib/noosfero/api/v1/articles.rb
    	lib/noosfero/api/v1/contacts.rb
    	lib/noosfero/api/v1/search.rb
    	lib/noosfero/api/v1/users.rb
    	test/functional/tasks_controller_test.rb
    	test/unit/api/articles_test.rb
    	test/unit/api/helpers_test.rb
    	test/unit/api/people_test.rb
    	test/unit/api/search_test.rb
    	test/unit/api/session_test.rb
    	test/unit/api/users_test.rb
    	test/unit/person_notifier_test.rb
    	test/unit/task_test.rb
    	vendor/plugins/access_control/lib/acts_as_accessible.rb
    Victor Costa
     

23 Sep, 2015

1 commit


22 Sep, 2015

1 commit


13 Sep, 2015

1 commit


11 Sep, 2015

1 commit


08 Sep, 2015

2 commits


04 Sep, 2015

1 commit


13 Aug, 2015

3 commits


11 Aug, 2015

2 commits


10 Aug, 2015

3 commits


06 Aug, 2015

1 commit


28 Jul, 2015

1 commit


25 Jul, 2015

1 commit


24 Jul, 2015

11 commits


23 Jul, 2015

1 commit


21 Jul, 2015

1 commit


16 Jul, 2015

1 commit


10 Jul, 2015

1 commit


09 Jun, 2015

1 commit


02 Jun, 2015

1 commit


28 May, 2015

1 commit

  •   As of Rails 3, include_root_in_json is true by default, which causes
      the json generated for rails models to be in the format:
    
        `{ profile => { name => 'ze', ... } }`
    
      instead of:
    
        `{ name => 'ze', ... }`
    
      This was breaking some javascript for the sniffer plugin and possibly
      other places.
    
      This initializer is part of the template for rails 3 applications and
      set include_root_in_json to false. The default configuration for rails
      3 applications also enables parameters wrapping for json, however I
      disabled this feature by setting wrap parameter format to an empty
      array, as suggested by the documentation, since we are not using this
      on noosfero.
    Larissa Reis
     

20 May, 2015

1 commit