From df69c07a7b7e5ed424d5563d3ff39033c9475f62 Mon Sep 17 00:00:00 2001
From: Julian Pawlowski <julian.pawlowski@gmail.com>
Date: Tue, 19 Feb 2013 12:48:55 +0100
Subject: wording

---
 config/locales/views/fax_documents/de.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/locales/views/fax_documents/de.yml b/config/locales/views/fax_documents/de.yml
index 6bfa86b..da59833 100644
--- a/config/locales/views/fax_documents/de.yml
+++ b/config/locales/views/fax_documents/de.yml
@@ -62,7 +62,7 @@ de:
       transmission_time: 'Übertragungszeit'
       sent_at: 'Sendezeit'
       document_total_pages: 'Seitenanzahl'
-      document_transferred_pages: 'Übertragende Seiten'
+      document_transferred_pages: 'Übertragene Seiten'
       ecm_requested: 'Fehlerkorrektur (ECM) angefragt'
       ecm_used: 'Fehlerkorrektur (ECM) verwendet'
       image_resolution: 'Bildauflösung'
-- 
cgit v1.2.3


From e519bed20aa26abde47da77c7958843e5ee4a149 Mon Sep 17 00:00:00 2001
From: Julian Pawlowski <julian.pawlowski@gmail.com>
Date: Wed, 20 Feb 2013 20:24:11 +0100
Subject: change directory for faxes

---
 config/backup.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/backup.rb b/config/backup.rb
index e5816c1..aa8ade3 100644
--- a/config/backup.rb
+++ b/config/backup.rb
@@ -29,9 +29,9 @@ Backup::Model.new(:GS5, 'GS5 backup') do
   ##
   # Faxes
   #
-  if File.exists?('/opt/gemeinschaft/public/uploads/fax_document')
+  if File.exists?('/var/opt/gemeinschaft/fax')
     archive :faxes do |archive|
-      archive.add     '/opt/gemeinschaft/public/uploads/fax_document'
+      archive.add     '/var/opt/gemeinschaft/fax'
     end
   end
 
-- 
cgit v1.2.3


From 2a9b798f9e122582abb36605a7d4a1da0e70eca9 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Fri, 22 Feb 2013 07:08:23 -0500
Subject: pickup group permission model added

---
 config/locales/views/group_memberships/de.yml | 50 +++++++++++++++++++++++++++
 config/locales/views/group_memberships/en.yml | 50 +++++++++++++++++++++++++++
 config/locales/views/group_permissions/de.yml | 50 +++++++++++++++++++++++++++
 config/locales/views/group_permissions/en.yml | 50 +++++++++++++++++++++++++++
 config/locales/views/groups/de.yml            | 50 +++++++++++++++++++++++++++
 config/locales/views/groups/en.yml            | 50 +++++++++++++++++++++++++++
 config/routes.rb                              |  5 +++
 7 files changed, 305 insertions(+)
 create mode 100644 config/locales/views/group_memberships/de.yml
 create mode 100644 config/locales/views/group_memberships/en.yml
 create mode 100644 config/locales/views/group_permissions/de.yml
 create mode 100644 config/locales/views/group_permissions/en.yml
 create mode 100644 config/locales/views/groups/de.yml
 create mode 100644 config/locales/views/groups/en.yml

(limited to 'config')

