Commit graph

307 commits

Author SHA1 Message Date
Levi
974fdd3419 #hotfix removed pdb 2016-09-14 00:45:33 -05:00
Levi
73cc787ca1 Reduced pixels needed to navbar transition color, Added membership deactivation form, Added membership deactivation view, Added membership status, Added membership charged.html, Added membership charged.txt, Extended class to send membership charge email, After membership, charge for first time an email is sent to the user, Fixed bug on redirecting, user to membership payment after signup, Fixed redirecting after buying a membership 2016-09-14 00:24:20 -05:00
Levi
d917c8a606 Fixed cc brand bug, Added button to print/save pdf to booking order detail view.Added booking order list.Added booking order list views. Added customised user navbar. Added “my bookings” link to navbar. Added membership active date range. Fixed function to calculate if a membership is active or not. Added membership order detail view. Added order membership view. Create order membership detail html.Added validation to not allow booking on already booked dates. 2016-09-08 23:24:52 -05:00
Levi
63dd0f3ea0 fixed redirect url 2016-09-05 20:06:20 -05:00
Levi
e3d1761d45 Now booking is only for users with memberships. Added method to know if a membership is active or not. Added new formula for booking pricing. handling border cases when an user want to book. Added booking order detail view. Added booking order detail html. 2016-09-05 19:45:45 -05:00
Levi
2eb2c90b1f Added membership pricing view. Added membership pricing html. Added membership pricing url. Started booking view. Started integrating booking.js. Added calendar date range js lib. Fixing date picker. Added function to calculate remaining free days. Updated function to calculate booking price. Added BookingDatesForm. Added backend validation for booking dates. fixed booking form. adding pricing to booking payment view. Added free days to booking payment view. Started booking payment stripe flow. Redefined dispatch method to booking view. Now login is required for payment selecting dates and booking. Added date range to booking payment. Fixed booking select dates view. Added form validations to booking form. Created a order after a confirm a booking. Added free_days to booking model in order to facilitate free_days Availability for the next booking. Creating a Stripe charge. Creating Booking model instance. Refactor booking payment views. Associated an order to a stripe charge. Associated booking order instance with a booking instance. 2016-08-30 21:32:45 -05:00
Levi
1152e41b6e Fixed membership payment view issues, Membership creation after a stripe charge, Membership order creation after stripe charge, Added membership activated view, Added membership activated html, Fixing membership cost function, Added function to format membership date ranges, Added membership calculated dates for first month into membership_payment html and membership_activated html 2016-08-22 02:52:29 -05:00
Levi
fbaf439ebc added signup links 2016-08-20 01:17:29 -05:00
Levi
f56f294205 Fixed blling form goes out of background image, Fixed billing address page "amount" field seems broken, Changed authentication page fonts
Added new DG login.html, Fixed DG login contact footer, Added new DG login form, Added  DG login, Added DG signup, Added DG reset password, Added DG confirm reset password, Added DG membership payment view
 Please enter the commit message for your changes. Lines starting
