Software Público Brasileiro

04 Nov, 2015

1 commit

• 5e592c20   fix merge conflit Browse Dir »
  Leandro Santos

  2015-11-04 08:50:06 -0300  

03 Nov, 2015

2 commits

• b8bc9b1d   Merge branch 'next' into staging Browse Dir »
  Leandro Santos

  2015-11-03 17:54:16 -0300  
• ba65e5b7   Merge branch 'master' into next Browse Dir »
  Leandro Santos

  2015-11-03 14:46:01 -0300  

28 Oct, 2015

2 commits

• 2409576d   adding article entities attributes Browse Dir »
  Leandro Santos

  2015-10-28 15:59:41 -0300  
• a78018eb   adding person fields in entities Browse Dir »
  Leandro Santos

  2015-10-28 15:38:33 -0300  

27 Oct, 2015

2 commits

• 8c6c49ca   return vote_count and comments_count attributes from person profile Browse Dir »
  Leandro Santos

  2015-10-27 18:38:15 -0300  
• ce08b7cc   should filter person fieldws return by fields parameters Browse Dir »
  Leandro Santos

  2015-10-27 15:15:36 -0300  

14 Oct, 2015

2 commits

• 9bca97e7   fix unit tests Browse Dir »
  Leandro Santos

  2015-10-14 14:46:13 -0300  
• 3a3d6875   get the current user even private token is expired Browse Dir »
  Leandro Santos

  2015-10-14 14:03:30 -0300  

13 Oct, 2015

3 commits

• e0a87b2f   merging with next Browse Dir »
  Leandro Santos

  2015-10-13 16:14:37 -0300  
• 878b67a8   merging with master Browse Dir »
  Leandro Santos

  2015-10-13 15:52:57 -0300  
• 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

  2015-10-13 13:10:58 -0300  

08 Oct, 2015

4 commits

• 0fa27860   Merge branch 'fix_highlight_block' into 'master' ... Browse Dir »

  Fix highlights_block error on add Noosfero.root
  
  @danielafeitosa, can you review this merge request?
  
  See merge request !701

  Daniela Feitosa

  2015-10-08 14:51:50 +0000  
• 9c9f0fbc   Merge branch 'show_email_in_task' into 'master' ... Browse Dir »

  Show email of requestor in AddMember task
  
  Add user email on the screen to process the request to enter on the community.
  
  softwarepublico issue: https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/238
  
  See merge request !696

  Rodrigo Souto

  2015-10-08 14:50:41 +0000  
• 74a61295   Fix highlights_block error on add Noosfero.root ... Browse Dir »

  1

  Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
  Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>

  Luciano Prestes

  2015-10-08 16:46:33 +0200  
• 8ac3abc1   Fix and add tests for show requestor email on AddMember task Browse Dir »
  Luciano Prestes

  2015-10-08 16:33:34 +0200  

07 Oct, 2015

2 commits

• 66eb5163   New topics now accepts reply by default ... Browse Dir »

  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

  2015-10-07 18:29:35 -0300  
• a4d115e7   Show email of requestor in AddMember task ... Browse Dir »

  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

  2015-10-07 19:34:08 +0200  

30 Sep, 2015

1 commit

• d66aa24c   merging with master Browse Dir »
  Leandro Santos

  2015-09-30 20:12:05 -0300  

29 Sep, 2015

3 commits

• f92b46d1   adding unit tests for TinyMCE pt and fr languages Browse Dir »

  1
  Leandro Santos

  2015-09-29 14:52:33 -0300  
• 1c395f6b   Merge branch 'staging' of gitlab.com:participa/noosfero into staging Browse Dir »
  Leandro Santos

  2015-09-29 08:59:10 -0300  
• 5fc67fe4   should set the source in comment creation Browse Dir »
  Leandro Santos

  2015-09-29 08:58:03 -0300  

28 Sep, 2015

3 commits

• 744c1e81   search articles filter by categories Browse Dir »
  Leandro Santos

  2015-09-28 16:42:58 -0300  
• 0700b802   refactoring search api unit tests Browse Dir »
  Leandro Santos

  2015-09-28 15:11:09 -0300  
• 64577e79   changing api parameter categories_ids by category_ids Browse Dir »
  Leandro Santos

  2015-09-28 11:33:48 -0300  

26 Sep, 2015

1 commit

• 540eb8cb   Split application.css into several partials ... Browse Dir »

  Keeped controllers/views structure

  Braulio Bhavamitra

  2015-09-26 15:14:34 -0300  

25 Sep, 2015

1 commit

• e9a85337   Merge branch 'login-captcha' into staging Browse Dir »
  Leandro Santos

  2015-09-25 09:51:29 -0300  

24 Sep, 2015

3 commits

• baf2a917   comment test Browse Dir »
  Leandro Santos

  2015-09-24 16:07:09 -0300  
• 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

  2015-09-24 12:38:04 -0300  
• f753c8b7   Implemented loging with captcha with mencache Browse Dir »
  Carlos Purificação

  2015-09-24 11:42:36 -0300  

22 Sep, 2015

1 commit

• 06bf7862   merging with master Browse Dir »
  Leandro Santos

  2015-09-22 16:12:48 -0300  

18 Sep, 2015

1 commit

• 0d2ac9fb   Added initial tests Browse Dir »
  Carlos Purificação

  2015-09-18 16:24:10 -0300  

16 Sep, 2015

2 commits

• 1c90aa7a   rename parent parameter to parent_id Browse Dir »
  Leandro Santos

  2015-09-16 14:10:48 -0300  
• 57e3afc1   Added parent to search Browse Dir »
  Carlos Purificação

  2015-09-16 12:09:55 -0300  

15 Sep, 2015

1 commit

• 438e2c7d   geo_ref: always mock external requests ... Browse Dir »

  As talked with terceiro, it is not a good idea to depend on ENV vars

  Braulio Bhavamitra

  2015-09-15 17:57:11 -0300  

10 Sep, 2015

2 commits

• 68dae8a2   Merge branch 'following' into staging ... Browse Dir »

  Conflicts:
  	app/models/article_follower.rb
  	test/unit/article_test.rb

  Victor Costa

  2015-09-10 15:19:16 -0300  
• c1b783c7   Add counter cache for article followers Browse Dir »
  Victor Costa

  2015-09-10 15:15:59 -0300  

09 Sep, 2015

3 commits

• fe095443   Merge branch 'following' into staging Browse Dir »
  Leandro Santos

  2015-09-09 23:53:39 -0300  
• b7303567   removing article follower fixture Browse Dir »
  Leandro Santos

  2015-09-09 23:53:06 -0300  
• 73fa1c41   Merge branch 'staging' of gitlab.com:participa/noosfero into staging Browse Dir »
  Leandro Santos

  2015-09-09 20:23:10 -0300