Projects
Kolab:16:Enterprise
kolab-hkccp
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 7
View file
kolab-hkccp.spec
Changed
@@ -3,7 +3,7 @@ %endif Name: kolab-hkccp -Version: 0.7.18.2 +Version: 0.7.19 Release: 1%{?dist} Summary: Hosted Kolab Customer Control Panel License: AGPLv3+ @@ -104,6 +104,9 @@ %attr(0770,apache,apache) %{_var}/log/%{name} %changelog +* Wed Oct 18 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.19-1 +- Check in version 0.7.19 + * Wed Aug 24 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.16-1 - Release of version 0.7.16
View file
kolab-hkccp-0.7.18.2.tar.gz/lib/Kolab/Hosted/Controller/SignupController.php -> kolab-hkccp-0.7.19.tar.gz/lib/Kolab/Hosted/Controller/SignupController.php
Changed
@@ -58,6 +58,8 @@ */ protected function action_signup_hosting() { + die; // disabled + // redirect to dashboard if already authenticated if ($this->user->authenticated()) { header('Location: ' . $this->url('dashboard'));
View file
kolab-hkccp-0.7.18.2.tar.gz/lib/Kolab/Hosted/Model/KolabUser.php -> kolab-hkccp-0.7.19.tar.gz/lib/Kolab/Hosted/Model/KolabUser.php
Changed
@@ -250,7 +250,7 @@ else if (!empty($account_prop['minlength']) && strlen($formdata['username']) < intval($account_prop['minlength'])) { $errors['username'] = T('form.minlength', array('min' => $account_prop['minlength'])); } - else if (preg_match('/[^a-zA-Z0-9-\.]/', $formdata['username'])) { + else if (preg_match('/[^a-zA-Z0-9_\.-]/', $formdata['username'])) { $errors['username'] = T('form.invalidchars'); } else if (empty($errors['domain'])) {
View file
kolab-hkccp-0.7.18.2.tar.gz/public_html/skins/ilovefs/localization/en.php -> kolab-hkccp-0.7.19.tar.gz/public_html/skins/ilovefs/localization/en.php
Changed
@@ -91,7 +91,6 @@ </ul>'; $texts['signup.hint.all'] = "* If for some reason you are unhappy with the service within the first 30 days, we will refund you if requested.<br> - ^ 6 month minimum commitment required for hosting accounts.<br> ** You will be invoiced in CHF, these currency conversions are displayed to give an estimated rate."; $texts['signup.hint.group'] = 'The effective invoice amount depends on the number of accounts created after signup and therefore is subject to change.'; $texts['signup.header'] = 'Hello, let\'s get you started on Kolab Now! Choose the account that\'s right for you, if you\'re unsure, just try the individual account as you can always upgrade later.';
View file
kolab-hkccp-0.7.18.2.tar.gz/public_html/skins/ilovefs/templates/include/signup.twig -> kolab-hkccp-0.7.19.tar.gz/public_html/skins/ilovefs/templates/include/signup.twig
Changed
@@ -239,7 +239,7 @@ {% for type in accounttypes %} {% set props = typeconfig[type] %} {% if props.signup == "true" %} -<div class="col-sm-4"> +<div class="col-sm-6"> <div class="pricing-block type-individual" style="font-size:16px!important; margin-left:0px; margin-right:0px;"> <img src="{{ asset('/images/icon-' ~ type ~ '.png') }}" width="150" height="150" alt="" style="margin-bottom:15px;"/> <p style="text-transform:uppercase; letter-spacing: 1px; font-size:20px; line-height:20px;">{{ T(props.name|default('signup.type.' ~ type)) }}</p> @@ -256,7 +256,7 @@ </div> {% endif %} {% endfor %} - +{# <div class="col-sm-4"> <div class="pricing-block type-hosting" style="font-size:16px!important; margin-left:0px; margin-right:0px;"> <img src="{{ asset('/images/icon-hosting.png') }}" width="150" height="150" alt="" style="margin-bottom:15px;"/> @@ -272,14 +272,14 @@ </div> </div> </div> - +#} </div> <div class="row"> {% for type in accounttypes %} {% set props = typeconfig[type] %} {% if props.signup == "true" %} -<div class="col-sm-4 hidden-xs lt-ie9-none"> +<div class="col-sm-6 hidden-xs lt-ie9-none"> <div class="pricing-block type-{{type}}"> <div class="pricing-price">{{ 'index.pricefrom'|trans }} <span class="currency" data-value="{{ props.bestprice }}">{{ currency(props.bestprice) }}</span></div> <div class="pricing-subline">{{ 'signup.permonth'|trans }}</div> @@ -288,7 +288,7 @@ </div> {% endif %} {% endfor %} - +{# <div class="col-sm-4 hidden-xs lt-ie9-none"> <div class="pricing-block type-hosting"> <div class="pricing-price">{{ 'index.pricefrom'|trans }} <span class="currency" data-value="{{ hostingprice }}">{{ currency(hostingprice) }}</span></div> @@ -297,14 +297,14 @@ <a href="{{ url('signup','hosting') }}" class="btn btn-primary type-hosting{{ 'hosting' == selectedtype ? ' btn-active' : '' }}">{{ 'index.signupnow'|trans }}^</a> </div> </div> - +#} </div> <div class="row"> {% for type in accounttypes %} {% set props = typeconfig[type] %} {% if props.signup == "true" %} -<div class="col-sm-4"> +<div class="col-sm-6"> <p class="description" style="margin:20px 0 0 0; text-align:center;">{{ currency(props.bestprice) }} Currency conversions**</p> <script type="text/javascript">// <![CDATA[ @@ -355,6 +355,7 @@ </div> {% endif %} {% endfor %} +{# <div class="col-sm-4"> <p class="description" style="margin:20px 0 0 0; text-align:center;">{{ currency(hostingprice) }} Currency conversions**</p> @@ -404,6 +405,7 @@ <ul class="currencies" id="currencies-hosting"></ul> </div> +#} </div>
View file
kolab-hkccp-0.7.18.2.tar.gz/public_html/skins/kolabnow/localization/en.php -> kolab-hkccp-0.7.19.tar.gz/public_html/skins/kolabnow/localization/en.php
Changed
@@ -91,7 +91,6 @@ </ul>'; $texts['signup.hint.all'] = "* If for some reason you are unhappy with the service within the first 30 days, we will refund you if requested.<br> - ^ 6 month minimum commitment required for hosting accounts.<br> ** You will be invoiced in CHF, these currency conversions are displayed to give an estimated rate."; $texts['signup.hint.group'] = 'The effective invoice amount depends on the number of accounts created after signup and therefore is subject to change.'; $texts['signup.header'] = 'Hello, let\'s get you started on Kolab Now! Choose the account that\'s right for you, if you\'re unsure, just try the individual trial account as you can always upgrade later.';
View file
kolab-hkccp-0.7.18.2.tar.gz/public_html/skins/kolabnow/templates/include/signup.twig -> kolab-hkccp-0.7.19.tar.gz/public_html/skins/kolabnow/templates/include/signup.twig
Changed
@@ -239,7 +239,7 @@ {% for type in accounttypes %} {% set props = typeconfig[type] %} {% if props.signup == "true" %} -<div class="col-sm-4"> +<div class="col-sm-6"> <div class="pricing-block type-individual" style="font-size:16px!important; margin-left:0px; margin-right:0px;"> <img src="{{ asset('/images/icon-' ~ type ~ '.png') }}" width="150" height="150" alt="" style="margin-bottom:15px;"/> <p style="text-transform:uppercase; letter-spacing: 1px; font-size:20px; line-height:20px;">{{ T(props.name|default('signup.type.' ~ type)) }}</strong></p> @@ -257,6 +257,7 @@ {% endif %} {% endfor %} +{# <div class="col-sm-4"> <div class="pricing-block type-hosting" style="font-size:16px!important; margin-left:0px; margin-right:0px;"> <img src="{{ asset('/images/icon-hosting.png') }}" width="150" height="150" alt="" style="margin-bottom:15px;"/> @@ -272,14 +273,14 @@ </div> </div> </div> - +#} </div> <div class="row"> {% for type in accounttypes %} {% set props = typeconfig[type] %} {% if props.signup == "true" %} -<div class="col-sm-4 hidden-xs lt-ie9-none"> +<div class="col-sm-6 hidden-xs lt-ie9-none"> <div class="pricing-block type-{{type}}"> <div class="pricing-price">{{ 'index.pricefrom'|trans }} <span class="currency" data-value="{{ props.bestprice }}">{{ currency(props.bestprice) }}</div> <div class="pricing-subline">{{ 'signup.permonth'|trans }}</div> @@ -289,6 +290,7 @@ {% endif %} {% endfor %} +{# <div class="col-sm-4 hidden-xs lt-ie9-none"> <div class="pricing-block type-hosting"> <div class="pricing-price">{{ 'index.pricefrom'|trans }} <span class="currency" data-value="{{ hostingprice }}">{{ currency(hostingprice) }}</div> @@ -297,6 +299,7 @@ <a href="{{ url('signup','hosting') }}" class="btn btn-primary type-hosting{{ 'hosting' == selectedtype ? ' btn-active' : '' }}">{{ 'index.signupnow'|trans }}^</a> </div> </div> +#} </div> <div class="row"> @@ -304,7 +307,7 @@ {% for type in accounttypes %} {% set props = typeconfig[type] %} {% if props.signup == "true" %} -<div class="col-sm-4"> +<div class="col-sm-6"> <p class="description" style="margin:20px 0 0 0; text-align:center;">{{ currency(props.bestprice) }} Currency conversions**</p> <script type="text/javascript">// <![CDATA[ @@ -331,17 +334,17 @@ base : data.base } } - + // now that we have exchange rates, add a few to our page var USD = fx.convert(amount, {to: "USD"}); //13.22784197768393 var GBP = fx.convert(amount, {to: "GBP"}); //8.567532636985659 var EUR = fx.convert(amount, {to: "EUR"}); //1028.1670562349989 - + // we can now use the accounting.js library to format the numbers properly USD = accounting.formatMoney(USD, "$ ", 2, ",", "."); GBP = accounting.formatMoney(GBP, "£ ", 2, ",", "."); EUR = accounting.formatMoney(EUR, "€ ", 2, ",", "."); - + $("#currencies-{{ type }}") .append("<li>USD estimate: " + USD + "</li>") .append("<li>GBP estimate: " + GBP + "</li>") @@ -355,6 +358,8 @@ </div> {% endif %} {% endfor %} + +{# <div class="col-sm-4"> <p class="description" style="margin:20px 0 0 0; text-align:center;">{{ currency(hostingprice) }} Currency conversions**</p> @@ -382,17 +387,17 @@ base : data.base } } - + // now that we have exchange rates, add a few to our page var USD = fx.convert(amount, {to: "USD"}); //13.22784197768393 var GBP = fx.convert(amount, {to: "GBP"}); //8.567532636985659 var EUR = fx.convert(amount, {to: "EUR"}); //1028.1670562349989 - + // we can now use the accounting.js library to format the numbers properly USD = accounting.formatMoney(USD, "$ ", 2, ",", "."); GBP = accounting.formatMoney(GBP, "£ ", 2, ",", "."); EUR = accounting.formatMoney(EUR, "€ ", 2, ",", "."); - + $("#currencies-hosting") .append("<li>USD estimate: " + USD + "</li>") .append("<li>GBP estimate: " + GBP + "</li>") @@ -404,6 +409,7 @@ <ul class="currencies" id="currencies-hosting"></ul> </div> +#} </div>
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.