18 Jan, 2016

1 commit

  • 062c5cea   Merge branch 'staging' into captcha_serpro_plugin ... Browse File » 
    * staging: (359 commits)
  Makes travis run all the tests via ./script/ci
  api: paginate members endpoint
  adds - TASK=rake test:all:db
  Added specific things for noosferogov
  api: return profile members
  Wont stop travis if Gemfile.lock does not exist
  api: expose profile type
  api: expose entities related to activity
  api: add activities endpoint
  api: fix login from cookie
  api: add endpoint for profiles
  api: create boxes enpoint
  api: login from noosfero cookie
  api: expose article type
  fix script production in app restart
  api: search profile by identifier
  api: expose boxes and blocks for profiles
  - rm Gemfile.lock
  Removing Gemfile.lock
  Setting will paginate to the version at debian stable
  ...

Conflicts:
	.gitmodules
	app/models/environment.rb
	lib/noosfero/api/v1/articles.rb
	test/unit/api/helpers_test.rb
	test/unit/api/test_helper.rb
    Evandro Junior
     

16 Dec, 2015

3 commits

10 Dec, 2015

2 commits

07 Dec, 2015

1 commit

04 Dec, 2015

1 commit

  • 93529247   Merge branch 'captcha_serpro_plugin' of softwarepublico.gov.br:noosferogov/noosf… ... Browse File » 
    …ero into captcha_serpro_plugin

* 'captcha_serpro_plugin' of softwarepublico.gov.br:noosferogov/noosfero: (30 commits)
  api: refactoring captcha
  Update gamification plugin
  Fix archived validation for articles
  Fix datepicker date value
  Update dialoga plugin
  Update dialoga plugin
  Fix resend activation code for users
  Avoid count hits and add comments in archived articles. Added to new unit tests and translated msg
  Changes in endpoints to verify archived article validation
  api: method to resend activation code
  Add method to resend activation code
  Added archived article verification into vote plugin
  New feature archive articles to avoid create comments, associate children articles and perform votes
  Fix to the issue https://gitlab.com/noosfero/noosfero/issues/153 (Event form not loading on datepickers)" In discussion-app there is a issue to this too https://softwarepublico.gov.br/gitlab/noosfero-apps/discussion-app/issues/21
  Noosfero::VERSION: fix detecting git version for good
  Bumping version 1.3
  dalli: connect to 127.0.0.1:11211 by default
  responsive: import new variables file and follow directory structure
  Change feed published metho to consider it's parent privacy
  Fix article visibility in creation
  ...

Conflicts:
	lib/noosfero/api/v1/articles.rb
	test/unit/api/articles_test.rb
    Evandro Junior
     

01 Dec, 2015

2 commits

30 Nov, 2015

1 commit

20 Nov, 2015

1 commit

18 Nov, 2015

1 commit

17 Nov, 2015

2 commits

  • 6d9a2ad1   Merge branch 'staging' into captcha_serpro_plugin ... Browse File » 
    * staging: (138 commits)
  Do not return private token when user is inactive
  Fix unit test in api search
  Remove trailing spaces
  updating juventude plugin
  access comments through profile author
  mergin with master
  updating juventude plugin
  updating gamification plugin
  updating juventude plugin
  Fix gem version of omniauth-oauth2
  Fixed bug on /plugins/oauth_client/lib/ext/user.rb -> was referencing a class OauthClientPlugin::UserProvider which was recently renamed to OauthClientPlugin::Auth.
  [gallery block] display images from a gallery
  Update translation files
  Noosfero::VERSION: use only newer git versions
  Bumping version 1.3~rc2
  work_assignment: make sentence meaning clearer
  Makes LDAP password_recovery configurable
  Add support to tinymce editor in forum description
  updating plugin
  Small change in pt br translation
  ...

Conflicts:
	test/unit/api/session_test.rb
    Evandro Junior
     
  • 92fbfd94   Merge branch 'master_rails4' into staging ... Browse File » 
    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
     

13 Nov, 2015

1 commit

  • b164af65   API improvements: ... Browse File »
    3 
    - Add several endpoints
- Add some API documentation
- Fix plugins API hotspot

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Leandro Nunes dos Santos <leandronunes@gmail.com>
Signed-off-by: Evandro Junior <evandrojr@gmail.com>
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
Signed-off-by: Caio SBA <caio@colivre.coop.br>
Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com>
Signed-off-by: Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
Signed-off-by: Aurelio A. Heckert <aurelio@colivre.coop.br>
Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
Signed-off-by: Marcelo Júnior <maljunior@gmail.com>
Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
Signed-off-by: Larissa Reis <larissa@colivre.coop.br>
Signed-off-by: ABNER SILVA DE OLIVEIRA <abner.oliveira@serpro.gov.br>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Simião Carvalho <simiaosimis@gmail.com>
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
    Marcos Pereira
     

28 Oct, 2015

1 commit

01 Oct, 2015

1 commit

29 Sep, 2015

1 commit

28 Sep, 2015

2 commits

22 Sep, 2015

1 commit

11 Sep, 2015

1 commit

09 Sep, 2015

2 commits

03 Sep, 2015

2 commits

01 Sep, 2015

1 commit

28 Aug, 2015

1 commit

24 Aug, 2015

2 commits

07 Aug, 2015

1 commit

06 Aug, 2015

2 commits

05 Aug, 2015

1 commit

22 Jul, 2015

1 commit

21 Jul, 2015

2 commits

17 Jul, 2015

2 commits