Levi Velázquez
|
7ed480e924
|
Merge pull request #68 from levivm/develop
removed RailsBetaUser
|
2016-05-14 02:21:32 -04:30 |
|
Levi Velázquez
|
b1e585026d
|
Merge pull request #68 from levivm/develop
removed RailsBetaUser
|
2016-05-14 02:21:32 -04:30 |
|
Levi
|
c869f4ec0b
|
removed RailsBetaUser
|
2016-05-14 02:20:45 -04:30 |
|
Levi
|
cd0bbd4063
|
removed RailsBetaUser
|
2016-05-14 02:20:45 -04:30 |
|
Levi Velázquez
|
70ef0e338c
|
Merge pull request #67 from levivm/develop
Added Test to order and vms detail/list view
|
2016-05-14 02:15:08 -04:30 |
|
Levi Velázquez
|
9ec6f679c4
|
Merge pull request #67 from levivm/develop
Added Test to order and vms detail/list view
|
2016-05-14 02:15:08 -04:30 |
|
Levi
|
9909a98a10
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2016-05-14 02:12:53 -04:30 |
|
Levi
|
8c71468921
|
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
|
e8e58066a0
|
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 Velázquez
|
87480b6f14
|
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
|
32d9b6719d
|
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 Velázquez
|
eebf7abb66
|
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
|
fbb19c55f5
|
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 |
|
Levi
|
8be59499b6
|
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 |
|
Tom
|
32b64f2eb7
|
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 |
|
tmslav
|
700406a16c
|
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 |
|
Tomislav R
|
949d2a3e58
|
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 |
|
Tom
|
43da718153
|
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 |
|
tmslav
|
2c0f8c4530
|
update email sending
|
2016-05-08 01:04:03 +00:00 |
|
Tom
|
55e92a1017
|
media
|
2016-05-08 00:21:30 +00:00 |
|
Tom
|
44d0046ccc
|
media
|
2016-05-08 00:21:30 +00:00 |
|
Tom
|
7d7c682cec
|
update from development
|
2016-05-07 23:02:29 +00:00 |
|
Tom
|
be1b03df85
|
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 |
|
tmslav
|
f64c42e554
|
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
|
e137e8a26e
|
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 |
|
Tomislav R
|
073c9bf192
|
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 Velázquez
|
3cad994970
|
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
|
9415041f64
|
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
|
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 |
|
Levi
|
bf0e152789
|
Merge branch 'develop' into feature/vm_pricing
|
2016-05-04 22:07:30 -05:00 |
|
Levi
|
ca136d4e47
|
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 |
|
Levi
|
6e8004bfd0
|
Changed hostingorder to m2m with vm plan model
|
2016-05-04 22:06:49 -05:00 |