From 34928de9c9f837a03190705366953fed6ad67afa Mon Sep 17 00:00:00 2001
From: Jens Ulferts <j.ulferts@finn.de>
Date: Mon, 6 Jul 2015 15:52:20 +0200
Subject: [PATCH 1/3] no reload on timelog delete

Please refer to https://docs.angularjs.org/api/ng/directive/ngHref for
the different combinations of href, ng-href and ng-click within an a
tag.
---
 app/views/timelog/_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb
index 6f3465123d..8fd02d2bdf 100644
--- a/app/views/timelog/_list.html.erb
+++ b/app/views/timelog/_list.html.erb
@@ -59,7 +59,7 @@ See doc/COPYRIGHT.rdoc for more details.
           <a ng-href="{{PathHelper.timeEntryEditPath(timeEntry.id)}}" class="no-decoration-on-hover">
             <icon-wrapper icon-name="edit" icon-title="{{I18n.t('js.button_edit')}}"></icon-wrapper>
           </a>
-          <a ng-click="deleteTimeEntry(timeEntry.id)" href="#" class="no-decoration-on-hover">
+          <a ng-click="deleteTimeEntry(timeEntry.id)" href="" class="no-decoration-on-hover">
             <icon-wrapper icon-name="delete" icon-title="{{I18n.t('js.button_delete')}}"></icon-wrapper>
           </a>
         </span>

From 13efb76ab64f5c774e37cf6a7ea25dd8df3b6dec Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <j.heinrich@finn.de>
Date: Tue, 7 Jul 2015 12:06:57 +0200
Subject: [PATCH 2/3] Updates OpenProject-Translations

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f7e25d8d93..3b61ffb3c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,7 +42,7 @@ GIT
 
 GIT
   remote: https://github.com/opf/openproject-translations.git
-  revision: 99f40603ca7778855eddf9510538070827254423
+  revision: 6f4464f60ea96f00c4e06ef6f780a041f4850752
   branch: release/4.2
   specs:
     openproject-translations (4.2.0.pre.alpha)

From 1ddd8fbfb3c384fa6d1f818bb944c9360bd27cda Mon Sep 17 00:00:00 2001
From: Jens Ulferts <j.ulferts@finn.de>
Date: Tue, 7 Jul 2015 15:11:18 +0200
Subject: [PATCH 3/3] fix translations version

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8af4e8473b..ca709b333e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -231,7 +231,7 @@ platforms :jruby do
 end
 
 group :opf_plugins do
-  gem 'openproject-translations', git:'https://github.com/opf/openproject-translations.git', branch: 'release/4.2'
+  gem 'openproject-translations', git:'https://github.com/opf/openproject-translations.git', branch: 'release/4.3'
 end
 
 # Load Gemfile.local, Gemfile.plugins and plugins' Gemfiles
diff --git a/Gemfile.lock b/Gemfile.lock
index 725666c7e1..83bcbd1179 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,10 +42,10 @@ GIT
 
 GIT
   remote: https://github.com/opf/openproject-translations.git
-  revision: 6f4464f60ea96f00c4e06ef6f780a041f4850752
-  branch: release/4.2
+  revision: d863033ff799e9f8be9af4d6ae5ef7fe6505073b
+  branch: release/4.3
   specs:
-    openproject-translations (4.2.0.pre.alpha)
+    openproject-translations (4.3.0.pre.alpha)
       crowdin-api (~> 0.2.4)
       mixlib-shellout (~> 2.1.0)
       rails (~> 3.2.14)