Commits · 87e292ba1a47a04ffc5b24742556d58c50ac3860 · edx / edx-platform · GitLab

08 Sep, 2014 4 commits
- Merge pull request #4560 from edx/zub/story/updatestudioimportstatusui · 87e292ba
```
show upload progress on import course view
```
  zubair-arbi committed Sep 08, 2014
  87e292ba Browse Files
- Merge pull request #5102 from edx/ahodges/doc/DOC860 · 84c8d653
```
Strengthened warnings to remember passphrase. Fixes DOC-860.
```
  Alison Hodges committed Sep 08, 2014
  84c8d653 Browse Files
- Strengthened warnings to remember passphrase · 60afd9db
```
@stroilova, @srpearce, please take a look. Fixes DOC-860.
```
  Alison Hodges committed Sep 08, 2014
  60afd9db Browse Files
- show upload progress on import course view + display last import status on import page load · fc7d491c
```
STUD-2017
```
  zubair-arbi committed Sep 08, 2014
  fc7d491c Browse Files
07 Sep, 2014 2 commits
- Merge pull request #5108 from edx/pmitros/retrofix-xargs · 5364508e
```
XBlock argument passing support backport from SDK
```
  Piotr Mitros committed Sep 07, 2014
  5364508e Browse Files
- XBlock argument passing support · 167f4171
  Piotr Mitros committed Sep 07, 2014
  
  167f4171 Browse Files
05 Sep, 2014 34 commits
- Merge pull request #5000 from mitocw/cg/upgrade_gunicorn · d640b537
```
Upgrading gunicorn to latest
```
  Carson Gee committed Sep 05, 2014
  d640b537 Browse Files
- Merge pull request #5107 from edx/adam/resolve-merge-conflicts · 58e6dcf7
```
Adam/resolve merge conflicts
```
  Adam committed Sep 05, 2014
  58e6dcf7 Browse Files
- Merge pull request #5083 from edx/split/revert-to-published · 3f8ea64d
```
LMS-11357 Split revert_to_publish: correctly revert to Published version
```
  Nimisha Asthagiri committed Sep 05, 2014
  3f8ea64d Browse Files
- Merge pull request #5110 from edx/split/pylint-fixes · 69ce5ac8
```
Pylint issues in test_mixed_modulestore.py.
```
  Nimisha Asthagiri committed Sep 05, 2014
  69ce5ac8 Browse Files
- Update mongo count. · 0bd9bc62
  Nimisha Asthagiri committed Sep 05, 2014
  
  0bd9bc62 Browse Files
- Merge pull request #5105 from edx/talbs/os-ggg-a11y · a6f2dd67
```
LMS: Accessibility Tweaks 
```
  Brian Talbot committed Sep 05, 2014
  a6f2dd67 Browse Files
- LMS-11357 Split revert_to_publish: correctly revert to Published version · 2fa445c4
  Nimisha Asthagiri committed Sep 05, 2014
  
  2fa445c4 Browse Files
- Pylint issues in test_mixed_modulestore.py. · c0ee1940
  Nimisha Asthagiri committed Sep 05, 2014
  
  c0ee1940 Browse Files
- Merge pull request #4910 from mlkwaqas/waqas/bld1199-mathjax-error · 9c942d7e
```
MaxJax error while submitting answer
```
  Waqas Khalid committed Sep 05, 2014
  9c942d7e Browse Files
- Merge pull request #5038 from mlkwaqas/waqas/tnl151-closed-thread-flag-post-error · 14d0ac01
```
Flagging posts in closed thread causes an error
```
  Waqas Khalid committed Sep 05, 2014
  14d0ac01 Browse Files
- Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts · cfeb76e6
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
```
  Adam Palay committed Sep 05, 2014
  cfeb76e6 Browse Files
- Merge pull request #5078 from edx/split/has-changes-subtree · 952eb215
```
LMS-11354 Make Split has_changes check subtree.
```
  Nimisha Asthagiri committed Sep 05, 2014
  952eb215 Browse Files
- LMS: revising more pronounced focus state of onboarding buttons · f11b44c4
  Brian Talbot committed Sep 05, 2014
  
  f11b44c4 Browse Files
- Merge pull request #5097 from edx/hotfix/2014-09-05b · d6688de7
```
Hotfix/2014 09 05b
```
  Adam committed Sep 05, 2014
  d6688de7 Browse Files
- LMS-11354 Make Split has_changes check subtree. · db0f9dfc
  Nimisha Asthagiri committed Sep 05, 2014
  
  db0f9dfc Browse Files
- Merge pull request #5091 from edx/ammar/fix-video-transcripts-test · 98fa4571
```
Fix Video Transcript Test
```
  Jesse Zoldak committed Sep 05, 2014
  98fa4571 Browse Files
- User can flag the post whether thread is closed or open · ac2436f5
```
When the thread is closed user can't able to report
the thread and it gives the error. User can now report
thread even it is closed.