2016-08-20 00:57:46 -05:00
Levi
1470caee89 added old dg index 2016-08-16 00:14:57 -05:00
Levi
dca2250378 fixed history.html , contact us section added again history.html, supporter list style added, changed digitalglarus login, Fixed digitalglarus login form when user sent nothing,Fixed digitalglarus signup form , Fixed relaway font bug 2016-08-15 23:56:14 -05:00
Levi
d567bd257f Deleted old carousel history.html, Added new carousel to history.html, previously on crowdfunding page. Linked 100days/startdigitalglarus to history.html, Fixed contact issue in history.html, Changed index.html background, Changed history.html backend, Delete contact us from history.html, Added Facebook icon on footer 2016-08-15 23:55:58 -05:00
Levi
a27e7f9828 added new index.html and history.html to digitalglarus 2016-08-09 00:54:25 -05:00
Levi
1d6c380127 #hotfix fixed digitalglarus home 2016-08-06 10:46:06 -05:00
Levi
471197963b #hotfix restoring digitalglarus template 2016-08-05 01:19:25 -05:00
Levi
fe52e61668 Configured django-filer plugin. Added thumbnail of 630x200 to each post in post list view. Now when the user click on digitalglarus on contact form in ungleich landing page, he is redirected to digitalglarus home.Started to change index digitalglarus styleChanged ungleich css. Fixed image thumbnail on post item list . Added email template after an user has been charge for his monthly donation. Fixed command to make donations charge, if there is any error with one donator, it skip him and go on to the next.Added new header to digitalglarus page. Added menu to new digitalglarus landing 2016-08-04 01:07:41 -05:00
Levi
5fce858923 Changed donations.html table style, Added pagination to donations list view. Hiding donate now button if the user is logged in and already has a donation.Handled the case when an user has not donations yet in donations.html view. Fixed bug on donation signup 2016-08-03 00:50:33 -05:00
Levi
21cd0c21a9 fixed digitalglarus post detail view on DE 2016-07-01 00:40:39 -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
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
Tomislav R
52ea4eec49 resolve merge conflicts 2016-05-04 17:36:54 +02:00
Tomislav R
b19e33b8da added test 2016-05-02 02:00:38 +02:00
Tomislav R
65e3cdeb94 update dg payment 2016-05-01 14:13:12 +02:00
Levi
de48f1ce69 Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view to list all user’s orders, Adding some style to pricing template 2016-04-29 01:53:24 -05:00
Tomislav R
69f9f4a416 fix merge conflict 2016-04-28 19:47:44 +02:00
Tomislav R
a493ad225d update dg 2016-04-28 19:42:01 +02:00
Levi
bf334a38d4 Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer 2016-04-26 01:16:03 -05:00
Tomislav R
2dff11d446 reverted changes to url structure 2016-04-24 23:16:38 +02:00
Tomislav R
74ca696bfc added dist 2016-04-23 23:48:03 +02:00
Tomislav R
27d4a43e12 change remove files loading 2016-04-23 23:38:09 +02:00
Tomislav R
849d5e313d font-awesome local version 2016-04-23 20:39:02 +02:00
Tomislav R
9215655d6c https 2016-04-23 20:27:13 +02:00
Tomislav R
b72a2795f0 new url structure 2016-04-23 20:12:55 +02:00
c653917358 :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
ae0c404951 digitalglarus booking update 2016-04-23 19:00:20 +02:00
Levi
7c891fe9c4 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
043d5f28c3 fixing url translations 2016-04-15 22:25:57 -05:00
Levi
8ebeb1dc76 Adding correct home menu option 2016-04-15 21:42:21 -05:00
Levi
d2238106e8 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
c09fc89197 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
c5e5640e8d Added translation support for ungleich contact page, 2016-04-12 00:50:15 -05:00
Levi
2f9fa9f8fb Updated contact page style and changed header bg 2016-04-10 17:09:16 -05:00
Levi
7dd4f7e70a 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
Levi
34dcf31b00 added translation text for form contact form fields 2016-04-09 13:00:16 -05:00
Levi
019f8705bb Added supporters placeholders 2016-04-09 04:03:28 -05:00
Levi
45aaec38cf Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-09 03:00:41 -05:00
Levi
d90a95a3d4 allowing urls translation into german using .po files 2016-04-09 02:53:05 -05:00
Tomislav R
36b99b93ef home added and assigned right template 2016-04-09 08:51:20 +02:00
Levi
bcc7d35cd8 changed form email contact 2016-04-08 20:11:29 -05:00
Levi
a45f019a14 Create contact page in German and made it editable 2016-04-08 19:45:28 -05:00
Tomislav R
b411479283 Merge remote-tracking branch 'upstream/master' 2016-04-09 01:02:08 +02:00
Tomislav R
c41bbc1786 added language selection 2016-04-09 01:01:08 +02:00
Levi
9f68d2ad11 cleaning code 2016-04-07 00:30:18 -05:00
Levi
f667aae38e Adapt copyright copy to use current year, Add bank account info, Set the correct text on supporters page, HTML Form adapted to Django template, Create forms.py to have all forms, Create Contact Django Form View, Create a HTML template to contact email, Send contact email to info@digitalglarus.ch 2016-04-07 00:26:50 -05:00
Levi
76f703b9d7 cleaning code 2016-04-03 21:47:21 -05:00
Levi
f586dd07c3 remove templates 2016-04-03 21:46:17 -05:00
Levi
10fac88181 template moved 2016-04-03 21:28:04 -05:00
Levi
0e380f6911 Merge branch 'develop' into feature/supporter 2016-04-03 21:15:05 -05:00
Levi
8de47013ad fixed supporter page, change footer info, added support-us page, changed contact email 2016-04-03 20:39:57 -05:00
858b3ccafa blog dg fix 2016-04-04 03:32:22 +02:00
Tomislav R
24badb1a9c updated ungleich 2016-04-03 11:46:25 +02:00
Tomislav R
5fd4275046 updated main pages links 2016-04-01 12:37:01 +02:00
Tomislav R
d29902c676 removed 2016-03-31 18:15:37 +02:00
Tomislav R
ddb4de2954 fixed orphaned plugins and add post functionality 2016-03-25 19:18:07 +01:00
Tomislav R
78e66862bf added missing blog templates 2016-03-23 14:25:15 +01:00
Tomislav R
ca033be061 Blog update 2016-03-22 01:21:50 +01:00
039399b95b server push 2016-03-19 21:28:58 +01:00
Tomislav R
baef7e4aa8 fixed requirements 2016-03-16 00:26:49 +01:00
Tomislav R
e7f11e9556 test 2016-03-07 17:49:02 +01:00
Tomislav R
88a5825c8c Merge branch 'master' into update_django_version 2016-03-03 22:32:36 +01:00
Tomislav R
850a0e7f85 test 2016-03-03 22:22:37 +01:00
상희 김
3c4f646d5e color changes 2016-03-01 21:52:04 +01:00
Tomislav R
7936e5dfe5 update 2016-03-01 21:24:51 +01:00
Tomislav R
0558d6e396 django version update #3 2016-02-29 23:28:31 +01:00
ed8a8c96e1 one column supporters 2016-02-14 11:52:05 -06:00
d6ddbc31ce added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-14 09:47:07 -06:00
30b1e5f9c3 added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-13 14:28:46 -06:00
1bba65bbe9 supporter description can be null
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:32:18 -06:00
b072df90fe dg: supporters styles 2016-02-08 04:31:53 -06:00
6b70f01799 ...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:23:46 -06:00
acf98b2aa4 adding assets to DG base template
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:14:00 -06:00
953db48234 DG: base template should show cms toolar
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:11:26 -06:00
63117eb40e fixed migrations
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:58:40 -06:00
c80d6b9bc0 added digital glarus migrations
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:43:52 -06:00
9fafb5afeb added digital glarus admin 2016-02-08 02:43:08 -06:00
2dea158e84 added digitalglarus gallery template
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:42:53 -06:00
ea1c24e5d1 added plugins for digitalglarus 2016-02-08 02:42:26 -06:00
4ddf70777d added models for galleries and supporters
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:42:01 -06:00
c1c47e5716 added supporters admin 2016-02-08 02:41:39 -06:00
1f266e382d supporters description should be text field
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-07 20:19:11 -06:00
3c91e3c489 added supporters migration
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-07 20:03:13 -06:00
be7d727a18 supporters: better style for names 2016-02-03 07:36:52 -06:00
1cdf1060a3 adding supporters view
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-03 07:27:29 -06:00
b401fbdebe language option text changed
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-29 08:14:08 -06:00
e0bb10b2f5 digitalglarus: blog detail small "ugly" fix
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-05 01:02:41 -06:00
c4236ed273 digitalglarus: fixed menu on blog static 2015-10-04 19:37:45 -06:00
fd3dd6ba46 digitalglarus: changing lang menu content.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 19:31:40 -06:00
54cadfb6a4 digitalglarus: fixed menu layout 2015-10-04 19:05:09 -06:00
a4c3c341a3 digitalglarus: changes on urls 2015-10-04 16:48:33 -06:00
1b17e2aac1 digitalglarus: fix urls for blog.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:38:53 -06:00
3035364d39 digitalglarus: index should display home. 2015-10-01 12:49:56 -06:00
f561dd9144 digitalglarus: modified contact iframe gmap.
The Google Map iframe needs to confirm to the schema of
the host server.
2015-09-30 12:24:00 -06:00
6ca9d50306 digitalglarus: blog, small changes on blog style
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-27 20:51:00 -06:00
45c386f247 fixed typo 2015-09-26 17:15:07 -06:00
51b95bfce7 digitalglarus: setting every image under the post should be 'responsive' 2015-09-26 17:13:25 -06:00
a5fe61d43c digitalglarus: spacing between post details 2015-09-26 16:56:14 -06:00
7dab2111f3 digitalglarus: removed border from post images
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 16:46:30 -06:00
69a827951b digitalglarus: modified style on blog post 2015-09-26 16:37:53 -06:00
6deb4cd64c digitalglarus: modified styles of post detail
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 16:09:47 -06:00
eb1d4b04a5 digitalglarus: changed style of posts.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 16:03:09 -06:00
dbc53d0deb digitalglarus: added styles for post and blog.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 15:53:57 -06:00
f3c14fab11 digitalglarus: templates blog fixed image 2015-09-26 13:42:46 -06:00
2cc4ea226d digitalglarus: fixed blog views typo
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:31:36 -06:00
023a58a7d7 digitalglarus: styling on post details and list.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:08:14 -06:00
c10fea0169 digitalglarus: templates. blog_meta inline metadata.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:07:52 -06:00
6bc4d5a6a2 digitalglarus: blog_item, added style.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:04:48 -06:00
434d614d8f digitalglarus: templates, glarus_blog styling base
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:04:14 -06:00
111cafb418 digitalglarus: templates/base.html added blog link
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:03:51 -06:00
d97dd31fc9 views: digitalglarus, added digitalglarus tag on post lookup
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:03:10 -06:00
432689999a Merge branch 'blog' of github.com:yakky/dynamicweb into feature/digital-glarus-blog 2015-09-25 22:03:27 -06:00
8a4b1a0c92 digitalglarus: iframe and counter 2015-09-22 04:14:31 -06:00
f6fadaaf62 added digitalglarus iframe 2015-09-22 03:20:51 -06:00
63157229e1 fixed typo 2015-09-20 18:21:05 -06:00
f911a50f50 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2015-09-20 18:20:25 -06:00
44d29cad4a Typo in september 2015-09-20 20:22:24 +02:00
1d11dfabaa Merge remote-tracking branch 'origin/feature/set_favicon' into develop 2015-09-20 20:19:34 +02:00
7f981c09c2 Spell error 2015-09-20 19:31:27 +02:00
906c793dda Changed start-date of crowdfounding to 22th september 2015-09-20 19:26:42 +02:00
9c8941165f [Hit return to continue] 2015-09-20 19:06:34 +02:00
2c4f48a0cb Changed index page
The index page is no set to the crowdfounding page.
The old index page is now called home.
The crowdfounding page is now in the menu on the first place,
and the home page second.
2015-09-20 16:37:54 +02:00
00e728cf07 digitalglarus: fixed typo on digital-glarus crowdfounding -> crowdfunding 2015-09-20 07:58:17 -06:00
8d1ce77af0 Changed subtitle 2015-09-20 14:48:30 +02:00
acca06a11d Merge branch 'master' of git.ungleich.ch:dynamicweb into develop
Conflicts:
	.gitignore
	dynamicweb/settings.py
	requirements.txt
