Commit graph

Select branches

Hide pull requests

HenryGBC-dcl-bug#3366-3426

aatish/dynamicweb-6213_alignment_fixes

changes-settings

design_membership

feature/nosystemd

feature/old_master

feature/vm_pricing

feature/yearly-subscription

hosting_translations

master

serialize

1.0.0

1.0.1

1.0.10

1.0.11

1.0.12

1.0.13

1.0.14

1.0.15

1.0.16

1.0.17

1.0.18

1.0.19

1.0.2

1.0.20

1.0.21

1.0.22

1.0.23

1.0.24

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1

1.1.1

1.2

1.2.1

1.2.10

1.2.11

1.2.12

1.2.13

1.2.2

1.2.3

1.2.4

1.2.5

1.2.6

1.2.7

1.2.8

1.2.9

1.3

1.3.1

1.3.2

1.3.3

1.4

1.4.1

1.5

1.5.1

1.5.2

1.5.3

1.5.4

1.5.5

1.6

1.6.1

1.6.2

1.6.3

1.6.4

1.6.5

1.7

1.7.1

1.7.2

1.8

1.9

1.9.1

2.0

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.1

2.1.1

2.1.2

2.2

2.2.1

2.2.2

2.3

2.3.1

2.4

2.4.1

2.4.10

2.4.2

2.4.3

2.4.4

2.4.5

2.4.6

2.4.7

2.4.8

2.4.9

2.5

2.5.1

2.5.10

2.5.11

2.5.2

2.5.3

2.5.4

2.5.5

2.5.6

2.5.7

2.5.8

2.5.9

2.6

2.6.1

2.6.2

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

old-2.0

Mono Color

