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

627 commits

This branch
This branch
All branches
Author SHA1 Message Date
Levi
0bad2870f9 Added View to render payment page, Added Payment and summary forms, Added Payment.js library to request stripe token , Added jQuery validator for handling payment form errors 2016-04-22 08:36:38 -05:00
Levi
64a484e749 Separated base hosting page into html sections, Added pricing selector to Django Page, Added pricing selector to Rails Page, Added pricing selector to NodeJS Page, Implemented hosting signup , Implemented hosting login, Created forms to handle login/signup errors 2016-04-20 01:03:32 -05:00
Levi
cb51e08cef Added serializer to VM model, Rewrite django hosting view , Created price selection templates , Added price selector with automatic price change 2016-04-19 01:04:42 -05:00
Levi
3015399692 registered VM types model in the admin 2016-04-17 20:05:39 -05:00
Levi
368cfcecd1 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-17 19:52:32 -05:00
Levi
05e73b1d5e Fixed ungleich urls, created model for storing VM types, created command to load VM prices and data to database 2016-04-17 19:52:19 -05:00
Levi Velázquez
8a6b4d695d Merge pull request #36 from levivm/develop 
fixed login urls
 2016-04-15 22:58:07 -05:00
Levi
bdbf328375 fixed login urls 2016-04-15 22:57:16 -05:00
Levi Velázquez
8efa851430 Merge pull request #35 from levivm/develop 
fixing url translations
 2016-04-15 22:41:59 -05:00
Levi
5198333013 fixing url translations 2016-04-15 22:25:57 -05:00
Levi Velázquez
7c3bb07c9a Merge pull request #34 from levivm/develop 
Adding correct home menu option
 2016-04-15 21:43:13 -05:00
Levi
1cfc52cf94 Adding correct home menu option 2016-04-15 21:42:21 -05:00
Levi Velázquez
c80eb8bdad Merge pull request #33 from levivm/develop 
Develop
 2016-04-15 20:21:39 -05:00
Levi
e075be8534 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-15 20:18:54 -05:00
Levi
ab75b12ffa Handled success message from contact form in ungleich, Contact section in ungleich now supports translation, About section in ungleich now supports translation, Footer section in ungleich now supports translation, Portfolio section in ungleich now supports translation, Services section in ungleich now supports translation, Software section in ungleich now supports translation, Fixed digitalglarus about page 2016-04-15 20:18:29 -05:00
Levi Velázquez
3f9b4abc6b Merge pull request #32 from levivm/develop 
Fixed admin urls
 2016-04-13 01:27:54 -05:00
Levi
997f3145db Fixed admin urls 2016-04-13 01:27:11 -05:00
Levi Velázquez
14f5faf843 Merge pull request #31 from levivm/develop 
Integrating Ungleich page into dynamicweb
 2016-04-13 01:11:30 -05:00
Levi
85c0b8348f Removing files 2016-04-13 01:02:48 -05:00
Levi
6c11aaaa0c Adding .psd to gitignore 2016-04-13 00:50:11 -05:00
Levi
8544efc898 Cleaning files 2016-04-13 00:46:09 -05:00
Levi
2395b2fe97 Cleaning psd files 2016-04-13 00:38:26 -05:00
Levi
fd66c33299 Divided ungleich landing sections into templates. Moved static files and all files path were adapted, Ungleich form conected to landing, Reconfigured django urls 2016-04-13 00:31:19 -05:00
Levi
5a04fc4969 Moved ungleich landing into django 2016-04-12 22:03:18 -05:00
Levi Velázquez
09a787e1ac Merge pull request #29 from levivm/develop 
Develop
 2016-04-12 00:54:02 -05:00
Levi
1469f077bd Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-12 00:51:02 -05:00
Levi
b29ee74634 Added translation support for ungleich contact page, 2016-04-12 00:50:15 -05:00
Levi Velázquez
c6feaba777 Merge pull request #28 from levivm/develop 
Updated contact page style and changed header bg
 2016-04-10 17:09:49 -05:00
Levi
20a59f461d Updated contact page style and changed header bg 2016-04-10 17:09:16 -05:00
Levi Velázquez
f52a94db11 Merge pull request #27 from levivm/develop 
Changing database name from app_new to app
 2016-04-10 16:24:21 -05:00
Levi
fce44b2ec5 Changing database name from app_new to app 2016-04-10 16:23:30 -05:00
Levi Velázquez
f6cb9abc42 Merge pull request #26 from levivm/develop 
Moved contact form model in order to be reusable by ungleich app, Cre…
 2016-04-10 16:13:56 -05:00
Levi
942464f6f6 Moved contact form model in order to be reusable by ungleich app, Created unit test for digitalglarus contact page, Created ungleich contact page, Created unit test for ungleich contact page, Created unit test for forms . 2016-04-10 16:12:43 -05:00
tmslav
cf0fec706c Merge pull request #25 from tmslav/develop 
update staging
 2016-04-10 08:52:03 +02:00
Tomislav R
e1676a98aa Merge branch 'master' into develop 2016-04-10 08:43:03 +02:00
Tomislav R
b661b5e7e6 Merge remote-tracking branch 'upstream/master' 2016-04-10 08:42:33 +02:00
tmslav
aa592156fd updated gallery 2016-04-10 06:23:21 +00:00
Tomislav R
1190bd9018 fixed debug option 2016-04-10 04:52:29 +02:00
tmslav
6bf2a1ec46 Merge pull request #23 from tmslav/develop 
Develop
 2016-04-10 04:43:19 +02:00
Tomislav R
d9487848f0 sorting files 2016-04-10 04:41:36 +02:00
Tomislav R
2125bc7059 Merge branch 'master' into develop 2016-04-10 04:39:32 +02:00
tmslav
c7500175e9 Update INSTALLATION.rst 2016-04-10 04:20:15 +02:00
tmslav
1ebaaef8c3 Update INSTALLATION.rst 2016-04-10 03:47:17 +02:00
Tomislav R
45af2dbc05 doc 2016-04-10 03:42:26 +02:00
tmslav
99ad6852b7 production changes 2016-04-10 01:05:33 +00:00
Raul Ascencio
de2f79e8ce Merge branch 'develop' 2016-04-09 20:09:52 +02:00
Levi Velázquez
3961f63656 Merge pull request #22 from levivm/develop 
added translation text for form contact form fields
 2016-04-09 13:05:49 -05:00
Levi
a575465a80 added translation text for form contact form fields 2016-04-09 13:00:16 -05:00
Raul Ascencio
08019b9d33 Merge branch 'develop' 2016-04-09 19:56:45 +02:00
Levi Velázquez
0e1f2f3fdf Merge pull request #21 from levivm/develop 
Added supporters placeholders
 2016-04-09 04:06:19 -05:00