diff --git a/config/locales/views/group_memberships/de.yml b/config/locales/views/group_memberships/de.yml
new file mode 100644
index 0000000..7fdc100
--- /dev/null
+++ b/config/locales/views/group_memberships/de.yml
@@ -0,0 +1,50 @@
+de:
+  group_memberships:
+    name: 'Groupmembership'
+    controller:
+      successfuly_created: 'Groupmembership wurde angelegt.'
+      successfuly_updated: 'Groupmembership wurde aktualisiert.'
+      successfuly_destroyed: 'Groupmembership wurde gelöscht.'
+    index:
+      page_title: 'Übersicht von Groupmembership'
+      group_id: 'Group'
+      item_type: 'Item type'
+      item_id: 'Item'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Groupmembership'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Groupmembership neu anlegen für %{resource}'
+    show:
+      page_title: 'Groupmembership bearbeiten'
+      group_id: 'Group'
+      item_type: 'Item type'
+      item_id: 'Item'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    new:
+      page_title: 'Groupmembership neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Groupmembership bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      group_id:
+        label: 'Group'
+        hint: ''
+      item_type:
+        label: 'Item type'
+        hint: ''
+      item_id:
+        label: 'Item'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/group_memberships/en.yml b/config/locales/views/group_memberships/en.yml
new file mode 100644
index 0000000..35740a3
--- /dev/null
+++ b/config/locales/views/group_memberships/en.yml
@@ -0,0 +1,50 @@
+en:
+  group_memberships:
+    name: 'Groupmembership'
+    controller:
+      successfuly_created: 'Successfully created Groupmembership.'
+      successfuly_updated: 'Successfully updated Groupmembership.'
+      successfuly_destroyed: 'Successfully destroyed Groupmembership.'
+    index:
+      page_title: 'Listing Groupmembership'
+      group_id: 'Group'
+      item_type: 'Item type'
+      item_id: 'Item'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Groupmembership?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Groupmembership for %{resource}'
+    show:
+      page_title: 'Show Groupmembership'
+      group_id: 'Group'
+      item_type: 'Item type'
+      item_id: 'Item'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Groupmembership'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Groupmembership'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      group_id:
+        label: 'Group'
+        hint: ''
+      item_type:
+        label: 'Item type'
+        hint: ''
+      item_id:
+        label: 'Item'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/group_permissions/de.yml b/config/locales/views/group_permissions/de.yml
new file mode 100644
index 0000000..c075830
--- /dev/null
+++ b/config/locales/views/group_permissions/de.yml
@@ -0,0 +1,50 @@
+de:
+  group_permissions:
+    name: 'Grouppermission'
+    controller:
+      successfuly_created: 'Grouppermission wurde angelegt.'
+      successfuly_updated: 'Grouppermission wurde aktualisiert.'
+      successfuly_destroyed: 'Grouppermission wurde gelöscht.'
+    index:
+      page_title: 'Übersicht von Grouppermission'
+      group_id: 'Group'
+      permission: 'Permission'
+      target_group_id: 'Target group'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Grouppermission'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Grouppermission neu anlegen für %{resource}'
+    show:
+      page_title: 'Grouppermission bearbeiten'
+      group_id: 'Group'
+      permission: 'Permission'
+      target_group_id: 'Target group'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    new:
+      page_title: 'Grouppermission neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Grouppermission bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      group_id:
+        label: 'Group'
+        hint: ''
+      permission:
+        label: 'Permission'
+        hint: ''
+      target_group_id:
+        label: 'Target group'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/group_permissions/en.yml b/config/locales/views/group_permissions/en.yml
new file mode 100644
index 0000000..2a5f48e
--- /dev/null
+++ b/config/locales/views/group_permissions/en.yml
@@ -0,0 +1,50 @@
+en:
+  group_permissions:
+    name: 'Grouppermission'
+    controller:
+      successfuly_created: 'Successfully created Grouppermission.'
+      successfuly_updated: 'Successfully updated Grouppermission.'
+      successfuly_destroyed: 'Successfully destroyed Grouppermission.'
+    index:
+      page_title: 'Listing Grouppermission'
+      group_id: 'Group'
+      permission: 'Permission'
+      target_group_id: 'Target group'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Grouppermission?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Grouppermission for %{resource}'
+    show:
+      page_title: 'Show Grouppermission'
+      group_id: 'Group'
+      permission: 'Permission'
+      target_group_id: 'Target group'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Grouppermission'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Grouppermission'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      group_id:
+        label: 'Group'
+        hint: ''
+      permission:
+        label: 'Permission'
+        hint: ''
+      target_group_id:
+        label: 'Target group'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/groups/de.yml b/config/locales/views/groups/de.yml
new file mode 100644
index 0000000..fc60a72
--- /dev/null
+++ b/config/locales/views/groups/de.yml
@@ -0,0 +1,50 @@
+de:
+  groups:
+    name: 'Group'
+    controller:
+      successfuly_created: 'Group wurde angelegt.'
+      successfuly_updated: 'Group wurde aktualisiert.'
+      successfuly_destroyed: 'Group wurde gelöscht.'
+    index:
+      page_title: 'Übersicht von Group'
+      name: 'Name'
+      active: 'Active'
+      comment: 'Comment'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Group'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Group neu anlegen für %{resource}'
+    show:
+      page_title: 'Group bearbeiten'
+      name: 'Name'
+      active: 'Active'
+      comment: 'Comment'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    new:
+      page_title: 'Group neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Group bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      active:
+        label: 'Active'
+        hint: ''
+      comment:
+        label: 'Comment'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/groups/en.yml b/config/locales/views/groups/en.yml
new file mode 100644
index 0000000..a7fb666
--- /dev/null
+++ b/config/locales/views/groups/en.yml
@@ -0,0 +1,50 @@
+en:
+  groups:
+    name: 'Group'
+    controller:
+      successfuly_created: 'Successfully created Group.'
+      successfuly_updated: 'Successfully updated Group.'
+      successfuly_destroyed: 'Successfully destroyed Group.'
+    index:
+      page_title: 'Listing Group'
+      name: 'Name'
+      active: 'Active'
+      comment: 'Comment'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Group?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Group for %{resource}'
+    show:
+      page_title: 'Show Group'
+      name: 'Name'
+      active: 'Active'
+      comment: 'Comment'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Group'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Group'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      active:
+        label: 'Active'
+        hint: ''
+      comment:
+        label: 'Comment'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 65a9ac2..ce0566c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,10 @@
 Gemeinschaft42c::Application.routes.draw do
 
