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

• 00d962a253
  Merge pull request #578 from tiwariav/bugfix/dcl_tos_style Arvind Tiwari 2018-02-24 20:26:21 +05:30
• 8469dd34a5 css style fix Arvind Tiwari 2018-02-24 20:25:14 +05:30
• 18ef605e53 fix styles for dcl cms plugin Arvind Tiwari 2018-02-24 20:22:27 +05:30
• c10dc9f2e2 Remove some more beta access resources PCoder 2018-02-24 10:12:32 +01:00
• 2b3e834d21
  Update Changelog Arvind Tiwari 2018-02-23 23:19:30 +05:30
• 5fde3de898
  Update agency.css Arvind Tiwari 2018-02-23 21:27:03 +05:30
• bd303d13d5
  Update agency.css Arvind Tiwari 2018-02-23 21:24:44 +05:30
• 27a77d226e
  Update glasfaser.css Arvind Tiwari 2018-02-23 21:09:27 +05:30
• 4d31f2bbdc
  Merge pull request #570 from tiwariav/task/4150/ungleich_mobile_font Arvind Tiwari 2018-02-23 21:05:27 +05:30
• 175a8baee3 font weight fix Arvind Tiwari 2018-02-23 21:01:27 +05:30
• 58491c60da Merge branch 'master' into task/4150/ungleich_mobile_font Arvind Tiwari 2018-02-23 20:49:56 +05:30
• 8e42f4c8b1
  Merge pull request #563 from tiwariav/task/3713/clean_up_css Arvind Tiwari 2018-02-23 20:19:26 +05:30
• 4376ab4904 Merge remote-tracking branch 'ungleich/master' into task/3713/clean_up_css Arvind Tiwari 2018-02-23 20:09:30 +05:30
• 519afe9cd1
  Merge pull request #576 from tiwariav/bugfix/hosting_vm_list Arvind Tiwari 2018-02-23 20:08:32 +05:30
• ef0b2ea34e renamed sdd_size -> ssd_size Arvind Tiwari 2018-02-23 20:05:24 +05:30
• e9e9da519b fix flake8 warning Arvind Tiwari 2018-02-23 19:05:45 +05:30
• 80ed92eece merged master Arvind Tiwari 2018-02-23 18:14:31 +05:30
• d9ee956a29
  Merge pull request #575 from tiwariav/bugfix/digitalglarus_error Arvind Tiwari 2018-02-23 18:06:49 +05:30
• 1e9716cfe6 Update Changelog PCoder 2018-02-23 07:37:59 +01:00
• 9e33168d30 Update Changelog PCoder 2018-02-22 23:42:19 +01:00
• 6b3b86f140
  Merge pull request #574 from pcoder/task/3798/fix_dg_logo_redirection Pcoder 2018-02-22 23:37:53 +01:00
• 1d1232e617
  Merge pull request #573 from pcoder/task/3554/remove_beta_url Pcoder 2018-02-22 23:32:41 +01:00
• d22b57e011 Merge branch 'master' into task/3713/clean_up_css Arvind Tiwari 2018-02-23 01:38:19 +05:30
• 1e7ef77463
  Merge pull request #571 from tiwariav/task/4166/dcl_fix_scroll Arvind Tiwari 2018-02-23 00:21:18 +05:30
• 4b752f31ab Merge branch 'master' into task/3713/clean_up_css Arvind Tiwari 2018-02-22 23:04:09 +05:30
• 74a8a28c52 Reorganize imports and fix flake8 error M.Ravi 2018-02-22 18:20:12 +01:00
• 35d6fd8fd3 Remove datacenterlight/order-success urlconf, view and template as we are not using it anymore M.Ravi 2018-02-22 17:53:47 +01:00
• 03ea94a404 uncomment url Arvind Tiwari 2018-02-22 20:46:02 +05:30
• 26abbbc091 contact section style fix Arvind Tiwari 2018-02-22 18:41:21 +05:30
• 488d259ec5 Merge branch 'master' into task/3554/remove_beta_url M.Ravi 2018-02-22 13:58:02 +01:00
• 14ec15ff13 stylefix Arvind Tiwari 2018-02-22 17:24:45 +05:30
• d9760ba203 Use /cms prefix for multisites also 1.4 PCoder 2018-02-22 10:41:34 +01:00
• 0879a3e324 fix flake8 issues Arvind Tiwari 2018-02-22 14:18:55 +05:30
• 3f489f5498 Update Changelog for 1.4 PCoder 2018-02-22 07:32:31 +01:00
• 059ad0c26a
  Merge pull request #572 from pcoder/multisite Pcoder 2018-02-22 07:22:05 +01:00
