From fb3171defa40938b8bd85e0234ca58a1f032e0c3 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 10:43:16 +0100 Subject: Updated the README.md --- README.md | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a97ad3b..76bbae9 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,29 @@ GS5 === +Gemeinschaft 5 by the [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX. This Github repository is our development environment. -Gemeinschaft 5 by the [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX. +Bug reports +=========== +Please open a new issue to report a bug. Please don't forget to include the URL in case you report a view related problem. + +Feature requests +================ +Please open a new issue and mark it as a feature request. + +Roadmap +======= +We don't have a public roadmap. But we do track the future work with issues. So have a look at [https://github.com/amooma/GS5/issues](https://github.com/amooma/GS5/issues) for future features. License ======= -We use this repository to develop and we'd like to invite everybody to add new features or find bugs. There for the repository is not a private one. But the code in this repository is not GPL! Please go to [http://amooma.de/gemeinschaft/gs5](http://amooma.de/gemeinschaft/gs5) for a copy of this software with an other license. +We use this public repository to develop. Do not use this code on a production system! Do not give away this code to your clients! This code is strictly for development purposes and GS5 is not a GPL project. + +DO NOT USE CODE FROM THE CONTENT OF THIS REPOSITORY FOR A PRODUCTION SYSTEM! -DO NOT USE CODE FROM THIS REPO FOR A PRODUCTION SYSTEM! +You can download a free and stable version of GS5 for your production system at [http://amooma.de/gemeinschaft/gs5](http://amooma.de/gemeinschaft/gs5). Development How-to ================== -There is a master and a develop branch in this repository. If you are familiar with [http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model/) you are good to go. Please send a pull request and an e-mail to stefan.wintermeyer@amooma.de with some info about your code. Regular developer get access to the repository and a closed developer mailinglist. +There is a master and a develop branch in this repository. If you are familiar with [http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model/) you are good to go. Please send a pull request and an e-mail to stefan.wintermeyer@amooma.de with some info about your code. Regular developer get access to the repository, a closed developer mailinglist and hardware in case they need it. -We only accept code which was written 100% by you and were you grant us the rights for this code. \ No newline at end of file +We only accept code which was written 100% by you and were you grant us the rights for the code. \ No newline at end of file -- cgit v1.2.3 From c137c2cfcbbed99162927aecb12bd09842000c53 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 11:11:44 +0100 Subject: Fixed typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76bbae9..d0a758d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ GS5 === -Gemeinschaft 5 by the [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX. This Github repository is our development environment. +Gemeinschaft 5 by [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX. This Github repository is our development environment. Bug reports =========== -- cgit v1.2.3 From 76a2cbbeab405f466f0fd53d7da2bf7a2f98e6a3 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 11:18:00 +0100 Subject: Updated .gitignore --- .gitignore | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 873c732..65a18ad 100644 --- a/.gitignore +++ b/.gitignore @@ -31,9 +31,7 @@ tmp/ nbproject Thumbs.db - # Extra -.sass-cache .livereload # Dreamweaver added files @@ -60,20 +58,17 @@ tmp/**/* # Ignore fixtures. We use factory_girl. /test/fixtures/*.yml -ERD.pdf -ERD.png - /vendor/cache /vendor/bundle .settings/* /.idea # ignore Sass cache: -/.sass-cache -tmp/sass-cache -tmp/cache +.sass-cache +/tmp/sass-cache +/tmp/cache -public/assets +/public/assets # directory created by "bundle install --path ." (not needed anyway): /ruby @@ -84,7 +79,7 @@ public/assets /tmp # Images -public/uploads +/public/uploads # Freeswitch -misc/freeswitch/conf/freeswitch.serial -misc/freeswitch/scripts/ini/gateway_gateway1.ini +/misc/freeswitch/conf/freeswitch.serial +/misc/freeswitch/scripts/ini/gateway_gateway1.ini -- cgit v1.2.3 From 929bd5ac143f48542929a1c7afb67ec2d117467a Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 11:27:30 +0100 Subject: Updated AMOOMA's phone number. --- app/models/tenant.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/models/tenant.rb b/app/models/tenant.rb index dda94d8..66e50d3 100644 --- a/app/models/tenant.rb +++ b/app/models/tenant.rb @@ -228,12 +228,10 @@ class Tenant < ActiveRecord::Base :twitter_account => 'amooma_de', :facebook_account => 'https://www.facebook.com/AMOOMA.GmbH', ) - # This is the new 2013 phone number. - # - # amooma.phone_numbers.create( - # :name => 'Office', - # :number => '+4926228998900' - # ) + amooma.phone_numbers.create( + :name => 'Office', + :number => '+492622983440' + ) amooma.addresses.create( :street => 'Bachstr. 124', :zip_code => '56566', -- cgit v1.2.3 From 3a9b6dca8b930557429acd9d9d49c8cb53437f39 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 11:30:49 +0100 Subject: Added Wiki link. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index d0a758d..50fe13d 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ GS5 === Gemeinschaft 5 by [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX. This Github repository is our development environment. +Documentation +============= +Please have a look at our [Wiki](https://github.com/amooma/GS5/wiki). + Bug reports =========== Please open a new issue to report a bug. Please don't forget to include the URL in case you report a view related problem. -- cgit v1.2.3 From c8f3bc41866ca94119bcb1d3e04dbea6b93e86a8 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 13:13:16 +0100 Subject: Added missed icons. --- app/assets/icons/cellphone-32x.png | Bin 0 -> 1938 bytes app/assets/icons/clock-32x.png | Bin 0 -> 5968 bytes app/assets/icons/cross-16x.png | Bin 0 -> 3350 bytes app/assets/icons/facebook-32x.png | Bin 0 -> 402 bytes app/assets/icons/fax-32x.png | Bin 0 -> 5762 bytes app/assets/icons/gs_envelope_16x.png | Bin 0 -> 371 bytes app/assets/icons/gs_forward_16x.png | Bin 0 -> 301 bytes app/assets/icons/gs_missed_16x.png | Bin 0 -> 354 bytes app/assets/icons/gs_placed_16x.png | Bin 0 -> 397 bytes app/assets/icons/gs_received_16x.png | Bin 0 -> 390 bytes app/assets/icons/headphones-16x.png | Bin 0 -> 3285 bytes app/assets/icons/headphones-32x.png | Bin 0 -> 5906 bytes app/assets/icons/house-32x.png | Bin 0 -> 5741 bytes app/assets/icons/mic-32x.png | Bin 0 -> 5837 bytes app/assets/icons/microphone-16x.png | Bin 0 -> 3239 bytes app/assets/icons/microphone-32x.png | Bin 0 -> 5837 bytes app/assets/icons/mute-16x.png | Bin 0 -> 3349 bytes app/assets/icons/phone-down-32x.png | Bin 0 -> 5879 bytes app/assets/icons/phone-down-green-32x.png | Bin 0 -> 3426 bytes app/assets/icons/phone-down-grey-32x.png | Bin 0 -> 3283 bytes app/assets/icons/phone-down-red-32x.png | Bin 0 -> 3312 bytes app/assets/icons/phone-mobile-32x.png | Bin 0 -> 5509 bytes app/assets/icons/phone-up-32x.png | Bin 0 -> 5861 bytes app/assets/icons/search-13x16.png | Bin 0 -> 849 bytes app/assets/icons/skype-32x.png | Bin 0 -> 625 bytes app/assets/icons/star-16x.png | Bin 0 -> 3379 bytes app/assets/icons/suitcase-32x.png | Bin 0 -> 5550 bytes app/assets/icons/tag-16x.png | Bin 0 -> 3286 bytes app/assets/icons/twitter-32x.png | Bin 0 -> 397 bytes app/assets/icons/unmute-16x.png | Bin 0 -> 3373 bytes app/assets/icons/user-16x.png | Bin 0 -> 3287 bytes app/assets/icons/user-female-16x.png | Bin 0 -> 1680 bytes app/assets/icons/user-male-16x.png | Bin 0 -> 1559 bytes 33 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/icons/cellphone-32x.png create mode 100644 app/assets/icons/clock-32x.png create mode 100644 app/assets/icons/cross-16x.png create mode 100644 app/assets/icons/facebook-32x.png create mode 100644 app/assets/icons/fax-32x.png create mode 100644 app/assets/icons/gs_envelope_16x.png create mode 100644 app/assets/icons/gs_forward_16x.png create mode 100644 app/assets/icons/gs_missed_16x.png create mode 100644 app/assets/icons/gs_placed_16x.png create mode 100644 app/assets/icons/gs_received_16x.png create mode 100644 app/assets/icons/headphones-16x.png create mode 100644 app/assets/icons/headphones-32x.png create mode 100644 app/assets/icons/house-32x.png create mode 100644 app/assets/icons/mic-32x.png create mode 100644 app/assets/icons/microphone-16x.png create mode 100644 app/assets/icons/microphone-32x.png create mode 100644 app/assets/icons/mute-16x.png create mode 100644 app/assets/icons/phone-down-32x.png create mode 100644 app/assets/icons/phone-down-green-32x.png create mode 100644 app/assets/icons/phone-down-grey-32x.png create mode 100644 app/assets/icons/phone-down-red-32x.png create mode 100644 app/assets/icons/phone-mobile-32x.png create mode 100644 app/assets/icons/phone-up-32x.png create mode 100644 app/assets/icons/search-13x16.png create mode 100644 app/assets/icons/skype-32x.png create mode 100644 app/assets/icons/star-16x.png create mode 100644 app/assets/icons/suitcase-32x.png create mode 100644 app/assets/icons/tag-16x.png create mode 100644 app/assets/icons/twitter-32x.png create mode 100644 app/assets/icons/unmute-16x.png create mode 100644 app/assets/icons/user-16x.png create mode 100644 app/assets/icons/user-female-16x.png create mode 100644 app/assets/icons/user-male-16x.png diff --git a/app/assets/icons/cellphone-32x.png b/app/assets/icons/cellphone-32x.png new file mode 100644 index 0000000..cfc41f5 Binary files /dev/null and b/app/assets/icons/cellphone-32x.png differ diff --git a/app/assets/icons/clock-32x.png b/app/assets/icons/clock-32x.png new file mode 100644 index 0000000..c076042 Binary files /dev/null and b/app/assets/icons/clock-32x.png differ diff --git a/app/assets/icons/cross-16x.png b/app/assets/icons/cross-16x.png new file mode 100644 index 0000000..e22ed6f Binary files /dev/null and b/app/assets/icons/cross-16x.png differ diff --git a/app/assets/icons/facebook-32x.png b/app/assets/icons/facebook-32x.png new file mode 100644 index 0000000..08fa0f7 Binary files /dev/null and b/app/assets/icons/facebook-32x.png differ diff --git a/app/assets/icons/fax-32x.png b/app/assets/icons/fax-32x.png new file mode 100644 index 0000000..b05ee59 Binary files /dev/null and b/app/assets/icons/fax-32x.png differ diff --git a/app/assets/icons/gs_envelope_16x.png b/app/assets/icons/gs_envelope_16x.png new file mode 100644 index 0000000..6a82ade Binary files /dev/null and b/app/assets/icons/gs_envelope_16x.png differ diff --git a/app/assets/icons/gs_forward_16x.png b/app/assets/icons/gs_forward_16x.png new file mode 100644 index 0000000..13c57eb Binary files /dev/null and b/app/assets/icons/gs_forward_16x.png differ diff --git a/app/assets/icons/gs_missed_16x.png b/app/assets/icons/gs_missed_16x.png new file mode 100644 index 0000000..0b3b706 Binary files /dev/null and b/app/assets/icons/gs_missed_16x.png differ diff --git a/app/assets/icons/gs_placed_16x.png b/app/assets/icons/gs_placed_16x.png new file mode 100644 index 0000000..b5065e9 Binary files /dev/null and b/app/assets/icons/gs_placed_16x.png differ diff --git a/app/assets/icons/gs_received_16x.png b/app/assets/icons/gs_received_16x.png new file mode 100644 index 0000000..cd40c1a Binary files /dev/null and b/app/assets/icons/gs_received_16x.png differ diff --git a/app/assets/icons/headphones-16x.png b/app/assets/icons/headphones-16x.png new file mode 100644 index 0000000..dee8346 Binary files /dev/null and b/app/assets/icons/headphones-16x.png differ diff --git a/app/assets/icons/headphones-32x.png b/app/assets/icons/headphones-32x.png new file mode 100644 index 0000000..89a5df7 Binary files /dev/null and b/app/assets/icons/headphones-32x.png differ diff --git a/app/assets/icons/house-32x.png b/app/assets/icons/house-32x.png new file mode 100644 index 0000000..b112915 Binary files /dev/null and b/app/assets/icons/house-32x.png differ diff --git a/app/assets/icons/mic-32x.png b/app/assets/icons/mic-32x.png new file mode 100644 index 0000000..30c4531 Binary files /dev/null and b/app/assets/icons/mic-32x.png differ diff --git a/app/assets/icons/microphone-16x.png b/app/assets/icons/microphone-16x.png new file mode 100644 index 0000000..b62422d Binary files /dev/null and b/app/assets/icons/microphone-16x.png differ diff --git a/app/assets/icons/microphone-32x.png b/app/assets/icons/microphone-32x.png new file mode 100644 index 0000000..30c4531 Binary files /dev/null and b/app/assets/icons/microphone-32x.png differ diff --git a/app/assets/icons/mute-16x.png b/app/assets/icons/mute-16x.png new file mode 100644 index 0000000..0656f3f Binary files /dev/null and b/app/assets/icons/mute-16x.png differ diff --git a/app/assets/icons/phone-down-32x.png b/app/assets/icons/phone-down-32x.png new file mode 100644 index 0000000..38c3560 Binary files /dev/null and b/app/assets/icons/phone-down-32x.png differ diff --git a/app/assets/icons/phone-down-green-32x.png b/app/assets/icons/phone-down-green-32x.png new file mode 100644 index 0000000..9f21d45 Binary files /dev/null and b/app/assets/icons/phone-down-green-32x.png differ diff --git a/app/assets/icons/phone-down-grey-32x.png b/app/assets/icons/phone-down-grey-32x.png new file mode 100644 index 0000000..2b604ce Binary files /dev/null and b/app/assets/icons/phone-down-grey-32x.png differ diff --git a/app/assets/icons/phone-down-red-32x.png b/app/assets/icons/phone-down-red-32x.png new file mode 100644 index 0000000..f4cbde7 Binary files /dev/null and b/app/assets/icons/phone-down-red-32x.png differ diff --git a/app/assets/icons/phone-mobile-32x.png b/app/assets/icons/phone-mobile-32x.png new file mode 100644 index 0000000..b373e1a Binary files /dev/null and b/app/assets/icons/phone-mobile-32x.png differ diff --git a/app/assets/icons/phone-up-32x.png b/app/assets/icons/phone-up-32x.png new file mode 100644 index 0000000..9b765c7 Binary files /dev/null and b/app/assets/icons/phone-up-32x.png differ diff --git a/app/assets/icons/search-13x16.png b/app/assets/icons/search-13x16.png new file mode 100644 index 0000000..16aa3c6 Binary files /dev/null and b/app/assets/icons/search-13x16.png differ diff --git a/app/assets/icons/skype-32x.png b/app/assets/icons/skype-32x.png new file mode 100644 index 0000000..c3b0978 Binary files /dev/null and b/app/assets/icons/skype-32x.png differ diff --git a/app/assets/icons/star-16x.png b/app/assets/icons/star-16x.png new file mode 100644 index 0000000..6b16932 Binary files /dev/null and b/app/assets/icons/star-16x.png differ diff --git a/app/assets/icons/suitcase-32x.png b/app/assets/icons/suitcase-32x.png new file mode 100644 index 0000000..f53daa9 Binary files /dev/null and b/app/assets/icons/suitcase-32x.png differ diff --git a/app/assets/icons/tag-16x.png b/app/assets/icons/tag-16x.png new file mode 100644 index 0000000..b4522d7 Binary files /dev/null and b/app/assets/icons/tag-16x.png differ diff --git a/app/assets/icons/twitter-32x.png b/app/assets/icons/twitter-32x.png new file mode 100644 index 0000000..51351a7 Binary files /dev/null and b/app/assets/icons/twitter-32x.png differ diff --git a/app/assets/icons/unmute-16x.png b/app/assets/icons/unmute-16x.png new file mode 100644 index 0000000..e9dfde0 Binary files /dev/null and b/app/assets/icons/unmute-16x.png differ diff --git a/app/assets/icons/user-16x.png b/app/assets/icons/user-16x.png new file mode 100644 index 0000000..909403a Binary files /dev/null and b/app/assets/icons/user-16x.png differ diff --git a/app/assets/icons/user-female-16x.png b/app/assets/icons/user-female-16x.png new file mode 100644 index 0000000..38dde34 Binary files /dev/null and b/app/assets/icons/user-female-16x.png differ diff --git a/app/assets/icons/user-male-16x.png b/app/assets/icons/user-male-16x.png new file mode 100644 index 0000000..e03fd0f Binary files /dev/null and b/app/assets/icons/user-male-16x.png differ -- cgit v1.2.3 From fef1d002d562ea3df56d0bd1e9dbad4032fd6404 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 19:07:25 +0100 Subject: Set defaults for the voiceprompts. --- app/models/automatic_call_distributor.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/models/automatic_call_distributor.rb b/app/models/automatic_call_distributor.rb index 678e0eb..cd887d5 100644 --- a/app/models/automatic_call_distributor.rb +++ b/app/models/automatic_call_distributor.rb @@ -15,7 +15,17 @@ class AutomaticCallDistributor < ActiveRecord::Base JOIN_ON = ['agents_available', 'agents_active', 'always'] LEAVE_ON = ['no_agents_available_timeout', 'no_agents_active_timeout', 'no_agents_available', 'no_agents_active', 'timeout', 'never'] + after_initialize :set_defaults + def to_s self.name end + + private + def set_defaults + self.announce_call_agents ||= 'ivr/ivr-stay_on_line_call_answered_momentarily.wav' + self.greeting ||= 'ivr/ivr-thank_you_for_calling.wav' + self.goodbye ||= 'ivr/ivr-thank_you_for_calling.wav' + self.music ||= 'local_stream://mohl' + end end -- cgit v1.2.3 From 65c809b3396a99782b18d70ad793e950bc65795e Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 19:13:08 +0100 Subject: Removed UUID from the show view. --- app/views/automatic_call_distributors/show.html.haml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/automatic_call_distributors/show.html.haml b/app/views/automatic_call_distributors/show.html.haml index e5bf785..53ce127 100644 --- a/app/views/automatic_call_distributors/show.html.haml +++ b/app/views/automatic_call_distributors/show.html.haml @@ -1,9 +1,6 @@ - title t("automatic_call_distributors.show.page_title") %table - %tr - %th= t('automatic_call_distributors.show.uuid') + ":" - %td= @automatic_call_distributor.uuid %tr %th= t('automatic_call_distributors.show.name') + ":" %td= @automatic_call_distributor.name -- cgit v1.2.3 From 9cbab740703bf01382431004b59ddf4cd60041be Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 20:04:36 +0100 Subject: Moved assets to the right directory and fixed a view. --- app/assets/icons/cellphone-32x.png | Bin 1938 -> 0 bytes app/assets/icons/clock-32x.png | Bin 5968 -> 0 bytes app/assets/icons/cross-16x.png | Bin 3350 -> 0 bytes app/assets/icons/facebook-32x.png | Bin 402 -> 0 bytes app/assets/icons/fax-32x.png | Bin 5762 -> 0 bytes app/assets/icons/gs_envelope_16x.png | Bin 371 -> 0 bytes app/assets/icons/gs_forward_16x.png | Bin 301 -> 0 bytes app/assets/icons/gs_missed_16x.png | Bin 354 -> 0 bytes app/assets/icons/gs_placed_16x.png | Bin 397 -> 0 bytes app/assets/icons/gs_received_16x.png | Bin 390 -> 0 bytes app/assets/icons/headphones-16x.png | Bin 3285 -> 0 bytes app/assets/icons/headphones-32x.png | Bin 5906 -> 0 bytes app/assets/icons/house-32x.png | Bin 5741 -> 0 bytes app/assets/icons/mic-32x.png | Bin 5837 -> 0 bytes app/assets/icons/microphone-16x.png | Bin 3239 -> 0 bytes app/assets/icons/microphone-32x.png | Bin 5837 -> 0 bytes app/assets/icons/mute-16x.png | Bin 3349 -> 0 bytes app/assets/icons/phone-down-32x.png | Bin 5879 -> 0 bytes app/assets/icons/phone-down-green-32x.png | Bin 3426 -> 0 bytes app/assets/icons/phone-down-grey-32x.png | Bin 3283 -> 0 bytes app/assets/icons/phone-down-red-32x.png | Bin 3312 -> 0 bytes app/assets/icons/phone-mobile-32x.png | Bin 5509 -> 0 bytes app/assets/icons/phone-up-32x.png | Bin 5861 -> 0 bytes app/assets/icons/search-13x16.png | Bin 849 -> 0 bytes app/assets/icons/skype-32x.png | Bin 625 -> 0 bytes app/assets/icons/star-16x.png | Bin 3379 -> 0 bytes app/assets/icons/suitcase-32x.png | Bin 5550 -> 0 bytes app/assets/icons/tag-16x.png | Bin 3286 -> 0 bytes app/assets/icons/twitter-32x.png | Bin 397 -> 0 bytes app/assets/icons/unmute-16x.png | Bin 3373 -> 0 bytes app/assets/icons/user-16x.png | Bin 3287 -> 0 bytes app/assets/icons/user-female-16x.png | Bin 1680 -> 0 bytes app/assets/icons/user-male-16x.png | Bin 1559 -> 0 bytes app/views/sip_accounts/_index_core.html.haml | 4 ++-- 34 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 app/assets/icons/cellphone-32x.png delete mode 100644 app/assets/icons/clock-32x.png delete mode 100644 app/assets/icons/cross-16x.png delete mode 100644 app/assets/icons/facebook-32x.png delete mode 100644 app/assets/icons/fax-32x.png delete mode 100644 app/assets/icons/gs_envelope_16x.png delete mode 100644 app/assets/icons/gs_forward_16x.png delete mode 100644 app/assets/icons/gs_missed_16x.png delete mode 100644 app/assets/icons/gs_placed_16x.png delete mode 100644 app/assets/icons/gs_received_16x.png delete mode 100644 app/assets/icons/headphones-16x.png delete mode 100644 app/assets/icons/headphones-32x.png delete mode 100644 app/assets/icons/house-32x.png delete mode 100644 app/assets/icons/mic-32x.png delete mode 100644 app/assets/icons/microphone-16x.png delete mode 100644 app/assets/icons/microphone-32x.png delete mode 100644 app/assets/icons/mute-16x.png delete mode 100644 app/assets/icons/phone-down-32x.png delete mode 100644 app/assets/icons/phone-down-green-32x.png delete mode 100644 app/assets/icons/phone-down-grey-32x.png delete mode 100644 app/assets/icons/phone-down-red-32x.png delete mode 100644 app/assets/icons/phone-mobile-32x.png delete mode 100644 app/assets/icons/phone-up-32x.png delete mode 100644 app/assets/icons/search-13x16.png delete mode 100644 app/assets/icons/skype-32x.png delete mode 100644 app/assets/icons/star-16x.png delete mode 100644 app/assets/icons/suitcase-32x.png delete mode 100644 app/assets/icons/tag-16x.png delete mode 100644 app/assets/icons/twitter-32x.png delete mode 100644 app/assets/icons/unmute-16x.png delete mode 100644 app/assets/icons/user-16x.png delete mode 100644 app/assets/icons/user-female-16x.png delete mode 100644 app/assets/icons/user-male-16x.png diff --git a/app/assets/icons/cellphone-32x.png b/app/assets/icons/cellphone-32x.png deleted file mode 100644 index cfc41f5..0000000 Binary files a/app/assets/icons/cellphone-32x.png and /dev/null differ diff --git a/app/assets/icons/clock-32x.png b/app/assets/icons/clock-32x.png deleted file mode 100644 index c076042..0000000 Binary files a/app/assets/icons/clock-32x.png and /dev/null differ diff --git a/app/assets/icons/cross-16x.png b/app/assets/icons/cross-16x.png deleted file mode 100644 index e22ed6f..0000000 Binary files a/app/assets/icons/cross-16x.png and /dev/null differ diff --git a/app/assets/icons/facebook-32x.png b/app/assets/icons/facebook-32x.png deleted file mode 100644 index 08fa0f7..0000000 Binary files a/app/assets/icons/facebook-32x.png and /dev/null differ diff --git a/app/assets/icons/fax-32x.png b/app/assets/icons/fax-32x.png deleted file mode 100644 index b05ee59..0000000 Binary files a/app/assets/icons/fax-32x.png and /dev/null differ diff --git a/app/assets/icons/gs_envelope_16x.png b/app/assets/icons/gs_envelope_16x.png deleted file mode 100644 index 6a82ade..0000000 Binary files a/app/assets/icons/gs_envelope_16x.png and /dev/null differ diff --git a/app/assets/icons/gs_forward_16x.png b/app/assets/icons/gs_forward_16x.png deleted file mode 100644 index 13c57eb..0000000 Binary files a/app/assets/icons/gs_forward_16x.png and /dev/null differ diff --git a/app/assets/icons/gs_missed_16x.png b/app/assets/icons/gs_missed_16x.png deleted file mode 100644 index 0b3b706..0000000 Binary files a/app/assets/icons/gs_missed_16x.png and /dev/null differ diff --git a/app/assets/icons/gs_placed_16x.png b/app/assets/icons/gs_placed_16x.png deleted file mode 100644 index b5065e9..0000000 Binary files a/app/assets/icons/gs_placed_16x.png and /dev/null differ diff --git a/app/assets/icons/gs_received_16x.png b/app/assets/icons/gs_received_16x.png deleted file mode 100644 index cd40c1a..0000000 Binary files a/app/assets/icons/gs_received_16x.png and /dev/null differ diff --git a/app/assets/icons/headphones-16x.png b/app/assets/icons/headphones-16x.png deleted file mode 100644 index dee8346..0000000 Binary files a/app/assets/icons/headphones-16x.png and /dev/null differ diff --git a/app/assets/icons/headphones-32x.png b/app/assets/icons/headphones-32x.png deleted file mode 100644 index 89a5df7..0000000 Binary files a/app/assets/icons/headphones-32x.png and /dev/null differ diff --git a/app/assets/icons/house-32x.png b/app/assets/icons/house-32x.png deleted file mode 100644 index b112915..0000000 Binary files a/app/assets/icons/house-32x.png and /dev/null differ diff --git a/app/assets/icons/mic-32x.png b/app/assets/icons/mic-32x.png deleted file mode 100644 index 30c4531..0000000 Binary files a/app/assets/icons/mic-32x.png and /dev/null differ diff --git a/app/assets/icons/microphone-16x.png b/app/assets/icons/microphone-16x.png deleted file mode 100644 index b62422d..0000000 Binary files a/app/assets/icons/microphone-16x.png and /dev/null differ diff --git a/app/assets/icons/microphone-32x.png b/app/assets/icons/microphone-32x.png deleted file mode 100644 index 30c4531..0000000 Binary files a/app/assets/icons/microphone-32x.png and /dev/null differ diff --git a/app/assets/icons/mute-16x.png b/app/assets/icons/mute-16x.png deleted file mode 100644 index 0656f3f..0000000 Binary files a/app/assets/icons/mute-16x.png and /dev/null differ diff --git a/app/assets/icons/phone-down-32x.png b/app/assets/icons/phone-down-32x.png deleted file mode 100644 index 38c3560..0000000 Binary files a/app/assets/icons/phone-down-32x.png and /dev/null differ diff --git a/app/assets/icons/phone-down-green-32x.png b/app/assets/icons/phone-down-green-32x.png deleted file mode 100644 index 9f21d45..0000000 Binary files a/app/assets/icons/phone-down-green-32x.png and /dev/null differ diff --git a/app/assets/icons/phone-down-grey-32x.png b/app/assets/icons/phone-down-grey-32x.png deleted file mode 100644 index 2b604ce..0000000 Binary files a/app/assets/icons/phone-down-grey-32x.png and /dev/null differ diff --git a/app/assets/icons/phone-down-red-32x.png b/app/assets/icons/phone-down-red-32x.png deleted file mode 100644 index f4cbde7..0000000 Binary files a/app/assets/icons/phone-down-red-32x.png and /dev/null differ diff --git a/app/assets/icons/phone-mobile-32x.png b/app/assets/icons/phone-mobile-32x.png deleted file mode 100644 index b373e1a..0000000 Binary files a/app/assets/icons/phone-mobile-32x.png and /dev/null differ diff --git a/app/assets/icons/phone-up-32x.png b/app/assets/icons/phone-up-32x.png deleted file mode 100644 index 9b765c7..0000000 Binary files a/app/assets/icons/phone-up-32x.png and /dev/null differ diff --git a/app/assets/icons/search-13x16.png b/app/assets/icons/search-13x16.png deleted file mode 100644 index 16aa3c6..0000000 Binary files a/app/assets/icons/search-13x16.png and /dev/null differ diff --git a/app/assets/icons/skype-32x.png b/app/assets/icons/skype-32x.png deleted file mode 100644 index c3b0978..0000000 Binary files a/app/assets/icons/skype-32x.png and /dev/null differ diff --git a/app/assets/icons/star-16x.png b/app/assets/icons/star-16x.png deleted file mode 100644 index 6b16932..0000000 Binary files a/app/assets/icons/star-16x.png and /dev/null differ diff --git a/app/assets/icons/suitcase-32x.png b/app/assets/icons/suitcase-32x.png deleted file mode 100644 index f53daa9..0000000 Binary files a/app/assets/icons/suitcase-32x.png and /dev/null differ diff --git a/app/assets/icons/tag-16x.png b/app/assets/icons/tag-16x.png deleted file mode 100644 index b4522d7..0000000 Binary files a/app/assets/icons/tag-16x.png and /dev/null differ diff --git a/app/assets/icons/twitter-32x.png b/app/assets/icons/twitter-32x.png deleted file mode 100644 index 51351a7..0000000 Binary files a/app/assets/icons/twitter-32x.png and /dev/null differ diff --git a/app/assets/icons/unmute-16x.png b/app/assets/icons/unmute-16x.png deleted file mode 100644 index e9dfde0..0000000 Binary files a/app/assets/icons/unmute-16x.png and /dev/null differ diff --git a/app/assets/icons/user-16x.png b/app/assets/icons/user-16x.png deleted file mode 100644 index 909403a..0000000 Binary files a/app/assets/icons/user-16x.png and /dev/null differ diff --git a/app/assets/icons/user-female-16x.png b/app/assets/icons/user-female-16x.png deleted file mode 100644 index 38dde34..0000000 Binary files a/app/assets/icons/user-female-16x.png and /dev/null differ diff --git a/app/assets/icons/user-male-16x.png b/app/assets/icons/user-male-16x.png deleted file mode 100644 index e03fd0f..0000000 Binary files a/app/assets/icons/user-male-16x.png and /dev/null differ diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml index 7f8dcd2..69c9302 100644 --- a/app/views/sip_accounts/_index_core.html.haml +++ b/app/views/sip_accounts/_index_core.html.haml @@ -10,9 +10,9 @@ %tr{:class => cycle('odd', 'even')} %td - if sip_account.registration - %img{:src => '/assets/icons/phone-down-green-32x.png'} + =image_tag 'icons/phone-down-green-32x.png' - else - %img{:src => '/assets/icons/phone-down-grey-32x.png'} + =image_tag 'icons/phone-down-grey-32x.png' %td = sip_account.caller_name - phone_numbers = sip_account.phone_numbers -- cgit v1.2.3 From 725dee030e2a4a80a9f3f91f2cc18259a7a030f7 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 20:05:46 +0100 Subject: Move assets to the correct directory. --- app/assets/images/icons/gs_envelope_16x.png | Bin 0 -> 371 bytes app/assets/images/icons/gs_forward_16x.png | Bin 0 -> 301 bytes app/assets/images/icons/gs_missed_16x.png | Bin 0 -> 354 bytes app/assets/images/icons/gs_placed_16x.png | Bin 0 -> 397 bytes app/assets/images/icons/gs_received_16x.png | Bin 0 -> 390 bytes app/assets/images/icons/phone-down-green-32x.png | Bin 0 -> 3426 bytes app/assets/images/icons/phone-down-grey-32x.png | Bin 0 -> 3283 bytes app/assets/images/icons/phone-down-red-32x.png | Bin 0 -> 3312 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/icons/gs_envelope_16x.png create mode 100644 app/assets/images/icons/gs_forward_16x.png create mode 100644 app/assets/images/icons/gs_missed_16x.png create mode 100644 app/assets/images/icons/gs_placed_16x.png create mode 100644 app/assets/images/icons/gs_received_16x.png create mode 100644 app/assets/images/icons/phone-down-green-32x.png create mode 100644 app/assets/images/icons/phone-down-grey-32x.png create mode 100644 app/assets/images/icons/phone-down-red-32x.png diff --git a/app/assets/images/icons/gs_envelope_16x.png b/app/assets/images/icons/gs_envelope_16x.png new file mode 100644 index 0000000..6a82ade Binary files /dev/null and b/app/assets/images/icons/gs_envelope_16x.png differ diff --git a/app/assets/images/icons/gs_forward_16x.png b/app/assets/images/icons/gs_forward_16x.png new file mode 100644 index 0000000..13c57eb Binary files /dev/null and b/app/assets/images/icons/gs_forward_16x.png differ diff --git a/app/assets/images/icons/gs_missed_16x.png b/app/assets/images/icons/gs_missed_16x.png new file mode 100644 index 0000000..0b3b706 Binary files /dev/null and b/app/assets/images/icons/gs_missed_16x.png differ diff --git a/app/assets/images/icons/gs_placed_16x.png b/app/assets/images/icons/gs_placed_16x.png new file mode 100644 index 0000000..b5065e9 Binary files /dev/null and b/app/assets/images/icons/gs_placed_16x.png differ diff --git a/app/assets/images/icons/gs_received_16x.png b/app/assets/images/icons/gs_received_16x.png new file mode 100644 index 0000000..cd40c1a Binary files /dev/null and b/app/assets/images/icons/gs_received_16x.png differ diff --git a/app/assets/images/icons/phone-down-green-32x.png b/app/assets/images/icons/phone-down-green-32x.png new file mode 100644 index 0000000..9f21d45 Binary files /dev/null and b/app/assets/images/icons/phone-down-green-32x.png differ diff --git a/app/assets/images/icons/phone-down-grey-32x.png b/app/assets/images/icons/phone-down-grey-32x.png new file mode 100644 index 0000000..2b604ce Binary files /dev/null and b/app/assets/images/icons/phone-down-grey-32x.png differ diff --git a/app/assets/images/icons/phone-down-red-32x.png b/app/assets/images/icons/phone-down-red-32x.png new file mode 100644 index 0000000..f4cbde7 Binary files /dev/null and b/app/assets/images/icons/phone-down-red-32x.png differ -- cgit v1.2.3 From 50dfb97590e30fd7d6fa24d6c7afd65d04fa60d8 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 18 Dec 2012 20:28:23 +0100 Subject: Fixed links in phone_book_entry#show --- app/models/tenant.rb | 2 +- .../phone_book_entries/_index_core.de.html.haml | 6 ++++- app/views/phone_book_entries/_index_core.html.haml | 6 ++++- app/views/phone_book_entries/show.html.haml | 26 +++++----------------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/app/models/tenant.rb b/app/models/tenant.rb index 66e50d3..d9351b7 100644 --- a/app/models/tenant.rb +++ b/app/models/tenant.rb @@ -226,7 +226,7 @@ class Tenant < ActiveRecord::Base :description => "Hersteller von Gemeinschaft. Kommerziellen Support und Consulting für Gemeinschaft.", :homepage_organization => 'http://amooma.de', :twitter_account => 'amooma_de', - :facebook_account => 'https://www.facebook.com/AMOOMA.GmbH', + :facebook_account => 'AMOOMA.GmbH', ) amooma.phone_numbers.create( :name => 'Office', diff --git a/app/views/phone_book_entries/_index_core.de.html.haml b/app/views/phone_book_entries/_index_core.de.html.haml index 01be65f..0c6e74b 100644 --- a/app/views/phone_book_entries/_index_core.de.html.haml +++ b/app/views/phone_book_entries/_index_core.de.html.haml @@ -28,7 +28,11 @@ %td.extra - if !entry.description.blank? %strong Beschreibung: - %div= entry.description + %div + = entry.description + - if !entry.homepage_organization.blank? + %br + =link_to entry.homepage_organization, entry.homepage_organization - if can? :edit, entry %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry ) - if can? :destroy, entry diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml index d9cfe10..9054833 100644 --- a/app/views/phone_book_entries/_index_core.html.haml +++ b/app/views/phone_book_entries/_index_core.html.haml @@ -28,7 +28,11 @@ %td.extra - if !entry.description.blank? %strong Description: - %div= entry.description + %div + = entry.description + - if !entry.homepage_organization.blank? + %br + =link_to entry.homepage_organization, entry.homepage_organization - if can? :edit, entry %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry ) - if can? :destroy, entry diff --git a/app/views/phone_book_entries/show.html.haml b/app/views/phone_book_entries/show.html.haml index b6e8c6e..a9e1e8f 100644 --- a/app/views/phone_book_entries/show.html.haml +++ b/app/views/phone_book_entries/show.html.haml @@ -114,33 +114,17 @@ .widget.social - if !@phone_book_entry.homepage_organization.blank? .home - %a= @phone_book_entry.homepage_organization + =link_to @phone_book_entry.homepage_organization, @phone_book_entry.homepage_organization %span www - if !@phone_book_entry.homepage_personal.blank? .home - %a= @phone_book_entry.homepage_personal + =link_to @phone_book_entry.homepage_personal, @phone_book_entry.homepage_personal %span www - if !@phone_book_entry.twitter_account.blank? .twitter - %a= @phone_book_entry.twitter_account + =link_to @phone_book_entry.twitter_account, "https://twitter.com/#{@phone_book_entry.twitter_account}" %span Twitter - - if !@phone_book_entry.google_plus_account.blank? - .google_plus - %a= @phone_book_entry.google_plus_account - %span Google+ - if !@phone_book_entry.facebook_account.blank? .facebook - %a= @phone_book_entry.facebook_account - %span Facebook - - if !@phone_book_entry.xing_account.blank? - .xing - %a= @phone_book_entry.xing_account - %span Xing - - if !@phone_book_entry.linkedin_account.blank? - .linkedin - %a= @phone_book_entry.linkedin_account - %span LinkedIn - - if !@phone_book_entry.mobileme_account.blank? - .mobileme - %a= @phone_book_entry.mobileme_account - %span MobileMe + =link_to @phone_book_entry.facebook_account, "https://www.facebook.com/#{@phone_book_entry.facebook_account}" + %span Facebook \ No newline at end of file -- cgit v1.2.3 From b5c6d666f03b98f131fad7aa1ca13846eef5fc90 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Tue, 18 Dec 2012 22:42:49 +0100 Subject: fix language --- app/views/shared/_header.de.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_header.de.html.haml b/app/views/shared/_header.de.html.haml index c6205ae..10ad2a0 100644 --- a/app/views/shared/_header.de.html.haml +++ b/app/views/shared/_header.de.html.haml @@ -37,5 +37,5 @@ - else .user-context = link_to "Registrieren", sign_up_path - oder + or = link_to "Anmelden", log_in_path -- cgit v1.2.3 From 4666adb72cd6a0316f0c1c338bc26449cebdd125 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Wed, 19 Dec 2012 00:07:11 +0100 Subject: fix database default settings --- config/database.yml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/config/database.yml b/config/database.yml index 4ea8d4a..bd1748e 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,22 +1,29 @@ -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 +development: + adapter: mysql2 + encoding: utf8 + database: gemeinschaft + pool: 5 + username: gemeinschaft + password: gemeinschaft + socket: /var/run/mysqld/mysqld.sock + reconnect: true -production: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 +production: + adapter: mysql2 + encoding: utf8 + database: gemeinschaft + pool: 10 + username: gemeinschaft + password: gemeinschaft + socket: /var/run/mysqld/mysqld.sock + reconnect: true # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: - adapter: sqlite3 - database: db/test<%= ENV['TEST_ENV_NUMBER'] %>.sqlite3 - pool: 5 - timeout: 5000 - + adapter: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 \ No newline at end of file -- cgit v1.2.3 From f7b3642b0ee7027091fafc1bdf94ac1a309fefa3 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 20 Dec 2012 09:49:46 +0100 Subject: Create a GsNode entry. --- app/controllers/gemeinschaft_setups_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/gemeinschaft_setups_controller.rb b/app/controllers/gemeinschaft_setups_controller.rb index cafb8a3..e871862 100644 --- a/app/controllers/gemeinschaft_setups_controller.rb +++ b/app/controllers/gemeinschaft_setups_controller.rb @@ -26,6 +26,11 @@ class GemeinschaftSetupsController < ApplicationController :language_id => @gemeinschaft_setup.language_id, :description => t('gemeinschaft_setups.initial_setup.super_tenant_description'), ) + + # GsNode + GsNode.create(:name => 'Homebase', :ip_address => @gemeinschaft_setup.sip_domain.host, + :push_updates_to => false, :accepts_updates_from => false, + :site => 'Homebase', :element_name => 'Homebase') # Admin user = @gemeinschaft_setup.user @@ -35,7 +40,7 @@ class GemeinschaftSetupsController < ApplicationController # Create the Super-Tenant's group: super_tenant_super_admin_group = super_tenant.user_groups.create(:name => t('gemeinschaft_setups.initial_setup.super_admin_group_name')) super_tenant_super_admin_group.user_group_memberships.create(:user_id => user.id) - + # Auto-Login: session[:user_id] = user.id -- cgit v1.2.3