+  resources :groups do
+    resources :group_memberships
+    resources :group_permissions
+  end
+
   resources :sim_card_providers do
     resources :sim_cards, :except => [:edit, :update]
   end
-- 
cgit v1.2.3


From 7bef0e8da2e152dd9a51ccf7771b7f967f08e497 Mon Sep 17 00:00:00 2001
From: Julian Pawlowski <julian.pawlowski@gmail.com>
Date: Sun, 24 Feb 2013 21:44:43 +0100
Subject: extend hint for local area code resolves issue #193

---
 config/locales/views/gemeinschaft_setups/de.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/locales/views/gemeinschaft_setups/de.yml b/config/locales/views/gemeinschaft_setups/de.yml
index eb0145c..c035c96 100644
--- a/config/locales/views/gemeinschaft_setups/de.yml
+++ b/config/locales/views/gemeinschaft_setups/de.yml
@@ -27,7 +27,7 @@ de:
         hint: ''
       default_area_code:
         label: 'Standard Ortsvorwahl'
-        hint: '030 für Berlin, 0261 für Koblenz, 02631 für Neuwied, usw.'
+        hint: 'ohne führende Null; z.B. 30 für Berlin, 261 für Koblenz, 2631 für Neuwied, usw.'
       trunk_access_code:
         label: 'Amtsholungsziffer'
         hint: ''
-- 
cgit v1.2.3


From 3d4c241c096c648b0768967866f59bce276ea918 Mon Sep 17 00:00:00 2001
From: Julian Pawlowski <julian.pawlowski@gmail.com>
Date: Sun, 24 Feb 2013 21:45:42 +0100
Subject: correct title

---
 config/locales/views/gemeinschaft_setups/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/locales/views/gemeinschaft_setups/en.yml b/config/locales/views/gemeinschaft_setups/en.yml
index 3a1ac39..15edca5 100644
--- a/config/locales/views/gemeinschaft_setups/en.yml
+++ b/config/locales/views/gemeinschaft_setups/en.yml
@@ -11,7 +11,7 @@ en:
       user_group_name: 'Users'
       super_admin_group_name: 'Super-Admins'
     new:
-      page_title: 'New Gemeinschaft setup'
+      page_title: 'Gemeinschaft Setup'
     form:
       user_id:
         label: 'User'
-- 
cgit v1.2.3


From 0442cd19bc9383669b506185356227361a16e442 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Mon, 25 Feb 2013 09:29:40 -0500
Subject: call_forwards - polymorphism added

---
 config/locales/views/call_forwards/de.yml | 14 +++++++-------
 config/locales/views/call_forwards/en.yml | 14 +++++++-------
 config/routes.rb                          |  1 +
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'config')

diff --git a/config/locales/views/call_forwards/de.yml b/config/locales/views/call_forwards/de.yml
index 3930938..4f6ee86 100644
--- a/config/locales/views/call_forwards/de.yml
+++ b/config/locales/views/call_forwards/de.yml
@@ -7,8 +7,8 @@ de:
       successfuly_destroyed: 'Die Rufumleitung wurde gelöscht.'
     index:
       page_title: 'Rufumleitungen'
-      phone_number_id: 'Telefonnummer'
-      call_forward_case_id: 'Art der Rufumleitung'
+      call_forwardable: 'Umleitendes Objekt'
+      call_forward_case: 'Art der Rufumleitung'
       timeout: 'Zeitüberschreitung'
       destination: 'Ziel'
       hunt_group: 'Rufgruppen-Verknüpfung'
@@ -25,8 +25,8 @@ de:
         create_for: 'Neue Rufumleitung für die %{resource} anlegen'
     show:
       page_title: 'Rufumleitung anzeigen'
-      phone_number_id: 'Telefonnummer'
-      call_forward_case_id: 'Art der Rufumleitung'
+      call_forwardable: 'Umleitendes Objekt'
+      call_forward_case: 'Art der Rufumleitung'
       timeout: 'Zeitüberschreitung'
       destination: 'Ziel'
       hunt_group: 'Rufgruppen-Verknüpfung'
@@ -44,10 +44,10 @@ de:
     edit:
       page_title: 'Rufumleitung bearbeiten'
     form:
-      phone_number_id:
-        label: 'Telefonnummer'
+      call_forwardable:
+        label: 'Umleitendes Objekt'
         hint: ''
