amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3608 commits 8 branches 146 tags 314 MiB
Commit graph

1025 commits

Author SHA1 Message Date
Modulos
1e2b8b1652 Add connection error handling 2017-05-14 12:22:10 +02:00
Modulos
d7bd142387 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-14 03:41:56 +02:00
Modulos
8a18c275c3 Display configuration in virtualmachine detail 2017-05-14 03:41:30 +02:00
Levi Velázquez
d031488514 Merge pull request #242 from levivm/opennebula_api 
added permissions to hosting bill view
 2017-05-13 20:20:02 -05:00
Levi
bcc32174b2 added permissions to hosting bill view 2017-05-13 20:19:09 -05:00
Levi Velázquez
de3fa34e7e Merge pull request #241 from levivm/opennebula_api 
fixed create vm button display
 2017-05-13 19:58:27 -05:00
Levi
d5749f65f1 fixed create vm button display 2017-05-13 19:57:23 -05:00
Modulos
46b918d175 Fix price calculation 2017-05-14 02:18:10 +02:00
Levi
e6ec14dfe7 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-13 12:22:21 -05:00
Modulos
85d3158dbd Fix order price 2017-05-13 17:02:45 +02:00
Modulos
752e11bcea Readded hostingplans 2017-05-13 13:47:53 +02:00
Modulos
8017fbb90f Work on configuration 2017-05-13 10:00:07 +02:00
Levi
d8c8804cc4 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-13 00:31:33 -05:00
Levi
07dc04018f cleaned code 2017-05-13 00:31:29 -05:00
Modulos
75d93b2aad Add images as configuration 2017-05-13 06:59:57 +02:00
Modulos
c816d280ee Remove opennebula_functions.py 2017-05-13 05:52:27 +02:00
Modulos
cfaf201064 Handle ConnectionException, add change_user_password 2017-05-13 05:50:56 +02:00
Levi
8980f6b2fc merged opnnebula api changes 2017-05-12 12:13:18 -05:00
Modulos
130c00c8ee API Integration 
Please review carefully.
 2017-05-12 12:07:05 +02:00
Levi
3873540849 Force user to generate ssh key in order to create a VM #3147. As user I want to terminate a VM using web interface #3148. Change password in opennebula when user change his password on hosting app #3149 2017-05-12 00:56:35 -05:00
Levi
1a6e1a44d8 fixing formatting 2017-05-11 00:38:53 -05:00
Levi
1f10f04a9d Fixed ssh key error, Now an existing user is not ask for his credit card again 2017-05-11 00:11:33 -05:00
Modulos
f1ae7e1014 Fix _get_or_create_user 2017-05-09 05:54:10 +02:00
Modulos
63052df6c9 Change to new OpenNebula functions 2017-05-09 05:05:58 +02:00
Modulos
d0fc0144e5 Merge branch 'opennebula-integration' into vm_bill 2017-05-09 04:56:03 +02:00
Levi
9a34518457 attached opennebula vm id to virtualmachine plan 2017-05-08 21:54:12 -05:00
Levi
abf6dbddce added create vm feature from a normal user in opennebula 2017-05-08 21:49:40 -05:00
Modulos
6dedf3693e Change to use OpenNebulaManager 2017-05-09 04:41:45 +02:00
Modulos
7010c76c72 Add floatformat 2017-05-09 04:41:35 +02:00
Modulos
38b2aa8986 Create HostingBill obj when payment's successful 2017-05-09 04:40:41 +02:00
Modulos
3ee075fad9 Merge branch 'opennebula-integration' into vm_bill 2017-05-09 04:04:53 +02:00
Levi
bd83545653 Merge branch 'opennebula-integration' of github.com:ungleich/dynamicweb into opennebula-integration 2017-05-08 19:06:12 -05:00
Levi
7ae49d00dd added opennebula manager claass 2017-05-08 19:02:29 -05:00
Modulos
c745a8c402 Remove comment 
I assume that only clients are StripeCustomer objects
 2017-05-08 16:00:42 +02:00
