Merge branch 'dev' into feature/rails4

pull/6827/head
Alex Coles 9 years ago
commit bdb090f89d
  1. 10
      app/views/my_projects_overviews/index.html.erb
  2. 9
      app/views/my_projects_overviews/page_layout.html.erb
  3. 19
      config/locales/da.yml
  4. 1
      config/locales/de.yml
  5. 1
      config/locales/en.yml
  6. 21
      config/locales/fr.yml
  7. 19
      config/locales/it.yml
  8. 19
      config/locales/lv.yml
  9. 1
      config/locales/pl.yml
  10. 19
      config/locales/pt-BR.yml
  11. 19
      config/locales/sv-SE.yml
  12. 19
      config/locales/tr.yml
  13. 94
      doc/CHANGELOG.md
  14. 2
      lib/open_project/my_project_page/version.rb

@ -39,12 +39,10 @@ See doc/COPYRIGHT.md for more details.
<% end %> <% end %>
<div id="invisible-grid"> <div id="invisible-grid">
<div class="grid-block medium-up-1"> <% top_fields.each do |f| %>
<% top_fields.each do |f| %> <%= rendered_field f %>
<%= rendered_field f %> <% end %>
<% end %> <div class="grid-block">
</div>
<div class="grid-block medium-up-2">
<% middle_fields.each do |f| %> <% middle_fields.each do |f| %>
<%= rendered_field f %> <%= rendered_field f %>
<% end %> <% end %>

@ -42,11 +42,10 @@ See doc/COPYRIGHT.md for more details.
<h4><%=l(:label_visible_elements) %></h4> <h4><%=l(:label_visible_elements) %></h4>
<div id="visible-grid"> <div id="visible-grid">
<div class="grid-block medium-up-1"> <% top_fields.each do |f| %>
<% top_fields.each do |f| %> <%= grid_field f %>
<%= grid_field f %> <% end %>
<% end %>
</div>
<div class="grid-block"> <div class="grid-block">
<% middle_fields.each do |f| %> <% middle_fields.each do |f| %>
<%= grid_field f %> <%= grid_field f %>

@ -0,0 +1,19 @@
da:
label_hidden_elements: Gemte elementer
label_visible_elements: Synlige elementer
label_project_description: Projektbeskrivelse
label_project_details: Projektdetaljer
label_project_homepage: Hjemmeside
label_custom_element: Tilføj appetitvækker...
info_custom_text: Tilpasset tekst
label_confirm_delete: Vil du virkelig slette dette element?
label_work_packages_reported_by_me: Arbejdspakker der rapporterer til mig
label_work_packages_responsible_for: Arbejdspakker jeg er ansvarlig for
label_work_packages_assigned_to_me: Arbejdspakker tilknyttet mig
label_work_packages_watched: Overvågede arbejdspakker
label_work_package_tracking: Sporing af arbejdspakke
label_members: Medlemmer
label_subprojects: Underprojekter
project_page:
all: Vis alt
x_more: '...(%{count} mere)'

@ -7,7 +7,6 @@ de:
label_custom_element: Teaser hinzufügen ... label_custom_element: Teaser hinzufügen ...
info_custom_text: Benutzerdefinierter Text info_custom_text: Benutzerdefinierter Text
label_confirm_delete: Dieses Element wirklich löschen? label_confirm_delete: Dieses Element wirklich löschen?
label_save_or_reset_teaser: Änderungen am Teaser speichern?
label_work_packages_reported_by_me: Von mir gemeldete Arbeitspakete label_work_packages_reported_by_me: Von mir gemeldete Arbeitspakete
label_work_packages_responsible_for: Von mir verantwortete Arbeitspakete label_work_packages_responsible_for: Von mir verantwortete Arbeitspakete
label_work_packages_assigned_to_me: Mir zugewiesene Tickets label_work_packages_assigned_to_me: Mir zugewiesene Tickets

@ -27,7 +27,6 @@ en:
label_custom_element: Add teaser ... label_custom_element: Add teaser ...
info_custom_text: Custom text info_custom_text: Custom text
label_confirm_delete: Really delete this element? label_confirm_delete: Really delete this element?
label_save_or_reset_teaser: Save changes made to the teaser?
label_work_packages_reported_by_me: Work packages reported by me label_work_packages_reported_by_me: Work packages reported by me
label_work_packages_responsible_for: Work packages I am responsible for label_work_packages_responsible_for: Work packages I am responsible for
label_work_packages_assigned_to_me: Work packages assigned to me label_work_packages_assigned_to_me: Work packages assigned to me

