18 Dec, 2015

1 commit

11 Dec, 2015

1 commit

30 Nov, 2015

1 commit

23 Nov, 2015

1 commit

  • 95fdfbab   Add custom field feature to core ... Browse Dir » 
    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
     

17 Nov, 2015

1 commit

  • 92fbfd94   Merge branch 'master_rails4' into staging ... Browse Dir » 
    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
     

12 Nov, 2015

1 commit

03 Nov, 2015

3 commits

28 Oct, 2015

1 commit

13 Oct, 2015

1 commit

  • 66c7b785   Block store: improve usability of adding/moving blocks ... Browse Dir » 
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>

Conflicts:
	app/controllers/my_profile/profile_design_controller.rb
	app/helpers/boxes_helper.rb
	app/helpers/layout_helper.rb
	app/views/layouts/_javascript.html.erb
	public/stylesheets/application.css
	test/functional/environment_design_controller_test.rb
	test/functional/profile_design_controller_test.rb
    Victor Costa
     

02 Oct, 2015

1 commit

30 Sep, 2015

1 commit

24 Sep, 2015

1 commit

  • ef41c154   Allow user to remove article or profile image ... Browse Dir »
    2 
    Additional improvements include:

- Makes 'Remove Image' checkbox optional
- Very ugly css hack to hide duplicated labels in some forms. I couldn't
find another way to avoid the labels generated by labelled_form_for nor
could I skip adding labels inside the helper since it's supposed to be
generic.
    Larissa Reis
     

22 Sep, 2015

1 commit

15 Sep, 2015

1 commit

14 Sep, 2015

1 commit

  • 3d111ca7   Add option to block appearence edit ... Browse Dir » 
    - Add before_filter for check permission for open edit header and footer page
- Change environment feature name of disable_appearance to enable_appearance
- Update cucumber test change_appearance.feature

Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Omar Junior <omarroinuj@gmail.com>
Signed-off-by: vitorbaraujo <vitornga15@gmail.com>
Signed-off-by: Victor Matias Navarro <victor.matias.navarro@gmail.com>
    Luciano Prestes
     

13 Sep, 2015

2 commits

11 Sep, 2015

2 commits

04 Sep, 2015

2 commits

02 Sep, 2015

1 commit

  • 04576c7e   Fix clone article behavior ... Browse Dir » 
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Omar Júnior <omarroinuj@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Vítor Barbosa <vitornga15@gmail.com>
    Vitor Barbosa de Araujo
     

13 Aug, 2015

2 commits

12 Aug, 2015

1 commit

10 Aug, 2015

2 commits

06 Aug, 2015

2 commits

27 Jul, 2015

1 commit

25 Jul, 2015

1 commit

24 Jul, 2015

3 commits

22 Jul, 2015

1 commit

17 Jul, 2015

3 commits