Merge Request #14

← To merge requests From master into refactor_software_info_365
Merged
softwarepublico/mpog_software!14
Created by Luciano Prestes

Refactor software info

ISSUE: https://softwarepublico.gov.br/gitlab/softwarepublico/noosfero/issues/365

Assignee: Thiago Ribeiro
Milestone: None

Merged by Thiago Ribeiro

Commits (24)
4 participants
  • B5782cb554a4b36d12017ee18d1b6e9d?s=40&d=identicon
    Link here  
    Simiao Carvalho @simiaosimis

    Added 1 new commit:

    • 4c4c417d - Change html structure on software statistics block
    Choose File ...   File name...
    Cancel
  • B5782cb554a4b36d12017ee18d1b6e9d?s=40&d=identicon
    Link here  
    Simiao Carvalho @simiaosimis

    Added 1 new commit:

    • ec4d3838 - Fix html tag orders on software statistics block
    Choose File ...   File name...
    Cancel
  • Cae6de821da30189b2573c26aa4ddfa1?s=40&d=identicon
    Link here  
    Tallys Martins @tallysmartins

    Added 1 new commit:

    • 7367cafd - Fix bug on search by software highlights block
    Choose File ...   File name...
    Cancel
    • Cae6de821da30189b2573c26aa4ddfa1?s=40&d=identicon
    Show/hide discussion
    Tallys Martins started a discussion on commit 8f80f666
    last updated by Thiago Ribeiro
  • Cae6de821da30189b2573c26aa4ddfa1?s=40&d=identicon
    Link here  
    Tallys Martins @tallysmartins

    @simiaosimis @thiago por questões de conflito eu desfiz esse commit e refiz sem a parte das traduções e já está na master e na stable... porém eu não consegui identificar quais traduções vocês fazem, se é apenas essas do beneficiarios e recursos economizados, se for está OK, se não for tem que regerar a tradução na stable e traduzir o que foi feito nesse commit. me pinguem plx pra resolver isso

    Choose File ...   File name...
    Cancel
  • Cae6de821da30189b2573c26aa4ddfa1?s=40&d=identicon
    Link here  
    Tallys Martins @tallysmartins

    mentioned in commit e89047ef388db6174b8afcda6c6a95fc68d6874a

    Choose File ...   File name...
    Cancel
  • B5782cb554a4b36d12017ee18d1b6e9d?s=40&d=identicon
    Link here  
    Simiao Carvalho @simiaosimis

    @tallysmartins Eram só esse dois lugares mesmo (Benefited People, Saved Resources), então tudo certo.

    Choose File ...   File name...
    Cancel
  • 800e3af93350753db9dee1864cef10ff?s=40&d=identicon
    Link here  
    Thiago Ribeiro @thiago

    em relação ao %d em ver todos é problema de traduçao, logo quando gerar as traduções certas deve resolver.

    Choose File ...   File name...
    Cancel
  • Cae6de821da30189b2573c26aa4ddfa1?s=40&d=identicon
    Link here  
    Tallys Martins @tallysmartins

    Added 2 new commits:

    • e89047ef - Revert "Change translation on Rating and Categories"
    • 2a5409a8 - Insert strings to be translated on User Report
    Choose File ...   File name...
    Cancel
  • Cae6de821da30189b2573c26aa4ddfa1?s=40&d=identicon
    Link here  
    Tallys Martins @tallysmartins

    Added 2 new commits:

    • ff48cac4 - Remove disabled communities from catalog search
    • 61040de7 - Merge branch 'remove_disabled_communities_from_catalog' into 'master'
    Choose File ...   File name...
    Cancel
  • Cae6de821da30189b2573c26aa4ddfa1?s=40&d=identicon
    Link here  
    Tallys Martins @tallysmartins

    @lucianopc faz um rebase com a master

    Choose File ...   File name...
    Cancel
  • 800e3af93350753db9dee1864cef10ff?s=40&d=identicon
    Link here  
    Thiago Ribeiro @thiago

    Added 2 new commits:

    • bcc456c3 - Order categories in categories_software_block
    • 7ed2d55d - Merge branch 'order_categories_383' into 'master'
    Choose File ...   File name...
    Cancel
  • 800e3af93350753db9dee1864cef10ff?s=40&d=identicon
    Link here  
    Thiago Ribeiro @thiago

    Added 3 new commits:

    • 5ffa5a41 - Add secret option in edit software community
    • c489251b - Search software_infos find only softwares with visible community
    • cc3950d2 - Merge branch 'software_community_secret_237' into 'master'
    Choose File ...   File name...
    Cancel
  • 800e3af93350753db9dee1864cef10ff?s=40&d=identicon
    Link here  
    Thiago Ribeiro @thiago

    Added 1 new commit:

    • a8887fbb - Merge branch 'software_community_secret_237' into 'master'
    Choose File ...   File name...
    Cancel
  • 800e3af93350753db9dee1864cef10ff?s=40&d=identicon
    Link here  
    Thiago Ribeiro @thiago

    Status changed to closed

    Choose File ...   File name...
    Cancel
  • 800e3af93350753db9dee1864cef10ff?s=40&d=identicon
    Link here  
    Thiago Ribeiro @thiago

    Status changed to reopened

    Choose File ...   File name...
    Cancel