ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity
5,232 Commits 13 Branches 148 Tags 315 MiB
Commit Graph

339 Commits

Author SHA1 Message Date
PCoder 29c24574aa Cancel subscription on membership deactivation + some more reorganizes + import logger 2017-12-24 14:26:40 +01:00
PCoder 707e1897b3 Reorganize imports 2017-12-24 14:23:33 +01:00
PCoder 63215b1c42 Organize imports 2017-12-24 13:35:53 +01:00
PCoder b19c3bdcde Reformat code 2017-12-24 13:15:48 +01:00
PCoder b4421bc9b2 Reformat code 2017-12-24 13:06:23 +01:00
PCoder f6d0b6ce9c Add stripe_subscription_id to MembershipOrder data 2017-12-24 12:54:59 +01:00
PCoder 3ed6119dc9 Check if DG subscription created was under trial; if not show error 2017-12-24 12:53:23 +01:00
PCoder f5170cce5f Call DG subscribe_customer_to_plan with trial period until first of next month 2017-12-24 12:51:16 +01:00
PCoder 3826ca207a Reformat code 2017-12-24 12:48:03 +01:00
PCoder 11b8ebe401 Import time 2017-12-24 12:46:36 +01:00
PCoder 0091281357 Add next_month_in_sec_since_epoch MembershipType function 2017-12-24 12:45:59 +01:00
PCoder b2d0fd45ad Fix PEP8 error 2017-12-24 00:21:25 +01:00
PCoder 872582f45f Add tentative code to subscribe customer to Stripe plan (wip) 2017-12-24 00:08:17 +01:00
PCoder f226c551a8 Add stripe_subscription_id field to MembershipOrder 2017-12-24 00:06:21 +01:00
PCoder 10bc05f700 User customer's name instead of email for cardholder_name if not provided 2017-12-23 23:07:53 +01:00
PCoder 1f85273fd0 Set cardholder_name field for UserBillingAddressForm in digital glarus membership payment post 2017-12-23 22:59:16 +01:00
Arvind Tiwari 6515195af5 digitalglarus logo alignment fix 2017-12-09 05:19:07 +05:30
Arvind Tiwari ed873ca59f
Merge pull request #532 from tiwariav/task/3594/digitalglarus_responsive_scrollbar_fix 
task/3594 digitalglarus landing page fix
 2017-12-05 17:28:26 +05:30
Arvind Tiwari 1d3307043e mobile text size and alignment fix 2017-11-29 01:30:50 +05:30
Arvind Tiwari 2d05720016 merged master 2017-11-27 16:30:42 +05:30
PCoder 273fa75d55 Fix PEP8 warnings 2017-11-26 01:12:16 +01:00
PCoder 1dc5bb9bc8 Use /cms in digitalglarus.test_views.ViewsTest 2017-11-25 19:12:08 +01:00
Arvind Tiwari e0f2fb2f1f digitalglarus history html fix 2017-11-25 23:37:02 +05:30
Arvind Tiwari 9156e35f97 Merge branch 'master' into task/3594/digitalglarus_responsive_scrollbar_fix 2017-11-25 23:09:34 +05:30
PCoder 01aadefd6c Comment code that fails assertion 2017-11-25 12:39:56 +01:00
Arvind Tiwari 38c0c653df image set to background of each slide instead of a common background 2017-11-25 02:34:26 +05:30
Arvind Tiwari 994f193276 html fix 2017-11-06 00:26:39 +05:30
Arvind Tiwari 19f91773e3 contact map working 2017-11-05 14:25:17 +05:30
Arvind Tiwari fbf2fdd78b impact hub logo container alignment fix 2017-11-02 23:57:54 +05:30
Arvind Tiwari fcc22945a4 digitalglarus landing page animation direction changed, bootstrap grid fix 2017-11-02 23:49:38 +05:30
Arvind Tiwari 452089e103 translation fix 2017-10-10 21:38:49 +05:30
Andrii Marynets 3fc1cd9463 Fix url which will be deprecated in Django 1.10 2017-07-19 00:39:52 +03:00
M.Ravi 04fe427571 Added link to impact hub logo 2017-07-18 19:47:45 +02:00
Pcoder 7dcf335c3a Merge pull request #402 from pcoder/task/3590/impact_hub_partner_logo_text 
Added impacthub partner text and logo. Adjusted the layout for various screens.
 2017-07-17 23:52:43 +02:00
PCoder a2631a9e8d Added impacthub partner text and logo. Adjusted the layout for various screens. 2017-07-18 03:03:36 +05:30
PCoder a570f9963f Generated .po for digitalglarus 2017-07-16 23:26:07 +05:30
Andrii Marynets c7feed6a73 Delete commented code 2017-07-13 23:50:11 +03:00
Andrii Marynets a8be59d7a2 Add GA to all important apps 2017-07-13 22:53:15 +03:00
M.Ravi f9c3c80864 Merged the latest master into siarheipuhach-feature/flake8 2017-07-03 23:47:56 +02:00
Andrii Marynets bc73ad3c4c Ticket #3539. Fix issues: not loading favicon.ico on digitalglarus.ch 2017-07-03 22:32:32 +03:00
Andrii Marynets 1f658a425f Merge with master 2017-07-02 17:56:49 +03:00
Siarhei Puhach edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
M.Ravi 0499181b5f Removed all .mo files from git 2017-06-14 16:21:44 +05:30
Levi 96272ffd44 added mo files 2017-06-06 00:08:22 -05:00
modulos 37a9629408 Add more translations 2017-05-30 15:57:36 +02:00
modulos 48050a2360 Remove .mo files and update .po files 2017-05-29 16:12:28 +02:00
modulos a044490ec3 Add i18n to hosting/order 
With this commit most work for i18n of the order page is done. However
django errors, e.g. 'this field is required', aren't transalted yet.
 2017-05-26 17:02:22 +02:00
Modulos 32f52c1791 Remove author from blog posts 2017-04-27 03:25:14 +02:00
Levi 38934b0883 added request beta notification 2017-02-16 22:32:14 -05:00
Levi ea2f6444db Added alplora and datacenter beta program 2017-02-14 23:34:06 -05:00
Levi 8e5834b2dd fixed blog posts css issue 2017-01-31 10:09:24 -05:00
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