Modulos
3078536bd7 Merge branch 'opennebula-integration' into vm_bill 2017-05-08 15:46:53 +02:00
M.Ravi
621376c5b4 Added functionality to create opennebula user if it does not exist 2017-05-08 16:23:03 +05:30
M.Ravi
970ae1d0b2 Manual merge of levi/opennebula-integration 2017-05-08 12:34:28 +05:30
M.Ravi
a1eea9162e Added logger methods for print. 2017-05-08 11:36:46 +05:30
Modulos
ae69a56ab2 Add error handling 2017-05-08 02:47:38 +02:00
Modulos
a22c8cad51 Fix cosmetic detail 2017-05-08 02:46:11 +02:00
Levi Velázquez
0220867772 Merge pull request #225 from levivm/opennebula-integration 
added get vms
 2017-05-07 19:05:45 -05:00
Levi
d72c1c810d added get vms 2017-05-07 18:57:44 -05:00
Modulos
b4ec750728 Return error page if HostingBill is None 2017-05-08 01:56:02 +02:00
Modulos
f871bb2aba Show correct user name and email 2017-05-08 01:43:47 +02:00
Levi Velázquez
23f58ead52 Merge pull request #224 from levivm/opennebula-integration 
Opennebula integration
 2017-05-07 17:48:05 -05:00
Levi
233642a6b1 removed pdb 2017-05-07 17:47:41 -05:00
Levi
1ebc3b8be4 testing 2017-05-07 17:46:03 -05:00
Modulos
c2a76e6c39 Merge migrations and fix spacing 2017-05-07 16:09:41 +02:00
Modulos
4ab8963149 Follow fat models small views 
Based on the recommondation in 'Two scoops of Django' I moved the code
for accessing the customers vm from the view to the model.
 2017-05-07 16:07:38 +02:00
Modulos
d146c25899 Merge branch 'opennebula-integration' into vm_bill 2017-05-07 06:29:29 +02:00
M.Ravi
6d4e9d8a83 Refactored code to introduce different VM templates 2017-05-07 05:31:39 +05:30
Levi Velázquez
07a3d8649c Merge pull request #223 from levivm/opennebula-integration 
fixing vm list
 2017-05-06 18:40:14 -05:00
Levi
e67148ff59 fixing vm list 2017-05-06 18:39:19 -05:00
Levi Velázquez
a04955eb59 Merge pull request #222 from levivm/opennebula-integration 
adding method to list vms
 2017-05-06 18:37:30 -05:00
Levi
b0a27b8c75 adding method to list vms 2017-05-06 18:36:51 -05:00
Levi Velázquez
e1a61ba930 Merge pull request #217 from levivm/opennebula-integration 
Opennebula integration
 2017-05-06 18:27:35 -05:00
Levi
2ac34ff295 fixed virtual machines template 2017-05-06 18:25:15 -05:00
Levi
e99be51de1 adding list vm 2017-05-06 18:19:28 -05:00
Levi
767a5fc5da fixing errors on vm creation 2017-05-06 18:17:47 -05:00
Levi
3994d2d33b added migratin 2017-05-06 18:12:25 -05:00
Levi
90307724c8 added null true to opennebula id atribute 2017-05-06 18:09:01 -05:00
Levi
c9c7023c73 fixed create vm method 2017-05-06 18:04:45 -05:00
Levi
97fecf88db fixed typo 2017-05-06 17:42:14 -05:00
Levi
ac9ba1480b fixed payment issues 2017-05-06 17:36:02 -05:00
Modulos
bd362cb619 Change to user_email add TODOs 2017-05-06 15:28:18 +02:00
Modulos
6f252def5d Return error if HostingBill object does not exist 2017-05-06 15:16:10 +02:00
Modulos
673e8a0c79 Add total_price to HostingBill model 2017-05-06 14:44:08 +02:00
Modulos
2ff8b9e4a5 Add hosting bill view, model and urls 2017-05-05 14:59:11 +02:00
Levi
ed806910e6 adding integration opennebula-hosting app 2017-05-03 23:19:32 -05:00
Pcoder
9884eefa19 Update managevms.html 2017-05-03 11:44:04 +05:30
M.Ravi
58d3dd6624 Fixed some issues. 2017-05-03 11:09:22 +05:30
M.Ravi
7cc2af420b Added DEV_PREFIX parameter when creating VM, so that we create KVM virtual disk 2017-05-01 14:28:23 +05:30
Levi
2658205008 showing VMS 2017-04-29 12:54:14 -05:00
Levi
4ec830550c showing VMS 2017-04-29 12:51:30 -05:00
Levi
3e755b3b68 added vm_template parameter to djangohosting view 2017-04-29 12:46:56 -05:00
Levi
085133fb53 integrating hosting app with opennebula integration 2017-04-29 12:39:55 -05:00
M.Ravi
cb4d96604c Manual merge of develop into opennebula-integration 2017-04-26 10:40:52 +05:30
M.Ravi
43350869e0 Reverted some files back to as they were in master. They had been reorganized. 2017-04-25 03:55:05 +05:30
M.Ravi
1e61ec965d Some more fixes for the issues of the review of rscnt. 2017-04-25 03:37:50 +05:30
M.Ravi
a8952700d6 Partial fixes for issues pointed by @rscnt 
- Moved opennebula constants to base.py
- Refactored all opennebula functions from admin.py to opennebula_functions.py
- string#format for some strings
- Renamed my_view function to show_vms
- Added logger to show logs of exceptions generated
 2017-04-24 18:51:11 +02:00
