ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity
2,104 Commits 13 Branches 148 Tags 315 MiB
Commit Graph

58 Commits

Author SHA1 Message Date
PCoder 3be7fbe2ee Added name parameter for creating StripeCustomer and set description to this 2017-08-15 16:05:52 +05:30
Andrii Marynets d2beef2032 Add parameter to function for TravisCI 2017-08-03 00:24:16 +03:00
Andrii Marynets 9f050467a1 Add flag is_superuser=True in CustomUserManager 
Missing is_superuser=True was the reason why createsuperuser command did'n make user with all staff
 2017-07-16 16:51:07 +03:00
siarheipuhach a9c9f74aed Fixed PEP8 violations 2017-06-29 19:23:25 +03:00
Siarhei Puhach fcc109b8f5 Merge branch 'master' into feature/flake8 2017-06-29 18:56:50 +03:00
Siarhei Puhach edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
M.Ravi aca831adac Resolved conflicts while merging pcoder-new_flow 2017-06-23 04:35:33 +05:30
M.Ravi 82e8c377af Added membership django.po 2017-06-23 02:14:54 +05:30
M.Ravi 165dfa49ab Fixed __proxy__ to string conversion issue 2017-06-23 01:42:37 +05:30
M.Ravi e5929b8f76 Removed call to refresh_from_db as it was wrongly used 2017-06-23 00:15:47 +05:30
M.Ravi d4e7eb9511 Added CustomUser model reload code 2017-06-22 23:48:14 +05:30
M.Ravi b4c3172a4d Added send_email flag to send/not send email on user registration. Added get_random_password method to CustomUser 2017-06-22 13:22:14 +05:30
M.Ravi c50b2455c2 Separated email subject for translation 2017-06-20 23:45:25 +05:30
M.Ravi 17dd810945 Now we get dcl_text and dcl support email from settings 2017-06-19 12:30:37 +05:30
Pcoder 8dfcca8264 Fixed name for dcl 2017-06-16 00:47:09 +05:30
M.Ravi 2ec2b6980a Updated the CustomUser.register method so that we can handle register differently for digitalglarus and dcl 2017-06-11 05:19:56 +05:30
Levi 9a93a3e315 fixed vm pricing error 2017-05-25 13:04:29 -05:00
Levi 3da05e8025 Finished responsive issues 2016-12-19 09:33:15 -05:00
Levi a84a88479f Fixed #2789 #2788 #2790 #2812 #2811 2016-12-13 10:54:05 -05:00
Levi 1a8b5e69a0 Fixed issue 2624, Creating command to charge all members for their membership month, Fixing bug on make charge membership command, Added language activation for make charge command 2016-10-01 17:17:46 -05:00
Levi e3d1761d45 Now booking is only for users with memberships. Added method to know if a membership is active or not. Added new formula for booking pricing. handling border cases when an user want to book. Added booking order detail view. Added booking order detail html. 2016-09-05 19:45:45 -05:00
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 dca2250378 fixed history.html , contact us section added again history.html, supporter list style added, changed digitalglarus login, Fixed digitalglarus login form when user sent nothing,Fixed digitalglarus signup form , Fixed relaway font bug 2016-08-15 23:56:14 -05:00
Levi 5fce858923 Changed donations.html table style, Added pagination to donations list view. Hiding donate now button if the user is logged in and already has a donation.Handled the case when an user has not donations yet in donations.html view. Fixed bug on donation signup 2016-08-03 00:50:33 -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 a8b9e02ea5 started hosting permissions 2016-06-26 14:50:48 -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 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 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
Tomislav R ed95a7ada4 hosting: https://redmine.ungleich.ch/issues/2292, fixed footer 2016-05-22 17:36:28 +02:00
Tomislav R f6fbf13023 https://redmine.ungleich.ch/issues/2290 2016-05-21 00:03:17 +02:00
Efstratios Goudelis 22bf60ae86 Registered CustomUser model in the admin panel. 
Related issue: https://redmine.ungleich.ch/issues/2286
 2016-05-16 16:48:26 +03: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
Tom a14135adff payment bug resolve 2016-05-04 17:59:25 +00:00
Tom 41bcdc92d0 remove debugger 2016-05-04 17:45:12 +00:00
Tomislav R 52ea4eec49 resolve merge conflicts 2016-05-04 17:36:54 +02:00
Tomislav R b19e33b8da added test 2016-05-02 02:00:38 +02:00
Tomislav R 65e3cdeb94 update dg payment 2016-05-01 14:13:12 +02:00
Levi 3a12308e85 Fixed error creating stripe customer 2016-04-30 14:29:16 -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 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
Tomislav R 27d4a43e12 change remove files loading 2016-04-23 23:38:09 +02:00
Tomislav R 849d5e313d font-awesome local version 2016-04-23 20:39:02 +02:00
Tomislav R b72a2795f0 new url structure 2016-04-23 20:12:55 +02:00
Tomislav R ae0c404951 digitalglarus booking update 2016-04-23 19:00:20 +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
rascencio 039399b95b server push 2016-03-19 21:28:58 +01:00