2015-09-19 17:02:36 +02:00
44bf55943f removed conflict on digitalglarus/contact.html 2015-09-19 08:25:34 -06:00
a2e54f1327 Added favicon
Added favicon in base html template
2015-09-17 16:46:21 +02:00
c0933f4de2 fixed image for pricing 2015-09-16 02:06:23 -06:00
79b9929b1b Merge branch 'master' of git.ungleich.ch:dynamicweb
Conflicts:
	digitalglarus/templates/digitalglarus/base.html
	digitalglarus/templates/digitalglarus/index.html
2015-09-16 09:58:05 +02:00
d7ba34f7c1 Merge branch 'master' of git-ungleich:dynamicweb 2015-09-16 01:31:17 -06:00
e022a422d2 adding digital glarus landing page and fixed price image
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-16 01:11:39 -06:00
81207b8e12 Merge branch 'develop' of git-ungleich:dynamicweb into develop 2015-09-15 11:16:02 -06:00
Nico Schottelius
fc52a72221 import new image
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-09-15 14:52:27 +02:00
상희 김
d05ab01281 price_1 2015-09-15 14:40:14 +02:00
08d22489f0 Merge branch 'master' of git.ungleich.ch:dynamicweb 2015-09-14 06:30:59 -06:00
상희 김
9d4886d456 digital glarus text change 2015-09-13 22:54:18 +02:00
상희 김
11edb307a3 Re-add file that was overseen due to tower move / gitignore 2015-09-09 23:18:47 +02:00
상희 김
5b7c9584db Merge remote-tracking branch 'origin/master' 2015-09-09 22:55:54 +02:00
Iacopo Spalletti
06ade77fce PoC integration 2015-09-08 06:38:53 +02:00
Nico Schottelius
59ef61dfe8 merge from sanghee
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:21:15 +02:00
상희 김
2e6cd7d8ef house for sale image 2015-08-16 14:31:09 +02:00
Nico Schottelius
09e36288ae Remove the . in Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-09 21:42:23 +02:00
Nico Schottelius
e635f856b3 Remove the . in Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-09 21:42:23 +02:00
Nico Schottelius
862ca6e9c5 hotfix: meetup
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-09 21:40:35 +02:00
Nico Schottelius
99bc3bca10 hotfix: meetup
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-09 21:40:35 +02:00
Nico Schottelius
7016c05942 digital.glarus -> Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-20 22:58:49 +02:00
Nico Schottelius
ed9cee2fea digital.glarus -> Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-20 22:58:49 +02:00
Nico Schottelius
cd234c4dda digital_glarus -> digitalglarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00
Nico Schottelius
da0ece6d63 digital_glarus -> digitalglarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00