-      call_forward_case_id:
+      call_forward_case:
         label: 'Art der Rufumleitung'
         hint: ''
       timeout:
diff --git a/config/locales/views/call_forwards/en.yml b/config/locales/views/call_forwards/en.yml
index 20fb834..65ae6b0 100644
--- a/config/locales/views/call_forwards/en.yml
+++ b/config/locales/views/call_forwards/en.yml
@@ -7,8 +7,8 @@ en:
       successfuly_destroyed: 'Successfully destroyed call forward.'
     index:
       page_title: 'Call forwards'
-      phone_number_id: 'Phone number'
-      call_forward_case_id: 'Call forward case'
+      call_forwardable: 'Forwarding entity'
+      call_forward_case: 'Call forward case'
       timeout: 'Timeout'
       destination: 'Destination'
       to_voicemail: 'Voicemail'
@@ -25,8 +25,8 @@ en:
         create_for: 'New call forward for phone number %{resource}'
     show:
       page_title: 'Show call forward'
-      phone_number_id: 'Phone number'
-      call_forward_case_id: 'Call forward case'
+      call_forwardable: 'Forwarding entity'
+      call_forward_case: 'Call forward case'
       timeout: 'Timeout'
       destination: 'Destination'
       hunt_group: 'Hunt group connection'
@@ -44,10 +44,10 @@ en:
     edit:
       page_title: 'Editing call forward'
     form:
-      phone_number_id:
-        label: 'Phone number'
+      call_forwardable:
+        label: 'Forwarding entity'
         hint: ''
-      call_forward_case_id:
+      call_forward_case:
         label: 'Call forward case'
         hint: ''
       timeout:
diff --git a/config/routes.rb b/config/routes.rb
index ce0566c..03fd4cf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -253,6 +253,7 @@ Gemeinschaft42c::Application.routes.draw do
     resources :phones_sip_accounts
     resources :phone_numbers
     resources :softkeys
+    resources :call_forwards
     resources :call_histories do
       collection do
         delete 'destroy_multiple'
-- 
cgit v1.2.3


From fd07b7b85d2d40d7d2999c2899cc890eda2095fd Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Mon, 25 Feb 2013 11:41:55 -0500
Subject: more polymorphic objects

---
 config/routes.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/routes.rb b/config/routes.rb
index 03fd4cf..b6943ab 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -254,6 +254,7 @@ Gemeinschaft42c::Application.routes.draw do
     resources :phone_numbers
     resources :softkeys
     resources :call_forwards
+    resources :ringtones
     resources :call_histories do
       collection do
         delete 'destroy_multiple'
-- 
cgit v1.2.3


From ffaa80e8d46b3b6b7597af6f157724005f48bae4 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 26 Feb 2013 10:48:08 +0100
Subject: RestoreJob scaffold

---
 config/locales/views/restore_jobs/de.yml | 45 ++++++++++++++++++++++++++++++++
 config/locales/views/restore_jobs/en.yml | 45 ++++++++++++++++++++++++++++++++
 config/routes.rb                         |  2 ++
 3 files changed, 92 insertions(+)
 create mode 100644 config/locales/views/restore_jobs/de.yml
 create mode 100644 config/locales/views/restore_jobs/en.yml

(limited to 'config')

diff --git a/config/locales/views/restore_jobs/de.yml b/config/locales/views/restore_jobs/de.yml
new file mode 100644
index 0000000..18ee349
--- /dev/null
+++ b/config/locales/views/restore_jobs/de.yml
@@ -0,0 +1,45 @@
+de:
+  restore_jobs:
+    name: 'Restore Auftrag'
+    controller:
+      successfuly_created: 'Restore Auftrag wurde angelegt.'
+      successfuly_updated: 'Restore Auftrag wurde aktualisiert.'
+      successfuly_destroyed: 'Restore Auftrag wurde gelöscht.'
+    index:
+      page_title: 'Liste Restore Aufträge'
+      state: 'Status'
+      backup_file: 'Backup Datei'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Restore Auftrag'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Restore Auftrag neu anlegen für %{resource}'
+    show:
+      page_title: 'Restore Auftrag bearbeiten'
+      state: 'Status'
+      backup_file: 'Backup Datei'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    new:
+      page_title: 'Restore Auftrag neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Restore Auftrag bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      state:
+        label: 'Status'
+        hint: ''
+      backup_file:
+        label: 'Backup Datei'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/restore_jobs/en.yml b/config/locales/views/restore_jobs/en.yml
new file mode 100644
index 0000000..d75de95
--- /dev/null
+++ b/config/locales/views/restore_jobs/en.yml
@@ -0,0 +1,45 @@
+en:
+  restore_jobs:
+    name: 'Restorejob'
+    controller:
+      successfuly_created: 'Successfully created Restorejob.'
+      successfuly_updated: 'Successfully updated Restorejob.'
+      successfuly_destroyed: 'Successfully destroyed Restorejob.'
+    index:
+      page_title: 'Listing Restorejob'
+      state: 'State'
+      backup_file: 'Backup file'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Restorejob?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Restorejob for %{resource}'
+    show:
+      page_title: 'Show Restorejob'
+      state: 'State'
+      backup_file: 'Backup file'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Restorejob'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Restorejob'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      state:
+        label: 'State'
+        hint: ''
+      backup_file:
+        label: 'Backup file'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 03fd4cf..30a461a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,7 @@
 Gemeinschaft42c::Application.routes.draw do
 
