Commit graph

1260 commits

Author SHA1 Message Date
Levi Velázquez
eac1dcbfb3 Merge pull request from levivm/feature/new_digitalglarus
removed stripe keys from settings and script
2016-12-08 20:57:43 -05:00
Levi
8d92ebca88 removed stripe keys from settings and script 2016-12-08 20:51:44 -05:00
Levi Velázquez
89db83a873 Merge pull request from levivm/feature/new_digitalglarus
2016-12-08 18:31:33 -05:00
Levi Velázquez
9a1642ff1b Merge pull request from naqv/hover_digitalglarus
coherent button style and notice box
2016-12-08 18:30:55 -05:00
Levi
764a79a89c 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 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 Velázquez
5eea3e28b7 Merge pull request from levivm/feature/new_digitalglarus
fixing booking order creation
2016-12-06 22:25:53 -05:00
Levi
d4deadbd37 fixing booking order creation 2016-12-06 22:19:22 -05:00
Levi Velázquez
b26e491a7d Merge pull request from levivm/feature/new_digitalglarus
Feature/new digitalglarus
2016-12-06 21:56:05 -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 from naqv/hover_digitalglarus
Hover animation
2016-12-05 23:00:34 -05:00
Levi Velázquez
51d9214fb4 Merge pull request from levivm/feature/new_digitalglarus
Fixed      
2016-12-05 23:00:18 -05:00
unknown
33ce7093cb fix the base.py 2016-12-05 11:56:47 -04:00
unknown
402a6d001e spring 5 without the notice box 2016-12-05 11:24:46 -04:00
Levi
16522cae1b Finished 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 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 2016-11-28 10:32:37 -05:00
Levi Velázquez
bbc2d19512 Merge pull request from naqv/feature/new_digitalglarus
 
2016-11-28 10:16:24 -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
Levi Velázquez
18ff9dd6de Merge pull request from levivm/feature/new_digitalglarus
Support us page, deactivate/reactivate membership.
2016-11-24 19:07:15 -05:00
Natacha Quintero
addf3de67e fixing the base.py 2016-11-22 11:25:03 -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 # Removing links from supportus.html. . Working on # FIxed history fonts style and color . Working on # Finished supportus.html. Working on # Tagging post. Working on # Fixing broken links history.html. Working on Deactivate membership. Working on Reactivate membership 2016-11-17 21:08:16 -05:00
Levi
2102823f8e added supportus view 2016-11-03 12:59:32 -05:00
Levi Velázquez
2bcfb8352d Merge pull request from levivm/feature/new_digitalglarus
Feature/new digitalglarus
2016-11-02 19:21:01 -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 Design order email when a booking is free.Fixed template issues. Helping natacha to fix bug deploying project. Fixing copies.Fixed . Fixed fixing copies . Helping natacha fixing bugs. Fixed Address line change. Started reactivate membership feature 2016-10-28 11:25:09 -05:00
Levi Velázquez
2362413b60 Merge pull request from levivm/feature/new_digitalglarus
Feature/new digitalglarus
2016-10-23 18:22:05 -05:00
Levi Velázquez
6b9d450f34 Merge pull request from levivm/feature/new_digitalglarus
added debug=false to prod settings
2016-10-23 18:20:26 -05:00
Levi
98c6bb3ec8 added debug=false to prod settings 2016-10-23 18:18:49 -05:00
Levi Velázquez
e2597f3ed7 Merge pull request from levivm/feature/new_digitalglarus
Final fixes to DG
2016-10-23 18:11:57 -05:00
Levi
735089785b Fixed: Membership date range is incorrect.Fixed: Error when user try to access membership view without having one.Fixed: : As I user want to know my next membership date range.Fixed : Enable new Main DG index.Fixed :cancel membership button style fix 2016-10-23 18:09:01 -05:00
Levi Velázquez
7381928afb Merge pull request from levivm/feature/new_digitalglarus
Delete required membership months and fixed some css style.
2016-10-22 23:18:03 -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 . Fixed . Checked 2016-10-22 23:15:23 -05:00
Levi Velázquez
8b75ddd64f Merge pull request from levivm/feature/new_digitalglarus
Feature/new digitalglarus
2016-10-18 23:31:55 -05:00
Levi
35bd78a78b Fixed : Order confirmation page needs buttons for next action. Fixed #2653: cancel subscription modal position adjustment. Fixed : Billing address info change page. Fixed : order history page booking history list. Issue 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 : move DG terms and condition text+ checkbox in order page.Fixed 2663: DG pricing page column width fix.Fixed : DG footer style fix 2016-10-18 23:29:07 -05:00
Levi
042fa547e3 Fixed : Reduce book button size 2016-10-15 17:00:10 -05:00
Levi
102aec9c16 Fixed : Add 'Go back' button to registration/unregistration steps 2016-10-15 16:58:40 -05:00
Levi
ce544a5997 Fixed : view invoice button redirection 2016-10-15 16:34:26 -05:00