Levi Velázquez
|
2481f610a6
|
Merge pull request #128 from levivm/feature/new_digitalglarus
Feature/new digitalglarus
|
2016-10-01 17:20:36 -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 Velázquez
|
cb3c527198
|
Merge pull request #127 from levivm/feature/new_digitalglarus
fixed jquery cdn link
|
2016-09-15 23:28:43 -05:00 |
|
Levi
|
45374f8623
|
fixed jquery cdn link
|
2016-09-15 23:27:46 -05:00 |
|
Levi Velázquez
|
a95dc3f199
|
Merge pull request #126 from levivm/feature/new_digitalglarus
fixed datepicker cdn link
|
2016-09-15 23:25:33 -05:00 |
|
Levi
|
37b70df4be
|
fixed datepicker cdn link
|
2016-09-15 23:24:46 -05:00 |
|
Levi Velázquez
|
9d706384fe
|
Merge pull request #125 from levivm/feature/new_digitalglarus
Fixing css bugs, Changed booking form, Changed booking input from ran…
|
2016-09-15 23:19:47 -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 Velázquez
|
81a08be463
|
Merge pull request #124 from levivm/feature/new_digitalglarus
#hotfix removed pdb
|
2016-09-14 00:48:32 -05:00 |
|
Levi
|
974fdd3419
|
#hotfix removed pdb
|
2016-09-14 00:45:33 -05:00 |
|
Levi Velázquez
|
7afef7578f
|
Merge pull request #123 from levivm/feature/new_digitalglarus
Reduced pixels needed to navbar transition color, Added membership de…
|
2016-09-14 00:26:16 -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 Velázquez
|
13d54ad8d3
|
Merge pull request #122 from levivm/feature/new_digitalglarus
Fixed cc brand bug, Added button to print/save pdf to booking order …
|
2016-09-08 23:26:37 -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 Velázquez
|
7265131919
|
Merge pull request #121 from levivm/feature/new_digitalglarus
fixed redirect url
|
2016-09-05 20:06:47 -05:00 |
|
Levi
|
63dd0f3ea0
|
fixed redirect url
|
2016-09-05 20:06:20 -05:00 |
|
Levi Velázquez
|
e245c1d092
|
Merge pull request #120 from levivm/feature/new_digitalglarus
Feature/new digitalglarus
|
2016-09-05 19:48:40 -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 Velázquez
|
9cba962f68
|
Merge pull request #119 from levivm/master
Updating master
|
2016-08-22 03:18:00 -05:00 |
|
Levi
|
66533b1c1a
|
Merge branch 'master' of github.com:ungleich/dynamicweb
|
2016-08-22 03:14:20 -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 Velázquez
|
e98a7a497e
|
Merge pull request #118 from levivm/feature/new_digitalglarus
added signup links
|
2016-08-20 01:16:51 -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
|
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
|
2016-08-15 23:56:24 -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
|
ab5a7462ad
|
Now if an user after cancel his donation, he make it again, we reactivate his donator status. Fixed css on donations.html
|
2016-08-05 01:00:44 -05:00 |
|
Levi
|
bad053e4de
|
Now an user can’t reanude his donation, he needs to make a new one.
|
2016-08-04 23:14:07 -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
|
c370863c56
|
added ungleich logo to nosystemd landing
|
2016-08-01 00:22:35 -05:00 |
|
Levi
|
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
|
2016-07-31 18:58:43 -05:00 |
|
Levi
|
57d27e8bc6
|
added local settings file again
|
2016-07-29 00:43:41 -05:00 |
|
Levi
|
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.
|
2016-07-29 00:17:34 -05:00 |
|
Levi
|
b5557a63a2
|
addedm migrations
|
2016-07-27 00:22:11 -05:00 |
|
Levi
|
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
|
2016-07-27 00:08:45 -05:00 |
|
Levi
|
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.
|
2016-07-22 01:24:32 -05:00 |
|
Levi
|
da9169c4ce
|
Added login.html, Added login view , Added login form,Created Donation Django Model
|
2016-07-19 01:07:49 -05:00 |
|
Levi
|
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
|
2016-07-18 21:24:44 -05:00 |
|
Levi
|
e05c7bbf46
|
#hotfix fixed 404 font issue
|
2016-07-16 11:58:43 -05:00 |
|
Levi
|
7cd5244fdc
|
Added PostListViewUngleichTest, Added PostDetailViewUngleich, Converted detail ungleich post view into Class Based Django view, Added translations to ungleich landing page
|
2016-07-15 00:14:51 -05:00 |
|
Levi
|
48650f33ce
|
Added new 404.html page
|
2016-07-11 21:18:19 -05:00 |
|