@ -0,0 +1,21 @@
fr:
label_hidden_elements: Éléments masqués
label_visible_elements: Éléments visibles
label_project_description: Description du projet
label_project_details: Détails du projet
label_project_homepage: "Page d'accueil"
label_custom_element: Ajouter une accroche…
info_custom_text: Texte personnalisé
label_confirm_delete: Êtes-vous sûr de vouloir supprimer cet élément ?
label_work_packages_reported_by_me: "Lots de travaux que j'ai consignés"
label_work_packages_responsible_for: Lots de travaux dont je suis responsable
label_work_packages_assigned_to_me: Lots de travaux qui me sont assignés
label_work_packages_watched: Lots de travaux surveillés
label_work_package_tracking: Suivi des lots de travaux
label_members: Membres
label_subprojects: Sous-projets
project_page:
all: Afficher tout
x_more: |
…(%{count} de plus)

@ -0,0 +1,19 @@
it:
label_hidden_elements: Elementi nascosti
label_visible_elements: Elementi visibili
label_project_description: Descrizione del progetto
label_project_details: Dettagli del progetto
label_project_homepage: Pagina iniziale
label_custom_element: Aggiungere teaser...
info_custom_text: Testo personalizzato
label_confirm_delete: Sicuro di voler eliminare questo elemento?
label_work_packages_reported_by_me: Pacchetti di lavoro segnalati da me
label_work_packages_responsible_for: Pacchetti di lavoro di cui sono responsabile
label_work_packages_assigned_to_me: Pacchetti di lavoro assegnati a me
label_work_packages_watched: Pacchetti di lavoro osservati
label_work_package_tracking: Monitoraggio pacchetti di lavoro
label_members: Membri
label_subprojects: Sottoprogetti
project_page:
all: Mostra tutti
x_more: '... (più%{count})'

@ -0,0 +1,19 @@
lv:
label_hidden_elements: Paslēptie elementi
label_visible_elements: Redzamie elementi
label_project_description: Projekta apraksts
label_project_details: Detalizēta informācija par projektu
label_project_homepage: Sākumlapa
label_custom_element: 'Pievienot "teaser"...'
info_custom_text: Pielāgots teksts
label_confirm_delete: Vai tiešām dzēst šo elementu?
label_work_packages_reported_by_me: Mani izveidotie pieteikumi
label_work_packages_responsible_for: Pieteikumi, kuros es esmu atbildīgais
label_work_packages_assigned_to_me: Man piešķirtie pieteikumi
label_work_packages_watched: Pieteikumi, kuriem tiek sekots
label_work_package_tracking: Pieteikuma sekošana
label_members: Dalībnieki
label_subprojects: Apakšprojekti
project_page:
all: Rādīt visus
x_more: '... (vēl%{count})'

@ -7,7 +7,6 @@ pl:
label_custom_element: Dodać zapowiedź... label_custom_element: Dodać zapowiedź...
info_custom_text: Tekst niestandardowy/użytkownika info_custom_text: Tekst niestandardowy/użytkownika
label_confirm_delete: Naprawdę usunąć ten element? label_confirm_delete: Naprawdę usunąć ten element?
label_save_or_reset_teaser: Zapisz zmiany dokonane w zapowiedzi?
label_work_packages_reported_by_me: Zadania zgłoszone przeze mnie label_work_packages_reported_by_me: Zadania zgłoszone przeze mnie
label_work_packages_responsible_for: Zadania, za które jestem odpowiedzialny label_work_packages_responsible_for: Zadania, za które jestem odpowiedzialny
label_work_packages_assigned_to_me: Zadania przypisane do mnie label_work_packages_assigned_to_me: Zadania przypisane do mnie