M.Ravi
d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
M.Ravi
d10285e23d Made to use random passwords for creating opennebula users and managing their VMs. 2017-04-23 22:46:59 +05:30
M.Ravi
a427fa8579 Renamed 'manage vmss' model names so that we have a nice name 2017-04-23 22:24:41 +05:30
M.Ravi
354cb144f7 Added graceful handling of OpenNebula network not available 2017-04-23 22:16:13 +05:30
M.Ravi
41d1e8b003 Merge branch 'opennebula-integration' of https://github.com/ungleich/dynamicweb into opennebula-integration 2017-04-23 21:27:32 +05:30
M.Ravi
37dc1f1c57 Added the functionality to create opennebula user corresponding to dynamicweb user and creating and listing vms of the logged in user. 2017-04-23 21:22:50 +05:30
Pcoder
d3f7110c60 Update README-opennebula-integration.md 2017-04-22 10:52:19 +05:30
Pcoder
9645895112 Rename README-opennebula-integration to README-opennebula-integration.md 2017-04-22 10:51:35 +05:30
M.Ravi
c8614f4f63 Added functionality to select templates for the VMs being created 2017-04-18 13:34:29 +05:30
M.Ravi
b68fe31361 Added start/stop functionality for VMs. Refactored a few functions. 2017-04-11 00:44:55 +05:30
M.Ravi
c7334dfac2 Merge branch 'opennebula-integration' of https://github.com/ungleich/dynamicweb into opennebula-integration 2017-04-10 13:44:24 +05:30
M.Ravi
167e0482a9 Added Delete VM functionality. 2017-04-10 13:43:13 +05:30
Pcoder
cb64dd2b11 Create README-opennebula-integration 2017-03-17 01:02:03 +05:30
M.Ravi
24cfe707cd Listing of VMs and Creation of VMs done. 2017-03-17 00:42:27 +05:30
M.Ravi
b363bf5f6a First working version of opennebula-integration. 2017-03-15 17:32:55 +05:30
Levi
f56f294205 Fixed blling form goes out of background image, Fixed billing address page "amount" field seems broken, Changed authentication page fonts 
Added new DG login.html, Fixed DG login contact footer, Added new DG login form, Added  DG login, Added DG signup, Added DG reset password, Added DG confirm reset password, Added DG membership payment view
 Please enter the commit message for your changes. Lines starting
 2016-08-20 00:57:46 -05:00