• bbc2d19512 Merge pull request #143 from naqv/feature/new_digitalglarus Levi Velázquez 2016-11-28 10:16:24 -05:00
• 0a63917eac new cchanges and the other changes Natacha Quintero 2016-11-27 00:35:15 -04:30
• b8d576f6ce hover animation,broken url Natacha Quintero 2016-11-27 00:21:01 -04:30
• 18ff9dd6de Merge pull request #141 from levivm/feature/new_digitalglarus Levi Velázquez 2016-11-24 19:07:15 -05:00
• addf3de67e fixing the base.py Natacha Quintero 2016-11-22 11:25:03 -04:30
• 569dd1b9e5 finished the problem of the white margin Natacha Quintero 2016-11-22 00:52:51 -04:30
• b299a0383f terms and conditions Natacha Quintero 2016-11-21 20:26:03 -04:30
• 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 Levi 2016-11-21 10:41:21 -05:00
• 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 Levi 2016-11-17 21:08:16 -05:00
• 2102823f8e added supportus view Levi 2016-11-03 12:59:32 -05:00
• 2bcfb8352d Merge pull request #139 from levivm/feature/new_digitalglarus Levi Velázquez 2016-11-02 19:21:01 -05:00
• 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. Levi 2016-10-31 23:01:43 -05:00
• 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 Levi 2016-10-28 11:25:09 -05:00
• 2362413b60 Merge pull request #137 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-23 18:22:05 -05:00
• 6b9d450f34 Merge pull request #136 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-23 18:20:26 -05:00
• 98c6bb3ec8 added debug=false to prod settings Levi 2016-10-23 18:18:49 -05:00
• e2597f3ed7 Merge pull request #135 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-23 18:11:57 -05:00
• 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 Levi 2016-10-23 18:09:01 -05:00
• 7381928afb Merge pull request #134 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-22 23:18:03 -05:00
• 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 Levi 2016-10-22 23:15:23 -05:00
• 8b75ddd64f Merge pull request #133 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-18 23:31:55 -05:00
• 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 Levi 2016-10-18 23:29:07 -05:00
• 042fa547e3 Fixed #2651: Reduce book button size Levi 2016-10-15 17:00:10 -05:00
• 102aec9c16 Fixed #2650: Add 'Go back' button to registration/unregistration steps Levi 2016-10-15 16:58:40 -05:00
• ce544a5997 Fixed #2624: view invoice button redirection Levi 2016-10-15 16:34:13 -05:00
• 5a5b53d4b2 Merge pull request #132 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-14 01:19:00 -05:00
• fe01c0baf3 Added Billing Address success message Levi 2016-10-14 01:17:10 -05:00
• 9a8af193bc Merge pull request #131 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-14 01:06:52 -05:00
• 86583993cd #hotfix removed import pdb Levi 2016-10-14 01:06:09 -05:00
• a44e4f4733 Fixed Error on Allowed booking days by user Levi 2016-10-14 01:04:40 -05:00
• fdd57de8a5 Merge pull request #130 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-14 00:53:06 -05:00
• e1a43f1d29 Fixed free days amount when user should pay extra membership months Levi 2016-10-14 00:51:39 -05:00
• 05a165095d Fixed redirect signup error. Fixed login next url error Levi 2016-10-14 00:11:05 -05:00
• eaf1f1de86 Created current user billing address model in membership payment Levi 2016-10-13 23:50:13 -05:00
• 68b149cebd Merge pull request #129 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-13 23:39:37 -05:00
• 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 Levi 2016-10-13 23:33:48 -05:00
• 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. Levi 2016-10-04 23:26:02 -05:00
• 2481f610a6 Merge pull request #128 from levivm/feature/new_digitalglarus Levi Velázquez 2016-10-01 17:20:36 -05:00
• 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 Levi 2016-10-01 17:17:46 -05:00
• 447ddc7c2e finishing digitalglarus booking Levi 2016-09-29 00:04:40 -05:00
• 80095ed1aa #hotfix Fixed select date picker Levi 2016-09-19 19:20:57 -05:00
• cb3c527198 Merge pull request #127 from levivm/feature/new_digitalglarus Levi Velázquez 2016-09-15 23:28:43 -05:00
• 45374f8623 fixed jquery cdn link Levi 2016-09-15 23:27:46 -05:00
• a95dc3f199 Merge pull request #126 from levivm/feature/new_digitalglarus Levi Velázquez 2016-09-15 23:25:33 -05:00
• 37b70df4be fixed datepicker cdn link Levi 2016-09-15 23:24:46 -05:00
• 9d706384fe Merge pull request #125 from levivm/feature/new_digitalglarus Levi Velázquez 2016-09-15 23:19:47 -05:00
• a7de458a02 Fixing css bugs, Changed booking form, Changed booking input from range to two separated inputs , Change booking view validations Levi 2016-09-15 23:16:21 -05:00
• 81a08be463 Merge pull request #124 from levivm/feature/new_digitalglarus Levi Velázquez 2016-09-14 00:48:32 -05:00
• 974fdd3419 #hotfix removed pdb Levi 2016-09-14 00:45:33 -05:00
• 7afef7578f Merge pull request #123 from levivm/feature/new_digitalglarus Levi Velázquez 2016-09-14 00:26:16 -05:00
• 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 Levi 2016-09-14 00:24:20 -05:00
• 13d54ad8d3 Merge pull request #122 from levivm/feature/new_digitalglarus Levi Velázquez 2016-09-08 23:26:37 -05:00
• 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. Levi 2016-09-08 23:24:52 -05:00
• 7265131919 Merge pull request #121 from levivm/feature/new_digitalglarus Levi Velázquez 2016-09-05 20:06:47 -05:00
• 63dd0f3ea0 fixed redirect url Levi 2016-09-05 20:06:20 -05:00
• e245c1d092 Merge pull request #120 from levivm/feature/new_digitalglarus Levi Velázquez 2016-09-05 19:48:40 -05:00
• 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. Levi 2016-09-05 19:45:45 -05:00
• 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. Levi 2016-08-30 21:32:45 -05:00
• 9cba962f68 Merge pull request #119 from levivm/master Levi Velázquez 2016-08-22 03:18:00 -05:00
• 66533b1c1a Merge branch 'master' of github.com:ungleich/dynamicweb Levi 2016-08-22 03:14:20 -05:00
• 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 Levi 2016-08-22 02:52:29 -05:00
• e98a7a497e Merge pull request #118 from levivm/feature/new_digitalglarus Levi Velázquez 2016-08-20 01:16:51 -05:00
• fbaf439ebc added signup links Levi 2016-08-20 01:17:29 -05:00
• 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 Levi 2016-08-20 00:57:35 -05:00
• 86bd024490 Merge branch 'develop' feature/old_master Levi 2016-08-16 00:42:03 -05:00
• 4c3b9a5858 Merge branch 'master' of github.com:levivm/dynamicweb Levi 2016-08-16 00:41:38 -05:00
• 1470caee89 added old dg index Levi 2016-08-16 00:14:57 -05:00
• c23a2b1706 Fixed Sign up H2 margin , Added Login Headline, Added Header Background, Changed ungleich logo, Fixed Landing title style, Fixed billing form goes out of background image, Fixed billing address page amount field seems broken, Changed authentication page fonts Levi 2016-08-15 20:45:08 -05:00
• 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 Levi 2016-08-11 01:07:12 -05:00
• 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 Levi 2016-08-09 23:53:49 -05:00
• 0a1cf35770 Merge pull request #116 from levivm/feature/nosystemd feature/nosystemd Levi Velázquez 2016-08-15 22:19:23 -05:00
• d4e2e43d0b Fixed Sign up H2 margin , Added Login Headline, Added Header Background, Changed ungleich logo, Fixed Landing title style, Fixed billing form goes out of background image, Fixed billing address page amount field seems broken, Changed authentication page fonts Levi 2016-08-15 20:45:08 -05:00
• 5675c402fa 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 Levi 2016-08-11 01:07:12 -05:00
• 6a9d8f2b8b 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 Levi 2016-08-09 23:53:49 -05:00
• 1697564a22 Merge branch 'feature/nosystemd' into develop Levi 2016-08-09 01:07:39 -05:00
• a36c1f1d83 Merge branch 'develop' of github.com:levivm/dynamicweb into develop Levi 2016-08-09 01:07:08 -05:00
• a27e7f9828 added new index.html and history.html to digitalglarus Levi 2016-08-09 00:54:25 -05:00
• 57b660fc19 Merge pull request #113 from levivm/feature/nosystemd Levi Velázquez 2016-08-06 10:48:57 -05:00
• 1d6c380127 #hotfix fixed digitalglarus home Levi 2016-08-06 10:46:06 -05:00
• cb55deb5d9 Merge pull request #112 from levivm/feature/nosystemd Levi Velázquez 2016-08-05 01:20:11 -05:00
• 471197963b #hotfix restoring digitalglarus template Levi 2016-08-05 01:19:25 -05:00
• 0e99639330 Merge pull request #111 from levivm/feature/nosystemd Levi Velázquez 2016-08-05 01:05:12 -05:00
• ab5a7462ad Now if an user after cancel his donation, he make it again, we reactivate his donator status. Fixed css on donations.html Levi 2016-08-05 01:00:44 -05:00
• 8aee8ed94e Merge pull request #110 from levivm/feature/nosystemd Levi Velázquez 2016-08-04 23:50:19 -05:00
• bad053e4de Now an user can’t reanude his donation, he needs to make a new one. Levi 2016-08-04 23:14:07 -05:00
• 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 Levi 2016-08-04 01:07:41 -05:00
• 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 Levi 2016-08-03 00:50:33 -05:00
• c370863c56 added ungleich logo to nosystemd landing Levi 2016-08-01 00:22:35 -05:00
• 8439057f1d Move donation and subscription out from the user menu to the navbar, Changed donations.html background and style, Added donation status to donations.html. Added button cancel donation to donation.html ,Added button reactivate donation to donation.html,Fixed some bugs on donation view. 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 Levi 2016-07-31 18:58:43 -05:00
• 57d27e8bc6 added local settings file again Levi 2016-07-29 00:43:41 -05:00
• 4e07385949 Added command make_donations_charges in order to create stripe current monthly donations from all donators. Now the user can logout using navbar. Added restriction to user in order to make a donation when he has an active monthly donation . Added donations view where the user can view their recents donations. Now users receive an email after making his first donation. Levi 2016-07-29 00:17:34 -05:00
• b5557a63a2 addedm migrations Levi 2016-07-27 00:22:11 -05:00
• 4580a75f89 Added DonatorStatus model in order to know if an donator has canceled or not his monthly donation, Now we create a DonatorStatus for the user after receiving his first donation. Added DonatorStatus view. Added donator_status.html in order to allow an user view his donation status , Added action to allow user to cancel his monthly donations. Now the user can logout using navbar. added Donation model to admin.Added command make_donations_charges in order to create stripe current monthly donations from all donators Levi 2016-07-27 00:08:45 -05:00
• cb520f6b58 Created signup view. Added login after signup.Added signup url to nosystem app urls.py. Added logout view, Added logout button on nabber, Added password reset form, Added password view , Added password reset html, Added password reset email for nosystemd app. Added confirm_reset_password.html, Added confirm_ reset password view, Added confirm reset password form, Fixed reset password token generation, Started donation view, Added donation view, Added donation.html, Added donation form, Adding donation.js lib in order to capture stripe payments for nosystem app. Levi 2016-07-22 01:24:32 -05:00
• da9169c4ce Added login.html, Added login view , Added login form,Created Donation Django Model Levi 2016-07-19 01:07:49 -05:00
• abda918c48 Created .po translation file for login.html, signup.html, reset_password.html, confirm_reset_password.html, base_short.html, order_detail.html. Created .po translation file for orders.html, virtual_machine_detail.html, virtual_machines. created .po translation file for virtual_machine_key.html, notifications.html Levi 2016-07-18 21:24:44 -05:00
• d7f7d498f5 Created .po translation file for login.html, signup.html, reset_password.html, confirm_reset_password.html, base_short.html, order_detail.html. Created .po translation file for orders.html, virtual_machine_detail.html, virtual_machines. created .po translation file for virtual_machine_key.html, notifications.html Levi 2016-07-18 21:24:44 -05:00
• e17c006582 #hotfix fixed 404 font issue Levi 2016-07-16 11:58:43 -05:00
• e05c7bbf46 #hotfix fixed 404 font issue Levi 2016-07-16 11:58:43 -05:00
• 1e18a3c7a9 Added PostListViewUngleichTest, Added PostDetailViewUngleich, Converted detail ungleich post view into Class Based Django view, Added translations to ungleich landing page Levi 2016-07-15 00:14:51 -05:00