338 commits

Author	SHA1	Message	Date
Levi	54e3059cef	fixed payment membership button issue, fixed support us posts issue	2017-01-30 21:15:59 -05:00
Levi	2471a7ed12	fixed emails style	2017-01-23 22:37:48 -05:00
Levi	63bb92fc6b	Fixed change card feature	2017-01-20 11:33:25 -05:00
Levi	cb76fb4a1d	fixed input login field on safari, fixed edit billing address view	2017-01-18 13:26:21 -05:00
Levi	7bcb9b0f62	fixed terms and condition modal issue in login	2017-01-16 11:37:56 -05:00
Levi	f1ce985cff	fixed invoice order, fixed modal css issue	2017-01-16 11:28:31 -05:00
Levi	8a4a2ff941	fixed scroll navbar issue, fixed supportus, fixed billing addres	2017-01-16 11:03:23 -05:00
Levi	83b135763d	fixed scroll navbar issue	2017-01-13 09:48:02 -05:00
Levi	bdfb37bf83	fixing footer year	2017-01-11 12:10:33 -05:00
Levi Velázquez	3eb0a276ea	Merge pull request #155 from naqv/hover_digitalglarus ... Hover digitalglarus	2017-01-10 20:17:27 -05:00
Levi Velázquez	64150650eb	Merge pull request #161 from levivm/feature/new_digitalglarus ... Feature/new digitalglarus	2017-01-10 20:13:02 -05:00
Levi	cc7c34e780	remove modal	2017-01-10 20:12:26 -05:00
unknown	cc7a670d2d	modal fixed	2017-01-10 18:32:53 -04:00
unknown	a2759833a5	change branch	2017-01-10 10:36:18 -04:00
unknown	5ab4bdd075	probando	2017-01-09 21:23:51 -04:00
Levi	640819c7de	Fixed #2806 and #2863	2017-01-09 19:49:10 -05:00
unknown	6d2761fcdf	modal	2017-01-09 19:44:20 -04:00
Levi	ef07f5da83	#2905	2017-01-09 09:34:25 -05:00
unknown	af3980d372	credit card edit elimated. The new card is a little more fastter. The whirte margin is again eliminated.	2017-01-06 11:33:55 -04:00
unknown	2b2b40a9ef	carousel working fine, and new activity of edit exp date of credit card is on testing	2017-01-04 23:20:54 -04:00
Levi	bf82aa61f1	Fixed #2862. Fixed #2861. Fixed #2864. Fixed #2865	2017-01-04 20:31:53 -05:00
unknown	86777a4699	credit card edit	2017-01-03 09:33:25 -04:00
unknown	ad581bbf40	Merge remote-tracking branch 'upstream/feature/new_digitalglarus' into hover_digitalglarus	2016-12-22 11:20:43 -04:00
unknown	17eb651979	credit card issues	2016-12-22 11:18:30 -04:00
Levi Velázquez	272e414b5c	Merge pull request #157 from levivm/feature/new_digitalglarus ... Fixed #2789 #2788 #2790 #2812 #2811	2016-12-20 18:08:01 -05:00
unknown	1648d9558c	credit card, button, modal size fixed	2016-12-20 11:15:09 -04:00
unknown	8f44c43850	credit card	2016-12-19 11:29:01 -04:00
Levi	3da05e8025	Finished responsive issues	2016-12-19 09:33:15 -05:00
unknown	089454e8ac	fixing problems and credit card template and views	2016-12-14 10:34:20 -04:00
Levi	06d03bbe90	changed email logo and style	2016-12-13 12:09:32 -05:00
Levi	a84a88479f	Fixed #2789 #2788 #2790 #2812 #2811	2016-12-13 10:54:05 -05:00
unknown	888cdc51e2	sprint 6	2016-12-12 11:38:23 -04:00
unknown	8e01e07a88	Merge remote-tracking branch 'upstream/feature/new_digitalglarus' into hover_digitalglarus	2016-12-09 11:11:47 -04:00
unknown	e124169596	narbar problem, line in the modal, modal center, footer readable	2016-12-09 11:11:41 -04:00
Levi Velázquez	89db83a873	Merge pull request #152 from levivm/feature/new_digitalglarus ... #2770	2016-12-08 18:31:33 -05:00
Levi	764a79a89c	#2770	2016-12-08 18:29:28 -05:00
unknown	73a18542b0	coherent button style and notice box	2016-12-08 19:15:59 -04:00
Levi Velázquez	aea6ecd105	Merge pull request #149 from naqv/hover_digitalglarus ... Hover digitalglarus	2016-12-07 10:38:49 -05:00
unknown	87db00b90d	new fiex problems	2016-12-07 11:20:20 -04:00
Levi	d4deadbd37	fixing booking order creation	2016-12-06 22:19:22 -05:00
Levi	082cb09e9b	Merge branch 'feature/new_digitalglarus' of github.com:ungleich/dynamicweb into feature/new_digitalglarus	2016-12-06 21:48:26 -05:00
Levi	61d15b1250	fixing payment booking bug	2016-12-06 21:47:59 -05:00
unknown	c18ca3a7df	fixing some problems	2016-12-06 11:23:51 -04:00
unknown	34c9cc0ef2	fixed some issues	2016-12-06 10:32:58 -04:00
Levi Velázquez	c3714e3c4a	Merge pull request #146 from naqv/hover_digitalglarus ... Hover animation	2016-12-05 23:00:34 -05:00
unknown	402a6d001e	spring 5 without the notice box	2016-12-05 11:24:46 -04:00
Levi	16522cae1b	Finished #2759 #2748 #2747	2016-12-04 19:44:26 -05:00
unknown	855c8f1140	narbar	2016-12-01 00:28:06 -04:00
unknown	c78eb5fe58	Hover animation	2016-11-30 13:16:10 -04:00
Levi	b588dcf741	Fixed #2693	2016-11-29 01:20:42 -05:00
Levi	8d78e417f8	Merge branch 'feature/new_digitalglarus' of github.com:ungleich/dynamicweb into feature/new_digitalglarus	2016-11-28 10:33:15 -05:00
Levi	f3ebc52679	Finished #2715 #2716 #2717	2016-11-28 10:32:37 -05:00
Natacha Quintero	0a63917eac	new cchanges and the other changes	2016-11-27 00:35:15 -04:30
Natacha Quintero	b8d576f6ce	hover animation,broken url	2016-11-27 00:21:01 -04:30
Natacha Quintero	569dd1b9e5	finished the problem of the white margin	2016-11-22 00:52:51 -04:30
Natacha Quintero	b299a0383f	terms and conditions	2016-11-21 20:26:03 -04:30
Levi	b3f4576f86	Updated DG index cover img. Updated History DG cover img. working on # 2694 Fixing mobile responsive DG buttons. Added dropdown menu in DG mobile version	2016-11-21 10:41:21 -05:00
Levi	2a4b6e973d	Downgrading django from 1.10 to 1.9. Added supports.html. Added supports view . Fixing post supports style. Working on # #2689 Removing links from supportus.html. . Working on # #2689 FIxed history fonts style and color . Working on # #2689 Finished supportus.html. Working on # #2689 Tagging post. Working on # #2689 Fixing broken links history.html. Working on #2674 Deactivate membership. Working on #2686 Reactivate membership	2016-11-17 21:08:16 -05:00
Levi	2102823f8e	added supportus view	2016-11-03 12:59:32 -05:00
Levi	56776e8894	Edited membership_order_list.html to allow “become a member” option.Edited membership_order_list.html for new deactivate membership flow.Fixed get_current_membership function .Fixed Reactivated membership view.Fixed Mixin to know if an user is an active member or not.	2016-10-31 23:01:43 -05:00
Levi	ba2e231078	As an user I want to receive an email after finishing a booking process. Change Ungleich logo in email to DG logo. Error in membership booking email order dates. Fixed #2670 Design order email when a booking is free.Fixed template issues. Helping natacha to fix bug deploying project. Fixing copies.Fixed #2682. Fixed #2685 fixing copies . Helping natacha fixing bugs. Fixed #2677 Address line change. Started reactivate membership feature	2016-10-28 11:25:09 -05:00
Levi	735089785b	Fixed: #2669 Membership date range is incorrect.Fixed: #2671 Error when user try to access membership view without having one.Fixed: #2672: As I user want to know my next membership date range.Fixed #2673: Enable new Main DG index.Fixed #2657 :cancel membership button style fix	2016-10-23 18:09:01 -05:00
Levi	08d1077ad0	Delete required membership months from booking view. Delete required membership months from booking order view. Delete required membership moths from booking order model. Fixed error on membership date range on order detail.Fixed #2650. Fixed #2652. Checked #2658	2016-10-22 23:15:23 -05:00
Levi	35bd78a78b	Fixed #2652: Order confirmation page needs buttons for next action. Fixed #2653: cancel subscription modal position adjustment. Fixed #2658: Billing address info change page. Fixed #2659: order history page booking history list. Issue #2659 Added start date and end _date to membership model attributes. Fixed membership creating process in order to set start and end membership dates. Fixed start date and end date in membership detail view and orders list in order to use new membership attributes model. Adding membership order after booking. Fixed Membership creation when an booking is placed.Fixed #2661 : move DG terms and condition text+ checkbox in order page.Fixed 2663: DG pricing page column width fix.Fixed #2660: DG footer style fix	2016-10-18 23:29:07 -05:00
Levi	042fa547e3	Fixed #2651: Reduce book button size	2016-10-15 17:00:10 -05:00
Levi	102aec9c16	Fixed #2650: Add 'Go back' button to registration/unregistration steps	2016-10-15 16:58:40 -05:00
Levi	ce544a5997	Fixed #2624: view invoice button redirection	2016-10-15 16:34:26 -05:00
Levi	fe01c0baf3	Added Billing Address success message	2016-10-14 01:17:10 -05:00
Levi	86583993cd	#hotfix removed import pdb	2016-10-14 01:06:09 -05:00
Levi	a44e4f4733	Fixed Error on Allowed booking days by user	2016-10-14 01:04:40 -05:00
Levi	e1a43f1d29	Fixed free days amount when user should pay extra membership months	2016-10-14 00:51:39 -05:00
Levi	05a165095d	Fixed redirect signup error. Fixed login next url error	2016-10-14 00:11:05 -05:00
Levi	eaf1f1de86	Created current user billing address model in membership payment	2016-10-13 23:50:13 -05:00
Levi	082f39e9dc	Added url in booking&price menu bar button. Fixed bug when user booked for 1 days and two free days were being given. Created UserBillingAddress. Created UserBillingAddress Form.Created UserBillingAddress after first user payment. Added Previous Billing data to booking payment view if there is one. Moved booking button. Fixed error on free days in booking invoice. Added modal to cancel subscription page. Now a member can booking without entering his billing address or credit card info. Fixed error on free days.Current user billing address is showed on billing and booking order details. Edit billing address form added.Added user_billing_address.html. Added user billing address get views. Filled user billing address view with current user billing address.Now an user can edit his billing address. Added is_free flag in Select Booking Dates in order to now if a booking is free. Changed Booking Order Model in order to allow free payments. Added free payment template. Added free payment into Booking Payment View. Fixed issue #2586: new digitalglarus navbar font change.Fixed issue #2608 : style fix new DG.Fixed #2617: fix input fields and btn responsiveness on DG payment page. Fixed #2620: responsive issue in DG order summary.Fixed #2623: Order history style fix for deativate button and message below.Fixed #2625: DG membership activation page fix. Fixed #2616: fix navbar responsivness for new DG. Fixed #2619: credit card input field responsiveness fix	2016-10-13 23:33:48 -05:00
Levi	30ff53c629	Added Login View Test. Added Signup View Test. Added Reset Password View Test. Added Password Reset Confirm View Test. Added Membership Payment View Test for Post request. Added Membership Payment View test for urls, Membership Payment View Test tests for urls. Added odd cases to tests.	2016-10-04 23:26:02 -05:00
Levi	1a8b5e69a0	Fixed issue 2624, Creating command to charge all members for their membership month, Fixing bug on make charge membership command, Added language activation for make charge command	2016-10-01 17:17:46 -05:00
Levi	447ddc7c2e	finishing digitalglarus booking	2016-09-29 00:04:40 -05:00
Levi	80095ed1aa	#hotfix Fixed select date picker	2016-09-19 19:20:57 -05:00
Levi	45374f8623	fixed jquery cdn link	2016-09-15 23:27:46 -05:00
Levi	37b70df4be	fixed datepicker cdn link	2016-09-15 23:24:46 -05:00
Levi	a7de458a02	Fixing css bugs, Changed booking form, Changed booking input from range to two separated inputs , Change booking view validations	2016-09-15 23:16:21 -05:00
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
Tomislav R	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
Raul Ascencio	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
Raul Ascencio	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