tmslav
|
2d74d06691
|
Merge pull request #46 from tmslav/develop
change remove files loading
|
2016-04-23 23:38:54 +02:00 |
|
Tomislav R
|
2f7b9e4ad4
|
change remove files loading
|
2016-04-23 23:38:09 +02:00 |
|
tmslav
|
4c7c3c5141
|
Merge pull request #45 from tmslav/develop
font-awesome local version
|
2016-04-23 20:40:02 +02:00 |
|
Tomislav R
|
8ea8ff216c
|
font-awesome local version
|
2016-04-23 20:39:02 +02:00 |
|
tmslav
|
f1da9bd24b
|
Merge pull request #44 from tmslav/develop
https
|
2016-04-23 20:27:55 +02:00 |
|
Tomislav R
|
8bf18c2833
|
https
|
2016-04-23 20:27:13 +02:00 |
|
tmslav
|
0150801e93
|
Merge pull request #43 from tmslav/develop
new url structure
|
2016-04-23 20:13:34 +02:00 |
|
Tomislav R
|
5d0b49b6d9
|
new url structure
|
2016-04-23 20:12:55 +02:00 |
|
|
|
a6256964e8
|
Merge branch 'tmslav-updating_calendar' into develop
|
2016-04-23 19:09:59 +02:00 |
|
|
|
f7ec020838
|
:Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar
Conflicts:
dynamicweb/urls.py
|
2016-04-23 19:08:23 +02:00 |
|
Tomislav R
|
213f295394
|
digitalglarus booking update
|
2016-04-23 19:00:20 +02:00 |
|
|
|
82377a2dcc
|
:Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop
Conflicts:
dynamicweb/settings-test/__init__.py
requirements.txt
templates/cms/ungleich.ch/_footer.html
templates/cms/ungleich.ch/_header_base.html
templates/cms/ungleich.ch/_menu.html
templates/cms/ungleich.ch/base.html
templates/cms/ungleich.ch/blog.html
templates/cms/ungleich.ch/page.html
templates/cms/ungleichch/__init__.py
templates/cms/ungleichch/_footer.html
templates/cms/ungleichch/_header_base.html
templates/cms/ungleichch/_menu.html
templates/cms/ungleichch/base.html
templates/cms/ungleichch/blog.html
templates/cms/ungleichch/page.html
ungleich/templates/cms/ungleichch/_footer.html
ungleich/templates/cms/ungleichch/_header_base.html
ungleich/templates/cms/ungleichch/_menu.html
ungleich/templates/cms/ungleichch/base_ungleich.html
ungleich/templates/cms/ungleichch/blog_ungleich.html
ungleich/templates/cms/ungleichch/page.html
|
2016-04-22 10:08:33 +02:00 |
|
|
|
4a68857717
|
wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop
Conflicts:
dynamicweb/urls.py
|
2016-04-22 10:04:00 +02:00 |
|
tmslav
|
de70ae3acd
|
Merge pull request #38 from sgoudelis/hosting-urls
Added extra URLs for the hosting pages
|
2016-04-22 09:59:04 +02:00 |
|
tmslav
|
cccea5d67a
|
Merge pull request #40 from levivm/feature/vm_pricing
Added pricing selector to hosting pages. Login/Signup implemented
|
2016-04-22 09:58:29 +02: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 Velázquez
|
2e4c7caf9c
|
Merge pull request #39 from levivm/feature/vm_pricing
Feature/vm pricing
|
2016-04-20 01:02:31 -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 |
|
Efstratios Goudelis
|
4442501786
|
Added extra URLs for the hosting pages:
/djangohosting/
/nodehosting/
Also fixed a small typo in hosting/templates/hosting/rails.html
Related tickets:
https://redmine.ungleich.ch/issues/2225
https://redmine.ungleich.ch/issues/1620
https://redmine.ungleich.ch/issues/1621
|
2016-04-18 12:16:29 +03: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 |
|
Tomislav R
|
98cc38b1cf
|
Merge branch 'develop' into updating_calendar
|
2016-04-16 03:43:49 +02: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 |
|
