amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
814 commits 8 branches 146 tags 314 MiB
Commit graph

814 commits

This branch
This branch
All branches
Author SHA1 Message Date
Levi Velázquez
aa88b9c57d Merge pull request #108 from levivm/develop 
fixed tests in order to user permissions
 2016-07-10 22:42:39 -05:00
Levi
a6ea27696a fixed tests in order to user permissions 2016-07-10 22:42:06 -05:00
Levi Velázquez
453d4ab350 Merge pull request #107 from levivm/develop 
Develop
 2016-07-10 22:13:42 -05:00
Levi
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
Levi
3e6502133e Merge branch 'develop' into feature/hosting_permission 2016-07-09 17:43:28 -05:00
Levi Velázquez
de5fea6dde Merge pull request #106 from levivm/develop 
Develop
 2016-07-09 17:23:12 -05:00
Levi
0d6e43de44 Added ungleich landing translation 2016-07-09 17:21:57 -05:00
Levi
37287cf299 Added HostingPriceView test, - [ ] Added resolving url test to few views 2016-07-09 16:04:50 -05:00
Levi Velázquez
e6ba8e5917 Merge pull request #105 from levivm/develop 
Develop
 2016-07-07 23:55:30 -05:00
Levi
fae5d616e6 #hotfix fixing 404 style 2016-07-07 23:52:24 -05:00
Levi
228065b1d5 #hotfix fixing 404 redirect home 2016-07-07 23:50:02 -05:00
Levi Velázquez
cdb42f0022 Merge pull request #104 from levivm/develop 
Adding tests
 2016-07-07 23:42:14 -05:00
Levi
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
Levi
0dc81fff3d Fixed duplicated post bug , Added reset password view test, Added confirm reset password view test 2016-07-04 23:44:15 -05:00
Levi Velázquez
47b44e2fed Merge pull request #103 from levivm/develop 
fixed digitalglarus post detail view on DE
 2016-07-01 00:42:22 -05:00
Levi
21cd0c21a9 fixed digitalglarus post detail view on DE 2016-07-01 00:40:39 -05:00
Levi Velázquez
ed4ed18861 Merge pull request #102 from levivm/develop 
Generic view pricing widget, blog fixed, vm details
 2016-06-30 01:25:12 -05:00
Levi
e90c5fece0 Created generic view for vm pricing widget, Added VM configuration info on VM detail view, Fixed template bugs. Fixed Blog urls bugs 2016-06-30 01:23:14 -05:00
Levi Velázquez
a2666f9ab4 Merge pull request #100 from levivm/develop 
fixed hosting emails
 2016-06-26 14:55:33 -05:00
Levi
9aa732626f fixed hosting emails 2016-06-26 14:54:01 -05:00
Levi
a8b9e02ea5 started hosting permissions 2016-06-26 14:50:48 -05:00
Levi
c70c98ecc5 changing defualt 'from email' to no-reply@ungleich.ch 2016-06-24 00:53:26 -05:00
Levi Velázquez
af38ce71ca Merge pull request #99 from levivm/develop 
changing defualt 'from email' to no-reply@ungleich.ch
 2016-06-24 00:53:11 -05:00
Levi
2ad5118688 changing defualt 'from email' to no-reply@ungleich.ch 2016-06-24 00:49:46 -05:00
Levi Velázquez
80dcd83777 Merge pull request #98 from levivm/develop 
changing defualt 'from email' to no-reply@ungleich.ch
 2016-06-24 00:49:28 -05:00
Levi
3526ddd9af changing defualt 'from email' to no-reply@ungleich.ch 2016-06-24 00:45:21 -05:00
Levi Velázquez
5939b63dad Merge pull request #97 from levivm/develop 
changing defualt 'from email' to no-reply@ungleich.ch
 2016-06-24 00:45:11 -05:00
Levi
ec6ced8f9e adding from email for sending emails 2016-06-24 00:40:08 -05:00
Levi Velázquez
1a2a7b49df Merge pull request #96 from levivm/develop 
adding "from email" for sending emails
 2016-06-24 00:40:05 -05:00
Levi
11bb685ea6 updated all email templates with the new logo img 2016-06-24 00:08:51 -05:00
Levi Velázquez
d4c9a8ed7c Merge pull request #95 from levivm/develop 
updated all email templates with the new logo img
 2016-06-24 00:08:38 -05:00
Levi Velázquez
4b8982adb6 Merge pull request #94 from levivm/develop 
fixing logo on emails
 2016-06-23 23:58:47 -05:00
Levi
ddc2d0aa0d fixing logo on emails 2016-06-23 23:58:02 -05:00
Levi Velázquez
a542de1bd8 Merge pull request #93 from levivm/develop 
fixing logo on emails
 2016-06-23 23:46:30 -05:00
Levi
03cdd3437d fixing logo on emails 2016-06-23 23:46:25 -05:00
Levi Velázquez
3f467118a8 Merge pull request #92 from levivm/develop 
changing logo on vm booking emails
 2016-06-23 23:38:32 -05:00
Levi
29efff31ea changing logo on vm booking emails 2016-06-23 23:38:32 -05:00
Levi Velázquez
9f6c278bf6 Merge pull request #91 from levivm/develop 
fixing email rendering svg logo
 2016-06-23 23:09:03 -05:00
Levi
6737c539bb fixing email rendering svg logo 2016-06-23 23:08:52 -05:00
Levi Velázquez
f551a8fd58 Merge pull request #90 from levivm/develop 
Create custom user, post languages, languages switcher
 2016-06-23 21:35:18 -05:00
Levi
2b50f9fdd9 As an admin I want to be able to create a custom use. As an user I want to see listed only posts in the current selected language. As an user I want to be able to switch languages between EN-DE 2016-06-23 21:32:51 -05:00
Levi Velázquez
2d3e60666c Merge pull request #89 from levivm/develop 
Added migrations
 2016-06-21 00:23:12 -05:00
Levi
ad035af28c Added migrations 2016-06-21 00:22:57 -05:00
Levi Velázquez
05b8493fe1 Merge pull request #88 from levivm/develop 
Develop
 2016-06-21 00:17:55 -05:00
Levi
d8150b6593 Created reset password email, Added forgot password view, Added forgot password form, Added set new password form, Added set new password view, fixed signup response issue, fixed main menu ungleich button redirect to django-hosting 2016-06-21 00:10:38 -05:00
Levi
d7fc64258a Merge branch 'feature/django-mailer' into develop 2016-06-16 21:35:17 -05:00
Levi
a41b75935c revert django-mailer configuration 2016-06-16 01:19:40 -05:00
Levi
6d029fdeb5 Added cron to send email and fixing settings error 2016-06-16 01:04:48 -05:00
Levi
72a21af789 changed cancel VM modal message 2016-06-09 23:59:05 -05:00
Levi Velázquez
781f55f864 Merge pull request #87 from levivm/develop 
changed cancel VM modal message
 2016-06-09 23:59:00 -05:00