20 Nov, 2015

1 commit


19 Nov, 2015

1 commit


18 Nov, 2015

1 commit


17 Nov, 2015

2 commits

  • * 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
     
  • Victor Costa
     

11 Nov, 2015

1 commit


06 Nov, 2015

1 commit


04 Nov, 2015

1 commit


22 Sep, 2015

1 commit


28 Aug, 2015

1 commit


27 Aug, 2015

2 commits


06 Aug, 2015

4 commits


27 Jul, 2015

1 commit


25 Jul, 2015

2 commits


22 Jul, 2015

1 commit

  • Merge branch 'api' into api_captcha_with_frontend_console_feedback
    
    * api: (70 commits)
      Tests for articles with category at the API
      Updating authors file
      Normalize authors names
      Generalize lattes_curriculum plugins' cucumber test
      API: adding api pagination
      API: fix reference_id parameter to avoid crash when load empty parameter
      Remove lattes_curriculum's tests with external dependencies
      api: added change password methods
      CommunityTrack: load the correct box in functional tests
      Define specific grape logging version to avoid undefined method "downcase"
      refactoring display_filter to filter all article of friends marked as show_to_followers
      api: fix user activation
      sub_organizations: add missed timestamps (fix unit tests)
      travis: remove workaround and fix selenium concurrent run
      allow run the "quick-start" script from everywhere
      Fix api article filter
      Fix display filter for article children
      Add new url request to activate a user in session end-point
      Highlight block fix
      Fix JS behaviour to show categories when noosfero is in a subdir environment
      ...
    
    Conflicts:
    	lib/noosfero/api/session.rb
    Evandro Junior
     

21 Jul, 2015

2 commits


20 Jul, 2015

3 commits


16 Jul, 2015

2 commits


15 Jul, 2015

2 commits


14 Jul, 2015

1 commit


13 Jul, 2015

1 commit


08 Jul, 2015

1 commit


02 Jun, 2015

2 commits


11 May, 2015

1 commit


24 Mar, 2015

1 commit