Levi
|
9909a98a10
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2016-05-14 02:12:53 -04:30 |
|
Levi
|
994b489c63
|
Added test to order detail view, Added test to customer orders view, Added test to virtual machine detail view, Added test to customer booked virtual machines view
|
2016-05-14 02:12:42 -04:30 |
|
Levi Velázquez
|
68c552c6a4
|
Merge pull request #66 from levivm/develop
added model mommy to requirements.txt
|
2016-05-12 02:11:39 -05:00 |
|
Levi
|
2a1bcbc904
|
added model mommy to requirements.txt
|
2016-05-12 02:11:18 -05:00 |
|
Levi Velázquez
|
d4ea68f74e
|
Merge pull request #65 from levivm/develop
Added hosting view tests
|
2016-05-12 02:04:59 -05:00 |
|
Levi
|
8304205537
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2016-05-12 01:58:23 -05:00 |
|
Levi
|
bf17e80df4
|
Added based view test, Added billing address form test, payment view test , Added test for hetzner pricing calculation, Added test for bern pricing calculation, Fixed script to load initial pricing data
|
2016-05-12 01:57:34 -05:00 |
|
Tom
|
5c544e6a8d
|
Merge branch 'develop'
|
2016-05-08 18:14:51 +00:00 |
|
tmslav
|
3186194b3f
|
Merge pull request #63 from tmslav/develop
fix contact ungleich
|
2016-05-08 20:01:38 +02:00 |
|
Tomislav R
|
05e752625e
|
fix contact ungleich
|
2016-05-08 19:58:37 +02:00 |
|
Tom
|
88e6d068b6
|
ungleich template - fix unused translatation tag
|
2016-05-08 15:01:59 +00:00 |
|
tmslav
|
6e82b50f99
|
update email sending
|
2016-05-08 01:04:03 +00:00 |
|
Tom
|
55e92a1017
|
media
|
2016-05-08 00:21:30 +00:00 |
|
Tom
|
7d7c682cec
|
update from development
|
2016-05-07 23:02:29 +00:00 |
|
tmslav
|
b54c6eb99c
|
Merge pull request #62 from tmslav/develop
Develop
|
2016-05-07 23:07:22 +02:00 |
|
Tomislav R
|
fbbee2839c
|
resolve base.py conflict
|
2016-05-07 23:05:46 +02:00 |
|
Tomislav R
|
5e51fa6dbf
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2016-05-07 23:02:49 +02:00 |
|
Levi Velázquez
|
99b16b09fb
|
Merge pull request #61 from levivm/develop
Develop
|
2016-05-05 09:03:44 -05:00 |
|
Levi
|
36de71441a
|
Merge branch 'feature/vm_pricing' into develop
|
2016-05-05 01:04:02 -05: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 |
|
Levi
|
bf0e152789
|
Merge branch 'develop' into feature/vm_pricing
|
2016-05-04 22:07:30 -05:00 |
|
Levi
|
90aca7c25c
|
Changed hostingorder to m2m with vm plan model
|
2016-05-04 22:06:49 -05:00 |
|
Tomislav R
|
6abf5b1b53
|
Updated INSTALLATION doc
|
2016-05-04 20:13:31 +02:00 |
|
Tomislav R
|
7faf08bfde
|
Updated INSTALLATION doc
|
2016-05-04 20:12:58 +02:00 |
|
Tomislav R
|
d7b31c443a
|
Updated INSTALLATION doc
|
2016-05-04 20:11:15 +02:00 |
|
Tom
|
a14135adff
|
payment bug resolve
|
2016-05-04 17:59:25 +00:00 |
|
Tom
|
358bacff85
|
remove debugger
|
2016-05-04 17:45:41 +00:00 |
|
Tom
|
41bcdc92d0
|
remove debugger
|
2016-05-04 17:45:12 +00:00 |
|
tmslav
|
e33df5173d
|
Merge pull request #59 from tmslav/develop
Develop
|
2016-05-04 17:42:36 +02:00 |
|
Tomislav R
|
52ea4eec49
|
resolve merge conflicts
|
2016-05-04 17:36:54 +02:00 |
|
Levi
|
a99ea335c8
|
Added VM detail page, Added VM setting page, Added VM pricing page,Added VM orders page, Added VM status page
|
2016-05-04 00:16:41 -05:00 |
|
Levi
|
539117741e
|
Changed redirect url after login
|
2016-05-03 01:06:43 -05:00 |
|
Levi
|
906df2a111
|
Added pagination to orders view, Created, Virtual machines booked page ,Changed logged user nabber , Added pagination to virtual machines view , Started Virtual machine detail page
|
2016-05-03 00:59:40 -05: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 Velázquez
|
3b3a366c23
|
Merge pull request #55 from levivm/feature/vm_pricing
Fixed error creating stripe customer
|
2016-04-30 14:30:54 -05:00 |
|
Levi
|
3a12308e85
|
Fixed error creating stripe customer
|
2016-04-30 14:29:16 -05:00 |
|
Levi Velázquez
|
03ec41b8e2
|
Merge pull request #54 from levivm/feature/vm_pricing
Added redirect urls after signup/login
|
2016-04-30 13:57:11 -05:00 |
|
Levi
|
1c5fc6a437
|
Added redirect urls after signup/login
|
2016-04-30 13:55:55 -05:00 |
|
Levi Velázquez
|
61442e6f02
|
Merge pull request #53 from levivm/feature/vm_pricing
Fixed requirements file
|
2016-04-29 23:54:45 -05:00 |
|
Levi
|
57b1ab7022
|
Fixed requirements file
|
2016-04-29 23:53:36 -05:00 |
|
Levi Velázquez
|
7c8093734b
|
Merge pull request #52 from levivm/feature/vm_pricing
Fixed requirements file
|
2016-04-29 23:44:15 -05:00 |
|
Levi
|
bad0bd60d0
|
Fixed requirements file
|
2016-04-29 23:43:34 -05:00 |
|
Levi Velázquez
|
4d4c7cf84e
|
Merge pull request #51 from levivm/feature/vm_pricing
Fixes digitalglarus urls, Added translated text to ungleich landing, Created Order view
|
2016-04-29 01:58:42 -05:00 |
|
Levi Velázquez
|
484c80d15a
|
Merge pull request #50 from levivm/feature/vm_pricing
Handled stripe payment errors , Added payment invoice
|
2016-04-29 01:53:55 -05:00 |
|
Levi
|
de48f1ce69
|
Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view to list all user’s orders, Adding some style to pricing template
|
2016-04-29 01:53:24 -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
|
46ab364184
|
Handled stripe payment errors , Added invoice template, Added view to handle invoice data
|
2016-04-27 01:54:15 -05:00 |
|
Levi Velázquez
|
df886a756c
|
Merge pull request #49 from levivm/feature/vm_pricing
Stripe integration
|
2016-04-27 01:53:38 -05:00 |
|