+  resources :restore_jobs
+
   resources :groups do
     resources :group_memberships
     resources :group_permissions
-- 
cgit v1.2.3


From 36919fb419a40688daa97e36734f579488cb56e2 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 26 Feb 2013 14:06:27 +0100
Subject: Restore and Backup fixes.

---
 config/backup.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/backup.rb b/config/backup.rb
index aa8ade3..1c79c04 100644
--- a/config/backup.rb
+++ b/config/backup.rb
@@ -24,6 +24,7 @@ Backup::Model.new(:GS5, 'GS5 backup') do
     db.host               = "localhost"
     db.port               = 3306
     db.socket             = "/var/run/mysqld/mysqld.sock"
+    db.skip_tables        = ["backup_jobs", "restore_jobs"]
   end
 
   ##
-- 
cgit v1.2.3


From 0a976c6b463288df4a9516bbd08f6232a37d427c Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Tue, 26 Feb 2013 09:21:34 -0500
Subject: enable tel: handling for sip_accounts

---
 config/locales/views/sip_accounts/de.yml | 2 ++
 config/locales/views/sip_accounts/en.yml | 2 ++
 config/routes.rb                         | 3 +++
 3 files changed, 7 insertions(+)

(limited to 'config')

diff --git a/config/locales/views/sip_accounts/de.yml b/config/locales/views/sip_accounts/de.yml
index 7a7e540..2b4939b 100644
--- a/config/locales/views/sip_accounts/de.yml
+++ b/config/locales/views/sip_accounts/de.yml
@@ -41,6 +41,8 @@ de:
       registration: 'Registrierung'
       expires: 'Läuft ab'
       user_agent: 'User Agent'
+      tel_protocol: 'TEL Protokoll'
+      register_tel_protocol: 'Für tel: URLs registrieren'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie diesen SIP-Account löschen möchten?'
         destroy: 'Löschen'
diff --git a/config/locales/views/sip_accounts/en.yml b/config/locales/views/sip_accounts/en.yml
index 35d5456..78d20c2 100644
--- a/config/locales/views/sip_accounts/en.yml
+++ b/config/locales/views/sip_accounts/en.yml
@@ -41,6 +41,8 @@ en:
       registration: 'Registration'
       expires: 'Expires'
       user_agent: 'User Agent'
+      tel_protocol: 'TEL Protocol'
+      register_tel_protocol: 'Register for tel: URLs with browser'
       actions:
         confirm_destroy: 'Are you sure you want to delete this SIP account?'
         destroy: 'Delete'
diff --git a/config/routes.rb b/config/routes.rb
index b6943ab..16133d2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -274,6 +274,9 @@ Gemeinschaft42c::Application.routes.draw do
       end
     end
     resources :voicemail_settings
+    member do
+      get 'call'
+    end
   end
 
   resources :phones, :only => [] do
-- 
cgit v1.2.3


From df0bc9db9cdbf9bfbc92a5f1f00e57fc0e7d7792 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 26 Feb 2013 16:17:06 +0100
Subject: Search box in the top navigation bar.

---
 config/locales/views/phone_book_entries/de.yml | 2 +-
 config/locales/views/phone_books/de.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/locales/views/phone_book_entries/de.yml b/config/locales/views/phone_book_entries/de.yml
index 2c77aa5..bdd0d67 100644
--- a/config/locales/views/phone_book_entries/de.yml
+++ b/config/locales/views/phone_book_entries/de.yml
@@ -6,7 +6,7 @@ de:
       successfuly_updated: 'Der Telefonbucheintrag "%{resource}" wurde aktualisiert.'
       successfuly_destroyed: 'Der Telefonbucheintrag wurde gelöscht.'
     index:
-      page_title: 'Anzahl Telefonbucheinträge'
+      page_title: 'Telefonbucheinträge'
       phone_book_id: 'Telefonbuch'
       first_name: 'Vorname'
       middle_name: 'Zweiter Vorname'