@ -0,0 +1,19 @@
pt-BR:
label_hidden_elements: Elementos ocultos
label_visible_elements: Elementos visíveis
label_project_description: Descrição do projeto
label_project_details: Detalhes do projeto
label_project_homepage: Página inicial
label_custom_element: Adicionar chamada...
info_custom_text: Texto personalizado
label_confirm_delete: Confirma a exclusão deste elemento?
label_work_packages_reported_by_me: Pacotes de trabalho criados por mim
label_work_packages_responsible_for: Pacotes de trabalho sob minha responsabilidade
label_work_packages_assigned_to_me: Pacotes de trabalho atribuídos a mim
label_work_packages_watched: Pacotes de trabalho observados
label_work_package_tracking: Acompanhamento de pacote de trabalho
label_members: Membros
label_subprojects: Subprojetos
project_page:
all: Mostrar todos
x_more: '... (%{count} mais)'

@ -0,0 +1,19 @@
sv:
label_hidden_elements: Dolda element
label_visible_elements: Synliga element
label_project_description: Projektbeskrivning
label_project_details: Projektinformation
label_project_homepage: Hemsida
label_custom_element: Lägg till teaser...
info_custom_text: Egen text
label_confirm_delete: Vill du verkligen ta bort detta element?
label_work_packages_reported_by_me: Arbetspaket rapporterade av mig
label_work_packages_responsible_for: Arbetspaket jag är ansvarig för
label_work_packages_assigned_to_me: Arbetspaket som tilldelats till mig
label_work_packages_watched: Bevakade arbetspaket
label_work_package_tracking: Arbetspaketsspårning
label_members: Medlemmar
label_subprojects: Delprojekt
project_page:
all: Visa alla
x_more: '... (%{count} mer)'

@ -0,0 +1,19 @@
tr:
label_hidden_elements: Gizli öğeler
label_visible_elements: Görünür öğeler
label_project_description: Proje tanımı
label_project_details: Proje detayları
label_project_homepage: Anasayfa
label_custom_element: Tanıtım ekle ...
info_custom_text: Özel metin
label_confirm_delete: Bu öğeyi gerçekten silmek istiyor musunuz?
label_work_packages_reported_by_me: Work packages reported by me
label_work_packages_responsible_for: Benim sorumlu olduğum iş paketleri
label_work_packages_assigned_to_me: Bana atanan iş paketleri
label_work_packages_watched: Watched work packages
label_work_package_tracking: Work package tracking
label_members: Üyeler
label_subprojects: Alt projeler
project_page:
all: Tümünü görüntüle
x_more: '... (%{count} daha fazla)'

@ -1,94 +0,0 @@
<!---- copyright
OpenProject My Project Page Plugin
Copyright (C) 2011-2014 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.md for more details.
++-->
# Changelog
## 3.0.8
* `#4099` Fix tab order
## 3.0.2
* Fix path of assets that should be precompiled
## 3.0.1
* `#5357` Adapt released plugins to base on plugins functionality
* Fix: Add edit accesskey for my project page personalization
## 3.0.0
* `#3292` Fix: [User Management] Project members displayed multiple times in overview page when added as part of a group and individually
* `#3440` New workpackage form layout
* `#3734` Responsible widget for my project page
* `#4786` Fix: Teaser edit buttons invisible
## 3.0.0.pre12
* `#2502` New Layout for overview / my page
* `#2259` [Accessibility] linearisation of issue show form (2)
## 3.0.0.pre11
* fixed sepc for User Story #2743: Clear filters when 'Work Packages' is clicked in the menu bar
## 3.0.0.pre10
* Adaptations for new icon font
## 3.0.0.pre9
* `#2731` Migrate serialized yaml from syck to psych
## 3.0.0.pre8
* `#2451` Squash old migrations
## 3.0.0.pre7
* `#2070` Adaptions after changing core asset locations
## 3.0.0.pre6
* Renamed IssueStatus to Status
## 3.0.0.pre5
* Renamed issue to work package where applicable
## 3.0.0.pre4
* `#2027` Fix/rename issues to work packages
## 3.0.0.pre3
* `#1875` removed the documents-block, that now resides in the documents-plugin
* `#1794` prepared the plugin for publishing, added copyright-headers, README's etc.
## 3.0.0.pre2
* `#1723` MyProject Page Link not working
## 3.0.0.pre1
* first rails3 pre release
* initial migration to rails 3.x/engines

@ -20,6 +20,6 @@
module OpenProject module OpenProject
module MyProjectPage module MyProjectPage
VERSION = "4.2.2" VERSION = "5.0.0-alpha"
end end
end end

Loading…
Cancel
Save