TNL-151
```
  Waqas Khalid committed Sep 05, 2014
  ac2436f5 Browse Files
- Merge pull request #5086 from edx/renzo/fix-embargo-middleware · a741e6a3
```
Refrain from accessing country code if country is None
```
  Renzo Lucioni committed Sep 05, 2014
  a741e6a3 Browse Files
- Merge pull request #5066 from edx/sarina/add-i18n-extract-test · f50b2a7b
```
Add i18n extraction test
```
  Sarina Canelake committed Sep 05, 2014
  f50b2a7b Browse Files
- Merge pull request #5076 from edx/talbs/fix-studio-systemfb-ui · 7b227535
```
FIX: Studio - System Feedback Icon Styling
```
  Brian Talbot committed Sep 05, 2014
  7b227535 Browse Files
- Merge pull request #5098 from edx/adam/forums-script-escape · 2bf9404d
```
escape html for inline discussions (TNL-182)
```
  Adam committed Sep 05, 2014
  2bf9404d Browse Files
- Merge pull request #5095 from edx/cdodge/white-label-small-hotfixes · 08f851aa
```
Cdodge/white label small hotfixes
```
  Adam committed Sep 05, 2014
  08f851aa Browse Files
- escape html for inline discussions (TNL-182) · 58553a7f
  Adam Palay committed Sep 05, 2014
  
  58553a7f Browse Files
- Merge pull request #5084 from edx/hotfix/2014-09-04b · b1ada028
```
Tmporarily disable bulk operations b/c old mongo
```
  Han Su Kim committed Sep 05, 2014
  b1ada028 Browse Files
- Refrain from accessing country code if country is None · c3359135
  Renzo Lucioni committed Sep 05, 2014
  
  c3359135 Browse Files
- Merge pull request #5094 from edx/renzo/readd-embargo-changes · e0c3234f
```
Revert "Revert "Merge pull request #4976 from edx/will/ecom-128""
```
  Renzo Lucioni committed Sep 05, 2014
  e0c3234f Browse Files
- Revert "Revert "Merge pull request #4976 from edx/will/ecom-128"" · aa28fba9
```
This reverts commit 371dfd61.
```
  Renzo Lucioni committed Sep 05, 2014
  aa28fba9 Browse Files
- Merge pull request #5063 from edx/christina/cohorts-bok-choy · 5fc4e02f
```
Christina/cohorts bok choy
```
  Christina Roberts committed Sep 05, 2014
  5fc4e02f Browse Files
- Merge pull request #5027 from edx/clytwynec/make_devstack_default_settings_instead_of_dev · f39d29ae
```
change default settings for servers/assets paver tasks from "dev" to "de...
```
  clytwynec committed Sep 05, 2014
  f39d29ae Browse Files
- Merge pull request #5072 from edx/ammar/tooltip-test · 5bcfaaaa
```
Tooltip Acceptance Test
```
  Muhammad Ammar committed Sep 05, 2014
  5bcfaaaa Browse Files
- Merge pull request #5087 from edx/release · 385b3ff4
```
Release
```
  Adam committed Sep 05, 2014
  385b3ff4 Browse Files
- Merge pull request #5089 from edx/ahodges/doc/repairs20140904 · c000201e
```
Corrections to guides for 4 Sep release
```
  Alison Hodges committed Sep 05, 2014
  c000201e Browse Files
- Mathjax should be used after complete loading · 4834e51a
```
Student couldn't able to submit his answer in ie9
becuase mathjax was used before its complete loading
thats cuase the problem. Mathjax operations should be
handled synchronously inorder to avoid error.

BLD-1199
```
  Waqas Khalid committed Sep 05, 2014
  4834e51a Browse Files
- Merge pull request #3880 from mlkwaqas/waqas/lms2646-create-order-list-index-error · 32d9234b
```
Handle the indexerror exception on create_order
```
  Waqas Khalid committed Sep 05, 2014
  32d9234b Browse Files