20 Nov, 2015

3 commits


19 Nov, 2015

5 commits


18 Nov, 2015

1 commit


17 Nov, 2015

1 commit

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

16 Nov, 2015

1 commit


12 Nov, 2015

1 commit


05 Nov, 2015

3 commits


04 Nov, 2015

4 commits


03 Nov, 2015

3 commits


29 Oct, 2015

1 commit


28 Oct, 2015

3 commits


13 Oct, 2015

3 commits


08 Oct, 2015

3 commits


07 Oct, 2015

3 commits

  • Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
    Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
    Signed-off-by: Jessica Cristina <jessica.cris1127@gmail.com>
    Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Simiao Carvalho
     
  • Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
    Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
    Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
    Luciano Prestes
     
  • Favorite enterprises block footer and content fixes
    
    Before: 
    ![profile-list-block-before](https://gitlab.com/diguliu/noosfero/uploads/de95f699a4e2b081f699450229818a38/profile-list-block-before.png)
    
    After:
     ![profile-list-block-after](https://gitlab.com/diguliu/noosfero/uploads/4df324beee47ad7874af2b2bffa1b308/profile-list-block-after.png)
    
    Had to move the "view all" button to the bottom because of this problem: 
    ![view-all-problem](https://gitlab.com/diguliu/noosfero/uploads/a1e3b62eebf18b72c39034ff149de0e1/view-all-problem.png)
    
    
    See merge request !676
    Antonio Terceiro
     

06 Oct, 2015

2 commits


05 Oct, 2015

1 commit


02 Oct, 2015

2 commits