Levi
4e07385949 Added command make_donations_charges in order to create stripe current monthly donations from all donators. Now the user can logout using navbar. Added restriction to user in order to make a donation when he has an active monthly donation . Added donations view where the user can view their recents donations. Now users receive an email after making his first donation. 2016-07-29 00:17:34 -05:00
Levi
4580a75f89 Added DonatorStatus model in order to know if an donator has canceled or not his monthly donation, Now we create a DonatorStatus for the user after receiving his first donation. Added DonatorStatus view. Added donator_status.html in order to allow an user view his donation status , Added action to allow user to cancel his monthly donations. Now the user can logout using navbar. added Donation model to admin.Added command make_donations_charges in order to create stripe current monthly donations from all donators 2016-07-27 00:08:45 -05:00
Levi
cb520f6b58 Created signup view. Added login after signup.Added signup url to nosystem app urls.py. Added logout view, Added logout button on nabber, Added password reset form, Added password view , Added password reset html, Added password reset email for nosystemd app. Added confirm_reset_password.html, Added confirm_ reset password view, Added confirm reset password form, Fixed reset password token generation, Started donation view, Added donation view, Added donation.html, Added donation form, Adding donation.js lib in order to capture stripe payments for nosystem app. 2016-07-22 01:24:32 -05:00
Levi
d7f7d498f5 Created .po translation file for login.html, signup.html, reset_password.html, confirm_reset_password.html, base_short.html, order_detail.html. Created .po translation file for orders.html, virtual_machine_detail.html, virtual_machines. created .po translation file for virtual_machine_key.html, notifications.html 2016-07-18 21:24:44 -05:00
Levi
7cd5244fdc Added PostListViewUngleichTest, Added PostDetailViewUngleich, Converted detail ungleich post view into Class Based Django view, Added translations to ungleich landing page 2016-07-15 00:14:51 -05:00
Levi
a6ea27696a fixed tests in order to user permissions 2016-07-10 22:42:06 -05:00
Levi
4352094680 Added ‘view virtual machine plan ’ permission, Added ‘delete virtual machine plan’ permission , Added ‘view hosting order’ permission 2016-07-10 22:08:51 -05:00
Levi
3e6502133e Merge branch 'develop' into feature/hosting_permission 2016-07-09 17:43:28 -05:00
Levi
37287cf299 Added HostingPriceView test, - [ ] Added resolving url test to few views 2016-07-09 16:04:50 -05:00
Levi
b34d84657e Added HostingUserLoginForm test, Added HostingUserSignupForm test, Added PasswordResetRequestForm Test, Added SetPasswordForm test, Created custom 404 page 2016-07-07 23:35:50 -05:00
Levi
0dc81fff3d Fixed duplicated post bug , Added reset password view test, Added confirm reset password view test 2016-07-04 23:44:15 -05:00
Levi
e90c5fece0 Created generic view for vm pricing widget, Added VM configuration info on VM detail view, Fixed template bugs. Fixed Blog urls bugs 2016-06-30 01:23:14 -05:00
Levi
9aa732626f fixed hosting emails 2016-06-26 14:54:01 -05:00
Levi
a8b9e02ea5 started hosting permissions 2016-06-26 14:50:48 -05:00
Levi
11bb685ea6 updated all email templates with the new logo img 2016-06-24 00:08:51 -05:00
Levi
ddc2d0aa0d fixing logo on emails 2016-06-23 23:58:02 -05:00
Levi
03cdd3437d fixing logo on emails 2016-06-23 23:46:25 -05:00
Levi
29efff31ea changing logo on vm booking emails 2016-06-23 23:38:32 -05:00
Levi
6737c539bb fixing email rendering svg logo 2016-06-23 23:08:52 -05:00
Levi
2b50f9fdd9 As an admin I want to be able to create a custom use. As an user I want to see listed only posts in the current selected language. As an user I want to be able to switch languages between EN-DE 2016-06-23 21:32:51 -05:00
Levi
ad035af28c Added migrations 2016-06-21 00:22:57 -05:00
Levi
d8150b6593 Created reset password email, Added forgot password view, Added forgot password form, Added set new password form, Added set new password view, fixed signup response issue, fixed main menu ungleich button redirect to django-hosting 2016-06-21 00:10:38 -05:00
Levi
6d029fdeb5 Added cron to send email and fixing settings error 2016-06-16 01:04:48 -05:00
Levi
72a21af789 changed cancel VM modal message 2016-06-09 23:59:05 -05:00
Levi
288be32c5f As an user I want to be able to cancel my VM Plan subscription. As an user I want to be able to receive an email each time that my VM status changes. 2016-06-09 23:50:49 -05:00
Levi
82ca7da20a As an admin I can change the VM ip using admin panel ,Fixed notification view count label, Fixed hosting company name on payment view, Added configuration in VM hosting page, Admin can changes the VM configuration using admin panel 2016-06-07 00:29:22 -05:00
Levi
a6eba4f536 #hotfix email after book vm 2016-06-05 15:49:51 -05:00
Levi
cca3a23263 Fixed login/signup page background.Fixed payment input fields.Added login button on hosting page. Fixed hosting tests. Redirect to notifications page if an logged user try to login again. 2016-06-04 02:59:37 -05:00
Levi
18c7691d92 Fixed login error message change. Changed signup page background image. Changed login page background image. Changed djangohosting card image. Changed pricing font. Fixed pricing alignment. Fixed selector price 2016-06-03 00:59:46 -05:00
Levi
d472d37fab Created custom “add order view” to admin panel, Added vm name and user email to orders list admin view , Started function to charge an user for his VM subscription from the admin panel, Created template for email after charge an user for his virtual machine plan, Handle errors creating an order in the admin panel, Now an email is sent to the user after charge him for his virtual machine plan 2016-06-03 00:07:47 -05:00
Levi
a846f42bf6 Added mark a notification as read feature, Fixed some errors 2016-05-29 13:37:43 -05:00
Levi
c33c4f4148 Added status field to a booked VM. Added the capability to change a booked VM status from the admin panel. Send email to user after his VM is approved 2016-05-27 00:51:10 -05:00
Levi
b443d4d21e Created BaseEmail class , Now we are sending email to info@ungleich.com after an user book a VM, Fixed pricing issue, Now Admin can changed data about a booked VM 2016-05-25 01:23:32 -05:00
Levi
71f3d30549 fixed cdn fonts url 2016-05-24 01:27:10 -05:00
Levi
8376d0106c Added next button in order detail view after the user make a payment, Avoid to regenerate SSH Key if the user refresh the page, Now the key is served to download from javascript , Added public_key attribute to VirtualVMPlan in order to store keys created by the user, Now private key has PEM format and public has OpenSSH 2016-05-24 01:19:49 -05:00
Tomislav R
ed95a7ada4 hosting: https://redmine.ungleich.ch/issues/2292, fixed footer 2016-05-22 17:36:28 +02:00
tmslav
3beb220f90 Merge pull request #77 from tmslav/develop 
https://redmine.ungleich.ch/issues/2290
 2016-05-21 00:04:41 +02:00
