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

741 commits

This branch
This branch
All branches
Author SHA1 Message Date
tmslav
a06199448f Merge pull request #77 from tmslav/develop 
https://redmine.ungleich.ch/issues/2290
 2016-05-21 00:04:41 +02:00
Tomislav R
6eb5565537 https://redmine.ungleich.ch/issues/2290 2016-05-21 00:03:17 +02:00
Levi Velázquez
784ed0976b Merge pull request #76 from levivm/develop 
Develop
 2016-05-20 16:43:48 -04:30
Levi
419f08aff8 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-20 16:43:17 -04:30
Levi
d4a44b2b6c Fixed Login Error Style , Started view to generating SSH key for a VM 2016-05-20 16:41:42 -04:30
Tom
b8be9f3915 delete orders 2016-05-20 15:00:06 +00:00
tmslav
bb13644b06 Merge pull request #74 from tmslav/cancel_plans 
Cancel plans
 2016-05-20 14:23:43 +02:00
Tomislav R
9671ec5f05 resolve conflicts 2016-05-20 14:22:51 +02:00
Levi Velázquez
b4fef1e296 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
768a990040 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
d3b579a41c add delete hosting order 2016-05-19 00:58:28 +02:00
Tom
76c0fc092a Merge remote-tracking branch 'remotes/origin/master' into develop 2016-05-16 23:48:11 +00:00
tmslav
0162038c02 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
9658d6937a 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
d890770bcc 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
8fc0ad20a6 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
8d531a2995 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
9c83f29b94 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
7c88ebe9f5 Merge branch 'master' of github.com:ungleich/dynamicweb 2016-05-14 22:30:05 +02:00
Nico Schottelius
ec3b872650 remove open calls 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-05-14 22:29:57 +02:00
Nico Schottelius
c37094cb35 add mindmap 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-05-14 22:29:33 +02:00
Levi Velázquez
b1e585026d Merge pull request #68 from levivm/develop 
removed RailsBetaUser
 2016-05-14 02:21:32 -04:30
Levi
cd0bbd4063 removed RailsBetaUser 2016-05-14 02:20:45 -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
8c71468921 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-14 02:12:53 -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
87480b6f14 Merge pull request #66 from levivm/develop 
added model mommy to requirements.txt
 2016-05-12 02:11:39 -05:00
Levi
32d9b6719d added model mommy to requirements.txt 2016-05-12 02:11:18 -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
fbb19c55f5 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-12 01:58:23 -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
32b64f2eb7 Merge branch 'develop' 2016-05-08 18:14:51 +00:00
tmslav
700406a16c Merge pull request #63 from tmslav/develop 
fix contact ungleich
 2016-05-08 20:01:38 +02:00
Tomislav R
949d2a3e58 fix contact ungleich 2016-05-08 19:58:37 +02:00
Tom
43da718153 ungleich template - fix unused translatation tag 2016-05-08 15:01:59 +00:00
tmslav
2c0f8c4530 update email sending 2016-05-08 01:04:03 +00:00
Tom
44d0046ccc media 2016-05-08 00:21:30 +00:00
Tom
be1b03df85 update from development 2016-05-07 23:02:29 +00:00
tmslav
f64c42e554 Merge pull request #62 from tmslav/develop 
Develop
 2016-05-07 23:07:22 +02:00
Tomislav R
e137e8a26e resolve base.py conflict 2016-05-07 23:05:46 +02:00
Tomislav R
073c9bf192 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-07 23:02:49 +02:00
Levi Velázquez
3cad994970 Merge pull request #61 from levivm/develop 
Develop
 2016-05-05 09:03:44 -05:00
Levi
9415041f64 Merge branch 'feature/vm_pricing' into develop 2016-05-05 01:04:02 -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
ca136d4e47 Merge branch 'develop' into feature/vm_pricing 2016-05-04 22:07:30 -05:00
Levi
6e8004bfd0 Changed hostingorder to m2m with vm plan model 2016-05-04 22:06:49 -05:00
Tomislav R
5480b51e92 Updated INSTALLATION doc 2016-05-04 20:13:31 +02:00
Tomislav R
9cfdeb73c6 Updated INSTALLATION doc 2016-05-04 20:12:58 +02:00
Tomislav R
f536da4e01 Updated INSTALLATION doc 2016-05-04 20:11:15 +02:00
Tom
f1716410e6 payment bug resolve 2016-05-04 17:59:25 +00:00