• 4035ffcfd4 Log the error also PCoder 2018-02-22 07:07:26 +01:00
• 6477401093 Remove beta access related email templates PCoder 2018-02-22 06:45:58 +01:00
• d72df9b350 Merge remote-tracking branch 'mainRepo/master' into multisite PCoder 2018-02-21 20:19:05 +01:00
• b8db6d708d Rename sdd_size -> ssd_size 1.3.3 M.Ravi 2018-02-21 11:46:33 +01:00
• 22e18f578e Update Changelog for 1.3.3 M.Ravi 2018-02-21 11:41:10 +01:00
• 2927ca96cb Update allowed hosts with nüglarus.ch Nico Schottelius 2018-02-21 11:28:45 +01:00
• 42bb5bd7a9 Update Changelog M.Ravi 2018-02-21 11:15:05 +01:00
• d48f27711c
  Merge pull request #567 from tiwariav/task/4105/cms_ungleich_footer_plugin Pcoder 2018-02-21 11:12:02 +01:00
• e8e9b56c94 Redirect user to digital glarus on clicking logo in the email PCoder 2018-02-20 20:27:37 +01:00
• 8aeefd7144 Remove datacenterlight/img/beta-img.png and hosting/image/Beta.png and corresponding references in the code PCoder 2018-02-20 19:56:18 +01:00
• a5ad1a9edf Remove unused beta access templates and js PCoder 2018-02-20 19:48:52 +01:00
• 3769e00c8c Fix a PEP8 error PCoder 2018-02-20 19:22:28 +01:00
• 8ba3bfc89f Dcl migration for removing beta-access related tables M.Ravi 2018-02-20 15:24:41 +01:00
• 5f136a9dfe Remove BetaAccess related models M.Ravi 2018-02-20 15:13:12 +01:00
• a90bc3b3ce Remove BetaAccess related forms M.Ravi 2018-02-20 15:11:09 +01:00
• 3cdf915b86 Remove more classes related to Beta M.Ravi 2018-02-20 15:06:24 +01:00
• 4f1c5d7c77 Remove BetaProgramView M.Ravi 2018-02-20 12:19:30 +01:00
• cc2e18a7d2 Remove /beta_access url from dcl M.Ravi 2018-02-20 11:58:29 +01:00
• 3389803493 Remove /beta-program url from dcl M.Ravi 2018-02-20 11:54:42 +01:00
• fcd11c93c2 Add UNGLEICH_SITE_CONFIGS env variable to travis.yml PCoder 2018-02-20 09:23:24 +01:00
• 575835aa05 Load multisite urls using json PCoder 2018-02-20 08:48:19 +01:00
• 7f6a66bc16 Update django-multisite version PCoder 2018-02-20 08:25:43 +01:00
• cb102fe622 Use ungleich's fork of djangocms-multisite PCoder 2018-02-20 07:20:01 +01:00
• 05e49b04bb Revert back aldryn_newsblog app PCoder 2018-02-20 07:05:56 +01:00
• 593c83aeee Autoformat membership/admin.py PCoder 2018-02-20 06:58:08 +01:00
• de4d1bc7c8 Change the multisite url prefix multi to ncms PCoder 2018-02-20 06:55:09 +01:00
• cc4f0dc32d Cleanup unused code from urls_multi PCoder 2018-02-20 06:53:29 +01:00
• c1d98603e6 Obtain value for MULTISITE_CMS_URLS from env PCoder 2018-02-20 06:25:02 +01:00
• 3bb64478ed merge master Arvind Tiwari 2018-02-19 02:34:23 +05:30
• d5a0224476 Set FILER_ENABLE_PERMISSIONS to True PCoder 2018-02-17 17:01:07 +01:00
• aa63515ff5 Change url for multi domains PCoder 2018-02-17 16:54:11 +01:00
• 4c5ff149f7 Some multisite parameters PCoder 2018-02-17 16:52:54 +01:00
• 91d340c4b1 Fix some bugs PCoder 2018-02-17 13:11:54 +01:00
• be3aeb45e7 Remove urls2.py PCoder 2018-02-17 11:33:48 +01:00
• bca2956e06 Rename urls1.py to urls_multi.py PCoder 2018-02-17 11:33:28 +01:00
• c1c8b38cf2 Update multisite cms urls, aliases and fallback urls PCoder 2018-02-17 11:30:36 +01:00
• df35fd1f35 Add urls for example1 and example2 M.Ravi 2018-02-15 17:58:30 +01:00
• d7d831a831 Comment out debug_toolbar for DEBUG version M.Ravi 2018-02-15 17:57:54 +01:00
• bea1f40b1b Add multisite dependent apps and corresponding settings M.Ravi 2018-02-15 17:37:51 +01:00
• cb5dd8a592 REmove aldryn_newsblog for the moment M.Ravi 2018-02-15 11:58:44 +01:00
• a30e8a6adf Configure multisite SITE_ID M.Ravi 2018-02-15 10:58:06 +01:00
• f62b331919 Add multisite requirements M.Ravi 2018-02-15 10:55:41 +01:00
• aec7f99aee reduce the scroll amount on click of nav menu Arvind Tiwari 2018-02-15 02:11:08 +05:30
• 0aa0e6fd6c carousel text style made more specific Arvind Tiwari 2018-02-15 02:02:00 +05:30
• bb6e6da2cb left alignment for mobile text, letter spacing reduced to 0px for headings Arvind Tiwari 2018-02-15 01:55:29 +05:30
• a2d79cfab3
  Merge pull request #569 from tiwariav/bugfix/glasfaser_navbar Arvind Tiwari 2018-02-14 05:10:57 +05:30
