Merge branch 'open-release/ginkgo.master' of…

Merge branch 'open-release/ginkgo.master' of https://git.orhontech.com/edx/edx-platform into open-release/ginkgo.master

cms/envs/common.py

@@ -1176,7 +1176,7 @@ OPENID_DOMAIN_PREFIX = 'openid:'
 UPLOAD_CHUNK_SIZE_IN_MB = 10
 
 ### Max size of asset uploads to GridFS
-MAX_ASSET_UPLOAD_FILE_SIZE_IN_MB = 10
+MAX_ASSET_UPLOAD_FILE_SIZE_IN_MB = 500
 
 # FAQ url to direct users to if they upload
 # a file that exceeds the above size

cms/static/sass/_base.scss

@@ -33,7 +33,7 @@ body {
 }
 
 body, input, button {
-  font-family: 'Open Sans', sans-serif;
+  font-family: 'OrhonChaganTig','Open Sans', sans-serif;
 }
 
 // removing the outline on any element that we make programmatically focusable

lms/envs/common.py

@@ -958,6 +958,7 @@ LANGUAGES = (
     ('lt-lt', u'Lietuvių (Lietuva)'),  # Lithuanian (Lithuania)
     ('ml', u'മലയാളം'),  # Malayalam
     ('mn', u'Монгол хэл'),  # Mongolian
+    ('mn_TR', u'ᠮᠣᠩᠭᠣᠯ'),  # Tradistional Mongolian
     ('mr', u'मराठी'),  # Marathi
     ('ms', u'Bahasa Melayu'),  # Malay
     ('nb', u'Norsk bokmål'),  # Norwegian Bokmål
@@ -2681,6 +2682,7 @@ ALL_LANGUAGES = (
     [u"mg", u"Malagasy"],
     [u"mt", u"Maltese"],
     [u"mn", u"Mongolian"],
+    [u"mn_TR", u"Traditinal Mongolian"],
     [u"na", u"Nauru"],
     [u"nv", u"Navajo"],
     [u"nr", u"Ndebele, South"],

requirements/edx/github.txt

@@ -90,5 +90,7 @@ git+https://git.orhontech.com/edx/xblock-lti-consumer.git@v1.1.5#egg=lti_consume
 git+https://git.orhontech.com/edx/edx-proctoring.git@0.18.1#egg=edx-proctoring==0.18.1
 
 # Third Party XBlocks
-git+https://git.orhontech.com/open-craft/xblock-poll@v1.2.7#egg=xblock-poll==1.2.7
-git+https://git.orhontech.com/edx-solutions/xblock-drag-and-drop-v2@v2.0.18#egg=xblock-drag-and-drop-v2==2.0.18
+#git+https://git.orhontech.com/open-craft/xblock-poll@v1.2.7#egg=xblock-poll==1.2.7
+git+https://git.orhontech.com/edx/xblock-poll.git@v1.2.7#egg=xblock-poll==1.2.7
+#git+https://git.orhontech.com/edx-solutions/xblock-drag-and-drop-v2@v2.0.18#egg=xblock-drag-and-drop-v2==2.0.18
+git+https://git.orhontech.com/edx/xblock-drag-and-drop-v2.git@v2.0.18#egg=xblock-drag-and-drop-v2==2.0.18