amal
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
906 Commits 8 Branches 146 Tags 314 MiB
Commit Graph

66 Commits

Author SHA1 Message Date
Levi 57d27e8bc6 added local settings file again 2016-07-29 00:43:41 -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 da9169c4ce Added login.html, Added login view , Added login form,Created Donation Django Model 2016-07-19 01:07:49 -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 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 a8b9e02ea5 started hosting permissions 2016-06-26 14:50:48 -05:00
Levi a41b75935c revert django-mailer configuration 2016-06-16 01:19:40 -05:00
Levi 6d029fdeb5 Added cron to send email and fixing settings error 2016-06-16 01:04:48 -05:00
Levi a846f42bf6 Added mark a notification as read feature, Fixed some errors 2016-05-29 13:37:43 -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 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
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
Tom 5c544e6a8d Merge branch 'develop' 2016-05-08 18:14:51 +00:00
Tomislav R 05e752625e fix contact ungleich 2016-05-08 19:58:37 +02:00
tmslav 6e82b50f99 update email sending 2016-05-08 01:04:03 +00:00
Tom 7d7c682cec update from development 2016-05-07 23:02:29 +00:00
Tomislav R fbbee2839c resolve base.py conflict 2016-05-07 23:05:46 +02: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
Tomislav R 65e3cdeb94 update dg payment 2016-05-01 14:13:12 +02: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 f5978a7da9 Merge branch 'develop' into feature/vm_pricing 2016-04-24 19:20:17 -05:00
Levi 34fcb403c7 Merge branch 'develop' into feature/vm_pricing 2016-04-24 16:18:37 -05:00
Tomislav R 2dff11d446 reverted changes to url structure 2016-04-24 23:16:38 +02:00
Tomislav R ae0c404951 digitalglarus booking update 2016-04-23 19:00:20 +02: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
Levi 1ac1e2c4e1 Changing database name from app_new to app 2016-04-10 16:23:30 -05:00
Levi 7dd4f7e70a Moved contact form model in order to be reusable by ungleich app, Created unit test for digitalglarus contact page, Created ungleich contact page, Created unit test for ungleich contact page, Created unit test for forms . 2016-04-10 16:12:43 -05:00
Tomislav R 61a9213279 Merge branch 'master' into develop 2016-04-10 08:43:03 +02:00
Tomislav R 0fe1ba241a fixed debug option 2016-04-10 04:52:29 +02:00
Tomislav R e24c3d06a4 sorting files 2016-04-10 04:41:36 +02:00
tmslav afc7c68cb7 production changes 2016-04-10 01:05:33 +00:00
Levi 45aaec38cf Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-09 03:00:41 -05:00
Tomislav R ec12689904 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-09 09:57:56 +02:00
Levi d90a95a3d4 allowing urls translation into german using .po files 2016-04-09 02:53:05 -05:00
Tomislav R 36b99b93ef home added and assigned right template 2016-04-09 08:51:20 +02:00
Levi a45f019a14 Create contact page in German and made it editable 2016-04-08 19:45:28 -05:00
Levi f667aae38e Adapt copyright copy to use current year, Add bank account info, Set the correct text on supporters page, HTML Form adapted to Django template, Create forms.py to have all forms, Create Contact Django Form View, Create a HTML template to contact email, Send contact email to info@digitalglarus.ch 2016-04-07 00:26:50 -05:00
rascencio 0ccf491441 Merge branch 'master' into develop 2016-04-04 03:33:25 +02:00
rascencio 67002a0a03 Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop 2016-04-04 03:32:50 +02:00
Tomislav R 24badb1a9c updated ungleich 2016-04-03 11:46:25 +02:00
Tomislav R 5fd4275046 updated main pages links 2016-04-01 12:37:01 +02:00
Tomislav R ddb4de2954 fixed orphaned plugins and add post functionality 2016-03-25 19:18:07 +01:00
Tomislav R 105dad3b9f update django settings for local and production 2016-03-22 22:09:22 +01:00
Tomislav R 18c75cf00e removed duplicated djangocms 2016-03-22 21:09:59 +01:00
Your Name 08e47294cd resolve merge conflict 2016-03-22 15:16:21 +00:00
Your Name d57fc21784 resolve merge conflict 2016-03-22 15:12:47 +00:00