diff --git a/config/locales/views/phone_books/de.yml b/config/locales/views/phone_books/de.yml
index fa93945..c7ba5c7 100644
--- a/config/locales/views/phone_books/de.yml
+++ b/config/locales/views/phone_books/de.yml
@@ -5,7 +5,7 @@ de:
       name: 'Firmentelefonbuch'
       description: 'Ein für alle Benutzer von %{resource} lesbares Telefonbuch.'
     private_phone_book:
-      name: 'Privates Telefonbuch von %{resource}'
+      name: 'Privates Telefonbuch'
       description: 'Ein privates Telefonbuch.'
     controller:
       successfuly_created: 'Ein neues Telefonbuch wurde erstellt.'
-- 
cgit v1.2.3


From c0b43dcfd3fe9dad487caaf85d0d021021d77313 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 26 Feb 2013 16:21:11 +0100
Subject: s/Software-Fax-Konto/Software-Fax/g #187

---
 config/locales/views/fax_accounts/de.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'config')

diff --git a/config/locales/views/fax_accounts/de.yml b/config/locales/views/fax_accounts/de.yml
index cc93a24..366f801 100644
--- a/config/locales/views/fax_accounts/de.yml
+++ b/config/locales/views/fax_accounts/de.yml
@@ -1,12 +1,12 @@
 de:
   fax_accounts:
-    name: 'Software-Fax-Konto'
+    name: 'Software-Fax'
     controller:
-      successfuly_created: 'Eine neues Software-Fax-Konto wurde erstellt.'
-      successfuly_updated: 'Das Software-Fax-Konto wurde aktualisiert.'
-      successfuly_destroyed: 'Das Software-Fax-Konto wurde gelöscht.'
+      successfuly_created: 'Eine neues Software-Fax wurde erstellt.'
+      successfuly_updated: 'Das Software-Fax wurde aktualisiert.'
+      successfuly_destroyed: 'Das Software-Fax wurde gelöscht.'
     index:
-      page_title: 'Software-Fax-Konten'
+      page_title: 'Software-Faxe'
       name: 'Name'
       station_id: 'Stations-ID'
       email: 'E-Mail'
@@ -19,28 +19,28 @@ de:
       last_update: 'Letzter Eintrag'
       send_a_fax: 'Fax versenden'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie dieses Software-Fax-Konto löschen möchten?'
+        confirm_destroy: 'Sind Sie sicher, dass Sie dieses Software-Fax löschen möchten?'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         show: 'Anzeigen'
         create: 'Neu anlegen'
         create_for: 'Neues Fax-Konto für %{resource} anlegen'
     show:
-      page_title: 'Software-Fax-Konto anzeigen'
+      page_title: 'Software-Fax anzeigen'
       name: 'Name'
       station_id: 'Stations-ID'
       email: 'E-Mail'
       days_till_auto_delete: 'Anzahl der Tage bis Faxe gelöscht werden'
       retries: 'Max. Anzahl von Sendeversuchen'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie dieses Software-Fax-Konto löschen möchten?'
+        confirm_destroy: 'Sind Sie sicher, dass Sie dieses Software-Fax löschen möchten?'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         view_all: 'Alle anzeigen'
     new:
-      page_title: 'Neues Software-Fax-Konto'
+      page_title: 'Neues Software-Fax'
     edit:
-      page_title: 'Software-Fax-Konto bearbeiten'
+      page_title: 'Software-Fax bearbeiten'
     form:
       name:
         label: 'Name'
-- 
cgit v1.2.3


From 18fd060156b725f744993f4cfd6cf0472bd8248c Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 26 Feb 2013 16:22:41 +0100
Subject: s/Fax versenden/versenden/ #187

---
 config/locales/views/fax_accounts/de.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/locales/views/fax_accounts/de.yml b/config/locales/views/fax_accounts/de.yml
index 366f801..8e6f954 100644
--- a/config/locales/views/fax_accounts/de.yml
+++ b/config/locales/views/fax_accounts/de.yml
@@ -17,7 +17,7 @@ de:
       sent: 'Gesendet'
       retries: 'Max. Anzahl von Sendeversuchen'
       last_update: 'Letzter Eintrag'
-      send_a_fax: 'Fax versenden'
+      send_a_fax: 'versenden'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie dieses Software-Fax löschen möchten?'
         destroy: 'Löschen'
-- 
cgit v1.2.3


From 5d5f3be8e3dd76d88bfca87c6af5175d39e6049c Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 26 Feb 2013 16:30:45 +0100
Subject: Don't show a star for required fields any more. closes #192

---
 config/initializers/simple_form.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 062f823..06dc271 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -145,6 +145,7 @@ SimpleForm.setup do |config|
 
   # How the label text should be generated altogether with the required text.
   # config.label_text = lambda { |label, required| "#{required} #{label}" }