• 7692997c82 minor improvements Arvind Tiwari 2018-02-13 19:03:15 +05:30
• abf316da9e Add Change password functinality while editing a user via admin site M.Ravi 2018-02-13 03:33:27 +01:00
• 16add66ed8 Improve CustomUserAdmin M.Ravi 2018-02-13 03:01:50 +01:00
• 5e68fec29e Add is_staff setter method for CustomUser M.Ravi 2018-02-13 02:42:40 +01:00
• 6a9232851a Set CMS_PERMISSION True for per page access control M.Ravi 2018-02-13 02:40:29 +01:00
• 7f5866b777 Move djangocms_admin_style above django.contrib.auth in the INSTALLED_APPS M.Ravi 2018-02-13 02:38:23 +01:00
• 74f213e1d5 Set default value for validation_slug M.Ravi 2018-02-13 02:37:03 +01:00
• b99ad38b67 remove yellow from :active state Arvind Tiwari 2018-02-12 03:50:48 +05:30
• c2d048d26b undo style changes inherited from agency.css Arvind Tiwari 2018-02-12 03:44:41 +05:30
• adb0db101d
  Update django.po Arvind Tiwari 2018-02-10 22:11:51 +05:30
• 6c3cb5edaf dcl footer link color Arvind Tiwari 2018-02-09 07:36:04 +05:30
• 39f9dc25e7 fix 404 page Arvind Tiwari 2018-02-09 07:00:36 +05:30
• 909067e11f removed vendor files from hosting and using the ones from dataccenterlight Arvind Tiwari 2018-02-09 06:50:17 +05:30
• f42c5a5e20 Merge branch 'master' into task/3713/clean_up_css Arvind Tiwari 2018-02-09 02:20:06 +05:30
• 40fa46a85a merge migrations Arvind Tiwari 2018-02-09 02:19:05 +05:30
• daf8d178ad Merge branch 'master' into task/4105/cms_ungleich_footer_plugin Arvind Tiwari 2018-02-09 01:35:42 +05:30
• 873c7b6c7c
  Merge pull request #560 from tiwariav/task/cms_plugin_remove_unused_headers Arvind Tiwari 2018-02-09 01:31:28 +05:30
• a3fa4b138f facebook and youtube url added Arvind Tiwari 2018-02-08 21:26:28 +05:30
• c9e2413c4e removed static_placeholder, added previous default Arvind Tiwari 2018-02-08 20:08:20 +05:30