Tomislav R
f6fbf13023 https://redmine.ungleich.ch/issues/2290 2016-05-21 00:03:17 +02:00
Levi
88ee543083 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-20 16:43:17 -04:30
Levi
5bdcc5d2b2 Fixed Login Error Style , Started view to generating SSH key for a VM 2016-05-20 16:41:42 -04:30
Tom
418c257978 delete orders 2016-05-20 15:00:06 +00:00
Tomislav R
2a7603778a resolve conflicts 2016-05-20 14:22:51 +02:00
Levi
e26eecf2eb Changed offers in VM pricing, Fixed pricing error changing disk size, VM footer dead links, Added logged out message 2016-05-19 01:47:16 -04:30
Tomislav R
04d8c263bf add delete hosting order 2016-05-19 00:58:28 +02:00
Levi
c869f4ec0b removed RailsBetaUser 2016-05-14 02:20:45 -04:30
Levi
994b489c63 Added test to order detail view, Added test to customer orders view, Added test to virtual machine detail view, Added test to customer booked virtual machines view 2016-05-14 02:12:42 -04:30
Levi
2a1bcbc904 added model mommy to requirements.txt 2016-05-12 02:11:18 -05:00
Levi
bf17e80df4 Added based view test, Added billing address form test, payment view test , Added test for hetzner pricing calculation, Added test for bern pricing calculation, Fixed script to load initial pricing data 2016-05-12 01:57:34 -05:00
Levi
14f78893d5 Added DjangoHostingView test, Added RailsHostingView test, Added, NodeJSHostingView test, Changed VMPlan model, Fixed templates to support new relationship between orders and VMplans, Merged Calendar feature with Booking 2016-05-05 01:03:35 -05:00
Levi
bf0e152789 Merge branch 'develop' into feature/vm_pricing 2016-05-04 22:07:30 -05:00
Levi
90aca7c25c Changed hostingorder to m2m with vm plan model 2016-05-04 22:06:49 -05:00
Tomislav R
52ea4eec49 resolve merge conflicts 2016-05-04 17:36:54 +02:00
Levi
a99ea335c8 Added VM detail page, Added VM setting page, Added VM pricing page,Added VM orders page, Added VM status page 2016-05-04 00:16:41 -05:00
Levi
539117741e Changed redirect url after login 2016-05-03 01:06:43 -05:00
Levi
906df2a111 Added pagination to orders view, Created, Virtual machines booked page ,Changed logged user nabber , Added pagination to virtual machines view , Started Virtual machine detail page 2016-05-03 00:59:40 -05:00
Tomislav R
65e3cdeb94 update dg payment 2016-05-01 14:13:12 +02:00
Levi
1c5fc6a437 Added redirect urls after signup/login 2016-04-30 13:55:55 -05:00
Levi
de48f1ce69 Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view to list all user’s orders, Adding some style to pricing template 2016-04-29 01:53:24 -05:00
Tomislav R
69f9f4a416 fix merge conflict 2016-04-28 19:47:44 +02:00
Tomislav R
a493ad225d update dg 2016-04-28 19:42:01 +02:00
Levi
46ab364184 Handled stripe payment errors , Added invoice template, Added view to handle invoice data 2016-04-27 01:54:15 -05:00
Levi
bf334a38d4 Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer 2016-04-26 01:16:03 -05:00
Levi
5456c4c341 Created a base template for login / signup, Fixed some html design issues on login / signup pages, Added Billing Address Form to payment page, Handle Billing Address Form validation, Created VirtualMachinePlan model in order to store user purchased VM, Create method in order to create a stripe plan , Investigated about stripe payment workflows 2016-04-23 02:22:44 -05:00
Levi
9fa83e6f9a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-22 19:58:30 -05:00
Levi
38801abed7 Added View to render payment page, Added Payment and summary forms, Added Payment.js library to request stripe token , Added jQuery validator for handling payment form errors 2016-04-22 08:36:38 -05:00
Tomislav R
f4fb538b9e wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop 
Conflicts:
	dynamicweb/urls.py
 2016-04-22 10:04:00 +02:00
