sanghee/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
737 commits 10 branches 82 tags 313 MiB
Commit graph

737 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom
418c257978 delete orders 2016-05-20 15:00:06 +00:00
tmslav
aa4782607d Merge pull request #74 from tmslav/cancel_plans 
Cancel plans
 2016-05-20 14:23:43 +02:00
Tomislav R
2a7603778a resolve conflicts 2016-05-20 14:22:51 +02:00
Levi Velázquez
f1b1faa631 Merge pull request #73 from levivm/develop 
Changed offers in VM pricing, Fixed pricing error changing disk size,…
 2016-05-19 01:51:25 -04:30
Levi
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
Tomislav R
04d8c263bf add delete hosting order 2016-05-19 00:58:28 +02:00
Tom
c3abf806c6 Merge remote-tracking branch 'remotes/origin/master' into develop 2016-05-16 23:48:11 +00:00
tmslav
72194df811 Merge pull request #71 from sgoudelis/bugfix/usermanage#2286 
Registered CustomUser model in the admin panel.
 2016-05-17 01:39:30 +02:00
Efstratios Goudelis
22bf60ae86 Registered CustomUser model in the admin panel. 
Related issue: https://redmine.ungleich.ch/issues/2286
 2016-05-16 16:48:26 +03:00
Nico Schottelius
39c7f4858d Merge pull request #70 from sgoudelis/bugfix/blog_publish 
Fixed issue with publish flag for the Digital Glarus blog
 2016-05-16 21:58:04 +09:00
Efstratios Goudelis
adcde9d5c7 Fixed issue with publish flag not be respected when getting blog posts for the site blog. Also for the digitalglarus blog now. 
Related issue: https://redmine.ungleich.ch/issues/2284
 2016-05-16 15:56:05 +03:00
Nico Schottelius
318e4af169 Merge pull request #69 from sgoudelis/bugfix/blog_publish 
Fixed issue with publish flag not be respected when getting blog post…
 2016-05-16 21:39:16 +09:00
Efstratios Goudelis
32e488d457 Fixed issue with publish flag not be respected when getting blog posts for the site blog. 
Related issue: https://redmine.ungleich.ch/issues/2284
 2016-05-16 15:34:45 +03:00
Nico Schottelius
4f40fd1efa Merge branch 'master' of github.com:ungleich/dynamicweb 2016-05-14 22:30:05 +02:00
Nico Schottelius
f7701e31e7 remove open calls 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-05-14 22:29:57 +02:00
Nico Schottelius
56a2c25b14 add mindmap 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-05-14 22:29:33 +02:00
Levi Velázquez
7ed480e924 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 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
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