Commit Graph

319 Commits

Author SHA1 Message Date
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
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