Levi
4e23adcea6 Separated base hosting page into html sections, Added pricing selector to Django Page, Added pricing selector to Rails Page, Added pricing selector to NodeJS Page, Implemented hosting signup , Implemented hosting login, Created forms to handle login/signup errors 2016-04-20 01:03:32 -05:00
Levi
9694681dd2 Added serializer to VM model, Rewrite django hosting view , Created price selection templates , Added price selector with automatic price change 2016-04-19 01:04:42 -05:00
Efstratios Goudelis
805707e905 Added extra URLs for the hosting pages: 
/djangohosting/
/nodehosting/

Also fixed a small typo in hosting/templates/hosting/rails.html

Related tickets:
https://redmine.ungleich.ch/issues/2225
https://redmine.ungleich.ch/issues/1620
https://redmine.ungleich.ch/issues/1621
 2016-04-18 12:16:29 +03:00
Levi
5e1419cd1c registered VM types model in the admin 2016-04-17 20:05:39 -05:00
Levi
7c891fe9c4 Fixed ungleich urls, created model for storing VM types, created command to load VM prices and data to database 2016-04-17 19:52:19 -05:00
Tomislav R
baef7e4aa8 fixed requirements 2016-03-16 00:26:49 +01:00
rscnt
decfaa676e dynamic year for hosting template footer 
Signed-off-by: rscnt <rascnt@gmail.com>
 2016-02-03 05:24:58 -06:00
rscnt
fd1b987bb6 hosting: fixed views function calls 2015-09-22 05:37:22 -06:00
Nico Schottelius
16008512b2 Merge branch 'feature/notifybymail' into develop 2015-09-03 19:56:39 +02:00
Nico Schottelius
a69ac73f5d Add cards 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-09-03 19:56:31 +02:00
Nico Schottelius
42b0acd45e merge railshosting into hosting 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-08-27 18:33:10 +02:00
Nico Schottelius
59ef61dfe8 merge from sanghee 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-08-27 18:21:15 +02:00
Nico Schottelius
2bf346495e begin refactor to /hosting/ 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-08-27 18:20:08 +02:00