aatish
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,279 Commits 11 Branches 82 Tags 313 MiB
Commit Graph

193 Commits

Author SHA1 Message Date
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
Tomislav R ca033be061 Blog update 2016-03-22 01:21:50 +01:00
rascencio 039399b95b server push 2016-03-19 21:28:58 +01:00
rascencio b7b0be4497 settings difference push 2016-03-16 15:23:15 +01:00
Tomislav R baef7e4aa8 fixed requirements 2016-03-16 00:26:49 +01:00
Tomislav R 6223f4a1ef payment app 2016-03-11 19:42:45 +01:00
Tomislav R f82e0604ca update req file and update directory structure 2016-03-07 19:20:45 +01:00
Tomislav R 5c6e0cf7c6 fixed CustomUser 2016-03-07 18:39:24 +01:00
Tomislav R e7f11e9556 test 2016-03-07 17:49:02 +01:00
Your Name de875f80de Merge remote-tracking branch 'refs/remotes/origin/master' 
mmit.
 2016-03-05 19:57:41 +00:00
Your Name e99f23551b changes on prod - master 2016-03-05 19:46:46 +00:00
Tomislav R 7936e5dfe5 update 2016-03-01 21:24:51 +01:00
Tomislav R 0558d6e396 django version update #3 2016-02-29 23:28:31 +01:00
rascencio cc9959d632 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
rascencio 55d1c94c38 dynamicweb/settings: local is now using DEBUG=True 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-11-02 15:59:23 -06:00
rascencio e863a8c037 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
rascencio aec2cd4298 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