+  config.label_text = lambda { |label, required| "#{label}" }
 
   # You can define the class to use on all labels. Default is nil.
   config.label_class = 'control-label'
-- 
cgit v1.2.3


From e1247c7232ffa9cda8bdf6cf731cc8d30127fd1c Mon Sep 17 00:00:00 2001
From: Julian Pawlowski <julian.pawlowski@gmail.com>
Date: Tue, 26 Feb 2013 16:55:11 +0100
Subject: should be possible to run the ruby script directly as environment
 should allow this, lets see

---
 config/schedule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/schedule.rb b/config/schedule.rb
index 94603f1..f2c1a09 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -7,7 +7,7 @@ end
 # Auto-Reboot of Phones which should be rebootet
 #
 every 1.day, :at => '2:30 am' do
-  command "/opt/GS5/script/logout_phones.sh"
+  command "/opt/GS5/script/logout_phones"
 end
 
 # Learn more: http://github.com/javan/whenever
-- 
cgit v1.2.3


From 5053adc7c549830acda4d1218efa76f44e107a8a Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 27 Feb 2013 06:51:08 +0100
Subject: Don't store the fax_thumbnails in the backup. Plus recreate them at
 restore.

---
 config/backup.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/backup.rb b/config/backup.rb
index 1c79c04..2a866ef 100644
--- a/config/backup.rb
+++ b/config/backup.rb
@@ -24,7 +24,7 @@ Backup::Model.new(:GS5, 'GS5 backup') do
     db.host               = "localhost"
     db.port               = 3306
     db.socket             = "/var/run/mysqld/mysqld.sock"
-    db.skip_tables        = ["backup_jobs", "restore_jobs"]
+    db.skip_tables        = ["backup_jobs", "restore_jobs", "fax_thumbnails"]
   end
 
   ##
-- 
cgit v1.2.3


From 15d5f410afafce67b61a27479a21546cebd48ed9 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 27 Feb 2013 10:23:26 +0100
Subject: Show a restore link in the setup navigation bar.

---
 config/locales/views/restore_jobs/de.yml | 2 +-
 config/locales/views/restore_jobs/en.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/locales/views/restore_jobs/de.yml b/config/locales/views/restore_jobs/de.yml
index 18ee349..3fdd72c 100644
--- a/config/locales/views/restore_jobs/de.yml
+++ b/config/locales/views/restore_jobs/de.yml
@@ -26,7 +26,7 @@ de:
         edit: 'Bearbeiten'
         view_all: 'Alle anzeigen'
     new:
-      page_title: 'Restore Auftrag neu anlegen'
+      page_title: 'Restore von einem Backup'
       actions:
         back_to_list: 'Zurück zur Übersicht'
     edit:
diff --git a/config/locales/views/restore_jobs/en.yml b/config/locales/views/restore_jobs/en.yml
index d75de95..636c335 100644
--- a/config/locales/views/restore_jobs/en.yml
+++ b/config/locales/views/restore_jobs/en.yml
@@ -26,7 +26,7 @@ en:
         edit: 'Edit'
         view_all: 'View All'
     new:
-      page_title: 'New Restorejob'
+      page_title: 'Restore from a backup'
       actions:
         back_to_list: 'Back to Index'
     edit:
-- 
cgit v1.2.3


From 1ae07d45144b46d8a88eed74ac9131c4d9c9e557 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 27 Feb 2013 10:27:12 +0100
Subject: Only do a backup of specific file extensions (faxes).

---
 config/backup.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/backup.rb b/config/backup.rb
index 2a866ef..04cadb9 100644
--- a/config/backup.rb
+++ b/config/backup.rb
@@ -32,7 +32,9 @@ Backup::Model.new(:GS5, 'GS5 backup') do
   #
   if File.exists?('/var/opt/gemeinschaft/fax')
     archive :faxes do |archive|
-      archive.add     '/var/opt/gemeinschaft/fax'
+      archive.add     '/var/opt/gemeinschaft/fax/in/*.pdf'
+      archive.add     '/var/opt/gemeinschaft/fax/out/*.pdf'
+      archive.add     '/var/opt/gemeinschaft/fax/out/*.tiff'
     end
   end
 
-- 
cgit v1.2.3


From 869562f6f7bce2e605186409adad5b4ca255439d Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 27 Feb 2013 10:39:35 +0100
Subject: Backup pdfs and tiffs of a fax.

---
 config/backup.rb | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'config')

diff --git a/config/backup.rb b/config/backup.rb
index 04cadb9..b50f7a8 100644
--- a/config/backup.rb
+++ b/config/backup.rb
@@ -32,9 +32,23 @@ Backup::Model.new(:GS5, 'GS5 backup') do
   #
   if File.exists?('/var/opt/gemeinschaft/fax')
     archive :faxes do |archive|
