68e81472d5
Fixed a bug related to incorrect opennebula parameter. Added python oca's github repo to the requirements.txt.
2017-04-26 23:26:35 +05:30
cb4d96604c
Manual merge of develop into opennebula-integration
2017-04-26 10:40:52 +05:30
c938ce738d
Setting the opennebula params from the env
2017-04-26 10:27:22 +05:30
43350869e0
Reverted some files back to as they were in master. They had been reorganized.
2017-04-25 03:55:05 +05:30
1e61ec965d
Some more fixes for the issues of the review of rscnt.
2017-04-25 03:37:50 +05:30
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
af3818d64a
Removed some unwanted changes and prepared for a pull request.
2017-04-24 03:16:43 +05:30
d537fcb118
Manual merge of ungleich/master into opennebula-integration
2017-04-24 03:01:05 +05:30
b363bf5f6a
First working version of opennebula-integration.
2017-03-15 17:32:55 +05:30
5c7712ff88
Merge pull request #158 from ungleich/feature/new_digitalglarus
...
Feature/new digitalglarus
2017-01-06 10:26:01 -05:00
272e414b5c
Merge pull request #157 from levivm/feature/new_digitalglarus
...
Fixed #2789 #2788 #2790 #2812 #2811
2016-12-20 18:08:01 -05:00
65e8c5c6cd
Merge pull request #154 from ungleich/feature/new_digitalglarus
...
Feature/new digitalglarus
2016-12-20 18:06:58 -05:00
abfab6915c
added datacenterlight
2016-12-20 18:05:20 -05:00
rascencio
fc1f97dea9
ref: removing raul.ascencio from prod admins.
2016-12-12 13:20:22 -06:00
eac1dcbfb3
Merge pull request #153 from levivm/feature/new_digitalglarus
...
removed stripe keys from settings and script
2016-12-08 20:57:43 -05:00
8d92ebca88
removed stripe keys from settings and script
2016-12-08 20:51:44 -05:00
c18ca3a7df
fixing some problems
2016-12-06 11:23:51 -04:00
33ce7093cb
fix the base.py
2016-12-05 11:56:47 -04:00
402a6d001e
spring 5 without the notice box
2016-12-05 11:24:46 -04:00
855c8f1140
narbar
2016-12-01 00:28:06 -04:00
addf3de67e
fixing the base.py
2016-11-22 11:25:03 -04:30
b299a0383f
terms and conditions
2016-11-21 20:26:03 -04:30
2362413b60
Merge pull request #137 from levivm/feature/new_digitalglarus
...
Feature/new digitalglarus
2016-10-23 18:22:05 -05:00
98c6bb3ec8
added debug=false to prod settings
2016-10-23 18:18:49 -05:00
66533b1c1a
Merge branch 'master' of github.com:ungleich/dynamicweb
2016-08-22 03:14:20 -05:00
57d27e8bc6
added local settings file again
2016-07-29 00:43:41 -05:00
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
da9169c4ce
Added login.html, Added login view , Added login form,Created Donation Django Model
2016-07-19 01:07:49 -05:00
a6ea27696a
fixed tests in order to user permissions
2016-07-10 22:42:06 -05:00
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
3e6502133e
Merge branch 'develop' into feature/hosting_permission
2016-07-09 17:43:28 -05:00
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
a8b9e02ea5
started hosting permissions
2016-06-26 14:50:48 -05:00
a41b75935c
revert django-mailer configuration
2016-06-16 01:19:40 -05:00
6d029fdeb5
Added cron to send email and fixing settings error
2016-06-16 01:04:48 -05:00
a846f42bf6
Added mark a notification as read feature, Fixed some errors
2016-05-29 13:37:43 -05:00
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
88ee543083
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-05-20 16:43:17 -04:30
5bdcc5d2b2
Fixed Login Error Style , Started view to generating SSH key for a VM
2016-05-20 16:41:42 -04:30
418c257978
delete orders
2016-05-20 15:00:06 +00:00
c8c7926a91
Merge pull request #75 from tmslav/develop
...
Develop
2016-05-20 15:00:41 +02:00
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
c35366d1d6
change db name app_new -> app
2016-05-18 18:44:13 +00:00
5c544e6a8d
Merge branch 'develop'
2016-05-08 18:14:51 +00:00
05e752625e
fix contact ungleich
2016-05-08 19:58:37 +02:00
6e82b50f99
update email sending
2016-05-08 01:04:03 +00:00
7d7c682cec
update from development
2016-05-07 23:02:29 +00:00
fbbee2839c
resolve base.py conflict
2016-05-07 23:05:46 +02:00
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
65e3cdeb94
update dg payment
2016-05-01 14:13:12 +02:00
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
f5978a7da9
Merge branch 'develop' into feature/vm_pricing
2016-04-24 19:20:17 -05:00
34fcb403c7
Merge branch 'develop' into feature/vm_pricing
2016-04-24 16:18:37 -05:00
2dff11d446
reverted changes to url structure
2016-04-24 23:16:38 +02:00
ae0c404951
digitalglarus booking update
2016-04-23 19:00:20 +02:00
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
1ac1e2c4e1
Changing database name from app_new to app
2016-04-10 16:23:30 -05:00
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
61a9213279
Merge branch 'master' into develop
2016-04-10 08:43:03 +02:00
0fe1ba241a
fixed debug option
2016-04-10 04:52:29 +02:00
e24c3d06a4
sorting files
2016-04-10 04:41:36 +02:00
afc7c68cb7
production changes
2016-04-10 01:05:33 +00:00
45aaec38cf
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-09 03:00:41 -05:00
ec12689904
Merge remote-tracking branch 'upstream/develop' into develop
2016-04-09 09:57:56 +02:00
d90a95a3d4
allowing urls translation into german using .po files
2016-04-09 02:53:05 -05:00
36b99b93ef
home added and assigned right template
2016-04-09 08:51:20 +02:00
a45f019a14
Create contact page in German and made it editable
2016-04-08 19:45:28 -05:00
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
24badb1a9c
updated ungleich
2016-04-03 11:46:25 +02:00
5fd4275046
updated main pages links
2016-04-01 12:37:01 +02:00
ddb4de2954
fixed orphaned plugins and add post functionality
2016-03-25 19:18:07 +01:00
105dad3b9f
update django settings for local and production
2016-03-22 22:09:22 +01:00
18c75cf00e
removed duplicated djangocms
2016-03-22 21:09:59 +01:00
08e47294cd
resolve merge conflict
2016-03-22 15:16:21 +00:00
d57fc21784
resolve merge conflict
2016-03-22 15:12:47 +00:00
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
baef7e4aa8
fixed requirements
2016-03-16 00:26:49 +01:00
6223f4a1ef
payment app
2016-03-11 19:42:45 +01:00
f82e0604ca
update req file and update directory structure
2016-03-07 19:20:45 +01:00
5c6e0cf7c6
fixed CustomUser
2016-03-07 18:39:24 +01:00
e7f11e9556
test
2016-03-07 17:49:02 +01:00
de875f80de
Merge remote-tracking branch 'refs/remotes/origin/master'
...
mmit.
2016-03-05 19:57:41 +00:00
e99f23551b
changes on prod - master
2016-03-05 19:46:46 +00:00
7936e5dfe5
update
2016-03-01 21:24:51 +01:00
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
M.Ravi
Levi Velázquez
rascencio
unknown
Natacha Quintero
Tom
Your Name