bruks/dynamicweb
1
0
Fork 0
forked from ungleich-public/dynamicweb
Code Pull requests Activity
738 commits 14 branches 148 tags 318 MiB
Commit graph

47 commits

Author SHA1 Message Date
Levi
419f08aff8 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-20 16:43:17 -04:30
Levi
d4a44b2b6c Fixed Login Error Style , Started view to generating SSH key for a VM 2016-05-20 16:41:42 -04:30
Tom
b8be9f3915 delete orders 2016-05-20 15:00:06 +00:00
Levi
768a990040 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
32b64f2eb7 Merge branch 'develop' 2016-05-08 18:14:51 +00:00
Tomislav R
949d2a3e58 fix contact ungleich 2016-05-08 19:58:37 +02:00
tmslav
2c0f8c4530 update email sending 2016-05-08 01:04:03 +00:00
Tom
be1b03df85 update from development 2016-05-07 23:02:29 +00:00
Tomislav R
e137e8a26e resolve base.py conflict 2016-05-07 23:05:46 +02:00
Levi
342512036d 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
45730e4eb1 update dg payment 2016-05-01 14:13:12 +02:00
Levi
fdf8722c8f 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
981be2dcf4 Merge branch 'develop' into feature/vm_pricing 2016-04-24 19:20:17 -05:00
Levi
84e5178e9b Merge branch 'develop' into feature/vm_pricing 2016-04-24 16:18:37 -05:00
Tomislav R
fcc1f8fb4b reverted changes to url structure 2016-04-24 23:16:38 +02:00
Tomislav R
213f295394 digitalglarus booking update 2016-04-23 19:00:20 +02:00
Levi
0bad2870f9 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
fce44b2ec5 Changing database name from app_new to app 2016-04-10 16:23:30 -05:00
Levi
942464f6f6 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
1190bd9018 fixed debug option 2016-04-10 04:52:29 +02:00
tmslav
99ad6852b7 production changes 2016-04-10 01:05:33 +00:00
Levi
c33b85626a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-09 03:00:41 -05:00
Levi
0e65c1e717 allowing urls translation into german using .po files 2016-04-09 02:53:05 -05:00
Tomislav R
10d3e236ee home added and assigned right template 2016-04-09 08:51:20 +02:00
Levi
ebe214d95b Create contact page in German and made it editable 2016-04-08 19:45:28 -05:00
Levi
bb8c5314bc 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
Tomislav R
949ee20a8a updated ungleich 2016-04-03 11:46:25 +02:00
Tomislav R
1d18894b60 updated main pages links 2016-04-01 12:37:01 +02:00
Tomislav R
26de99e773 fixed orphaned plugins and add post functionality 2016-03-25 19:18:07 +01:00
Tomislav R
28df2526a8 update django settings for local and production 2016-03-22 22:09:22 +01:00
Tomislav R
1f2c94a053 removed duplicated djangocms 2016-03-22 21:09:59 +01:00
Your Name
1ce3f4bbac resolve merge conflict 2016-03-22 15:16:21 +00:00
Your Name
767d24adb7 resolve merge conflict 2016-03-22 15:12:47 +00:00
Tomislav R
6b78bac53b Blog update 2016-03-22 01:21:50 +01:00
Raul Ascencio
0d04a18a0d server push 2016-03-19 21:28:58 +01:00
Tomislav R
ff9a6e1b2b fixed requirements 2016-03-16 00:26:49 +01:00
Tomislav R
e5d2d74450 payment app 2016-03-11 19:42:45 +01:00
Tomislav R
2477fbc11b update req file and update directory structure 2016-03-07 19:20:45 +01:00
Tomislav R
b8824b3f46 fixed CustomUser 2016-03-07 18:39:24 +01:00
Tomislav R
3157db235a test 2016-03-07 17:49:02 +01:00
Your Name
8f4dd038bd Merge remote-tracking branch 'refs/remotes/origin/master' 
mmit.
 2016-03-05 19:57:41 +00:00
Your Name
ec789b625e changes on prod - master 2016-03-05 19:46:46 +00:00
Tomislav R
5fbde4878d update 2016-03-01 21:24:51 +01:00
Tomislav R
abbc2982e3 django version update #3 2016-02-29 23:28:31 +01:00
rscnt
8e297fcb87 settings/base: refactor - pep8, also added djangocms-blog parler conf 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-11-05 01:02:18 -06:00
rscnt
be7579134f dynamicweb/settings: base, using PROJECT_ROOT instead of BASE_DIR 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-11-02 15:58:52 -06:00
rscnt
f885036d0e dynamicweb: added settings module with different files for each env 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-11-02 14:44:18 -06:00