-      archive.add     '/var/opt/gemeinschaft/fax/in/*.pdf'
-      archive.add     '/var/opt/gemeinschaft/fax/out/*.pdf'
-      archive.add     '/var/opt/gemeinschaft/fax/out/*.tiff'
+      # Incoming faxes
+      #
+      Dir.glob("/var/opt/gemeinschaft/fax/in/**/*.pdf").each do |fax_file|
+        archive.add(fax_file)
+      end
+      Dir.glob("/var/opt/gemeinschaft/fax/in/**/*.tiff").each do |fax_file|
+        archive.add(fax_file)
+      end
+
+      # Outgoing faxes
+      #
+      Dir.glob("/var/opt/gemeinschaft/fax/out/**/*.pdf").each do |fax_file|
+        archive.add(fax_file)
+      end
+      Dir.glob("/var/opt/gemeinschaft/fax/out/**/*.tiff").each do |fax_file|
+        archive.add(fax_file)
+      end
     end
   end
 
@@ -58,6 +72,4 @@ Backup::Model.new(:GS5, 'GS5 backup') do
   # Gzip [Compressor]
   #
   compress_with Gzip
-
-end
-
+end
\ No newline at end of file
-- 
cgit v1.2.3


From ed0117210837dd1d0d2dbf403799b70225caf0cd Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Wed, 27 Feb 2013 06:04:50 -0500
Subject: calls views added

---
 config/locales/views/calls/de.yml | 37 +++++++++++++++++++++++++++++++++++++
 config/locales/views/calls/en.yml | 37 +++++++++++++++++++++++++++++++++++++
 config/routes.rb                  |  1 +
 3 files changed, 75 insertions(+)
 create mode 100644 config/locales/views/calls/de.yml
 create mode 100644 config/locales/views/calls/en.yml

(limited to 'config')

diff --git a/config/locales/views/calls/de.yml b/config/locales/views/calls/de.yml
new file mode 100644
index 0000000..1410e34
--- /dev/null
+++ b/config/locales/views/calls/de.yml
@@ -0,0 +1,37 @@
+de:
+  calls:
+    name: 'Anruf'
+    controller:
+      successfuly_created: 'Einen neue Anruf wurde erstellt.'
+      successfuly_updated: 'Der Anruf wurde aktualisiert.'
+      successfuly_destroyed: 'Der Anruf wurde aufgelegt.'
+    index:
+      page_title: 'Anrufe'
+      uuid: 'UUID'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie diese Anruf auflegen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neuer Anruf'
+        create_for: 'Neuer Anruf für %{resource}'
+    show:
+      page_title: 'Anruf'
+      uuid: 'UUID'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie diese Anruf auflegen möchten?'
+        destroy: 'Auflegen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle Anrufe anzeigen'
+    new:
+      page_title: 'Neuer Anruf'
+    edit:
+      page_title: 'Anruf bearbeiten'
+    form:
+      uuid:
+        label: 'UUID'
+        hint: ''
+      destination:
+        label: 'Ziel'
+        hint: ''
+      submit: 'Absenden'
diff --git a/config/locales/views/calls/en.yml b/config/locales/views/calls/en.yml
new file mode 100644
index 0000000..9161d03
--- /dev/null
+++ b/config/locales/views/calls/en.yml
@@ -0,0 +1,37 @@
+en:
+  calls:
+    name: 'Call'
+    controller:
+      successfuly_created: 'Successfully created call.'
+      successfuly_updated: 'Successfully updated call.'
+      successfuly_destroyed: 'Successfully hung up call.'
+    index:
+      page_title: 'Calls'
+      uuid: 'UUID'
+      actions:
+        confirm_destroy: 'Are you sure you want to drop this call?'
+        destroy: 'Hang up'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New call for sip account %{resource}'
+    show:
+      page_title: 'Call'
+      uuid: 'UUID'
+      actions:
+        confirm_destroy: 'Are you sure you want to drop this call?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View all calls'
+    new:
+      page_title: 'New call'
+    edit:
+      page_title: 'Editing call'
+    form:
+      uuid:
+        label: 'UUID'
+        hint: ''
+      destination:
+        label: 'Destination'
+        hint: ''
+      submit: 'Submit'
diff --git a/config/routes.rb b/config/routes.rb
index adff556..2fe1682 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -257,6 +257,7 @@ Gemeinschaft42c::Application.routes.draw do
     resources :softkeys
     resources :call_forwards
     resources :ringtones
+    resources :calls
     resources :call_histories do
       collection do
         delete 'destroy_multiple'
-- 
cgit v1.2.3