Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,560 Commits 1 Branch 0 Tags
32071af4b685e88d9c393ead419fc097374c99ff
Commit Graph

25560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
32071af4b6 TE-468 JS test improvement: test for attributes specifically 
This test is failing in a different test environment (Solano) because
the built html has reversed the order of the width and height attributes
from what we are expecting. This change focuses the assertion to the
pieces that are important (as noted in the unchanged comment above
the assertion).
 2014-09-10 16:59:28 -04:00
Piotr Mitros
a12c795944 Merge pull request #5120 from edx/pmitros/aws-djpyfs 
AWS settings for XBlocks to have filesystem-like storage
 2014-09-08 11:59:23 -04:00
Greg Price
3cf2481e6c Merge pull request #5077 from edx/gprice/forum-cohort-selector-test 
Test cohort selector in NewPostView
 2014-09-08 11:54:30 -04:00
Sarina Canelake
47a412dedf Merge pull request #5125 from edx/sarina/2014-09-08-translations 
Update translations (autogenerated message)
 2014-09-08 11:52:25 -04:00
Sarina Canelake
a37ec7a10f Update translations (autogenerated message) 2014-09-08 11:14:47 -04:00
Piotr Mitros
31176aeb37 AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-08 10:46:18 -04:00
zubair-arbi
87e292ba1a Merge pull request #4560 from edx/zub/story/updatestudioimportstatusui 
show upload progress on import course view
 2014-09-08 19:28:46 +05:00
Alison Hodges
84c8d6537e Merge pull request #5102 from edx/ahodges/doc/DOC860 
Strengthened warnings to remember passphrase. Fixes DOC-860.
 2014-09-08 09:21:20 -04:00
Alison Hodges
60afd9db0e Strengthened warnings to remember passphrase 
@stroilova, @srpearce, please take a look. Fixes DOC-860.
 2014-09-08 09:20:37 -04:00
zubair-arbi
fc7d491cdc show upload progress on import course view + display last import status on import page load 
STUD-2017
 2014-09-08 17:51:51 +05:00
Piotr Mitros
5364508e48 Merge pull request #5108 from edx/pmitros/retrofix-xargs 
XBlock argument passing support backport from SDK
 2014-09-07 12:51:56 -04:00
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -04:00
Carson Gee
d640b53760 Merge pull request #5000 from mitocw/cg/upgrade_gunicorn 
Upgrading gunicorn to latest
 2014-09-05 15:58:02 -04:00
Adam
58e6dcf79c Merge pull request #5107 from edx/adam/resolve-merge-conflicts 
Adam/resolve merge conflicts
 2014-09-05 14:55:24 -04:00
Nimisha Asthagiri
3f8ea64d33 Merge pull request #5083 from edx/split/revert-to-published 
LMS-11357 Split revert_to_publish: correctly revert to Published version
 2014-09-05 14:38:45 -04:00
Nimisha Asthagiri
69ce5ac849 Merge pull request #5110 from edx/split/pylint-fixes 
Pylint issues in test_mixed_modulestore.py.
 2014-09-05 14:33:36 -04:00
Nimisha Asthagiri
0bd9bc628c Update mongo count. 2014-09-05 14:13:00 -04:00
Brian Talbot
a6f2dd67e4 Merge pull request #5105 from edx/talbs/os-ggg-a11y 
LMS: Accessibility Tweaks
 2014-09-05 13:57:57 -04:00
Nimisha Asthagiri
2fa445c413 LMS-11357 Split revert_to_publish: correctly revert to Published version 2014-09-05 13:54:24 -04:00
Nimisha Asthagiri
c0ee194042 Pylint issues in test_mixed_modulestore.py. 2014-09-05 13:46:38 -04:00
Waqas Khalid
9c942d7eba Merge pull request #4910 from mlkwaqas/waqas/bld1199-mathjax-error 
MaxJax error while submitting answer
 2014-09-05 22:31:12 +05:00
Waqas Khalid
14d0ac014e Merge pull request #5038 from mlkwaqas/waqas/tnl151-closed-thread-flag-post-error 
Flagging posts in closed thread causes an error
 2014-09-05 22:29:44 +05:00
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
 2014-09-05 13:20:15 -04:00
Nimisha Asthagiri
952eb215f0 Merge pull request #5078 from edx/split/has-changes-subtree 
LMS-11354 Make Split has_changes check subtree.
 2014-09-05 13:03:28 -04:00
Brian Talbot
f11b44c49e LMS: revising more pronounced focus state of onboarding buttons 2014-09-05 12:50:15 -04:00
Adam
d6688de7e4 Merge pull request #5097 from edx/hotfix/2014-09-05b 
Hotfix/2014 09 05b
 2014-09-05 12:40:48 -04:00
Nimisha Asthagiri
db0f9dfc83 LMS-11354 Make Split has_changes check subtree. 2014-09-05 12:20:32 -04:00
Jesse Zoldak
98fa457188 Merge pull request #5091 from edx/ammar/fix-video-transcripts-test 
Fix Video Transcript Test
 2014-09-05 12:02:13 -04:00
Waqas Khalid
ac2436f520 User can flag the post whether thread is closed or open 
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
 2014-09-05 20:58:10 +05:00
Renzo Lucioni
a741e6a3d5 Merge pull request #5086 from edx/renzo/fix-embargo-middleware 
Refrain from accessing country code if country is None
 2014-09-05 11:44:45 -04:00
Sarina Canelake
f50b2a7b5a Merge pull request #5066 from edx/sarina/add-i18n-extract-test 
Add i18n extraction test
 2014-09-05 11:43:52 -04:00
Brian Talbot
7b2275358f Merge pull request #5076 from edx/talbs/fix-studio-systemfb-ui 
FIX: Studio - System Feedback Icon Styling
 2014-09-05 11:37:11 -04:00
Adam
2bf9404d59 Merge pull request #5098 from edx/adam/forums-script-escape 
escape html for inline discussions (TNL-182)
 2014-09-05 11:20:14 -04:00
Adam
08f851aa7e Merge pull request #5095 from edx/cdodge/white-label-small-hotfixes 
Cdodge/white label small hotfixes
 2014-09-05 11:06:59 -04:00
Adam Palay
58553a7fb8 escape html for inline discussions (TNL-182) 2014-09-05 11:02:17 -04:00
Han Su Kim
b1ada02819 Merge pull request #5084 from edx/hotfix/2014-09-04b 
Tmporarily disable bulk operations b/c old mongo
 2014-09-05 11:00:02 -04:00
Renzo Lucioni
c3359135e7 Refrain from accessing country code if country is None 2014-09-05 10:58:18 -04:00
Renzo Lucioni
e0c3234faf Merge pull request #5094 from edx/renzo/readd-embargo-changes 
Revert "Revert "Merge pull request #4976 from edx/will/ecom-128""
 2014-09-05 10:57:39 -04:00
Renzo Lucioni
aa28fba9ad Revert "Revert "Merge pull request #4976 from edx/will/ecom-128"" 
This reverts commit 371dfd6187.
 2014-09-05 10:51:51 -04:00
Christina Roberts
5fc4e02ff8 Merge pull request #5063 from edx/christina/cohorts-bok-choy 
Christina/cohorts bok choy
 2014-09-05 10:35:03 -04:00
clytwynec
f39d29ae1b Merge pull request #5027 from edx/clytwynec/make_devstack_default_settings_instead_of_dev 
change default settings for servers/assets paver tasks from "dev" to "de...
 2014-09-05 10:33:19 -04:00
Muhammad Ammar
5bcfaaaa8b Merge pull request #5072 from edx/ammar/tooltip-test 
Tooltip Acceptance Test
 2014-09-05 18:43:21 +05:00
Adam
385b3ff48a Merge pull request #5087 from edx/release 
Release
 2014-09-05 09:31:40 -04:00
Alison Hodges
c000201e1c Merge pull request #5089 from edx/ahodges/doc/repairs20140904 
Corrections to guides for 4 Sep release
 2014-09-05 09:23:05 -04:00
Waqas Khalid
4834e51aca Mathjax should be used after complete loading 
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
 2014-09-05 17:19:48 +05:00
Waqas Khalid
32d9234b39 Merge pull request #3880 from mlkwaqas/waqas/lms2646-create-order-list-index-error 
Handle the indexerror exception on create_order
 2014-09-05 17:07:46 +05:00
muhammad-ammar
20d6221364 Fix Video Transcript Test 
TE-460
 2014-09-05 10:33:37 +00:00
Chris Dodge
405baab82a don't hard code the shoppingcart order confirmation page to use settings.xxx, allow for microsites to override 2014-09-04 22:18:16 -04:00
Chris Dodge
568ef4184a remove course-id visual column from the list of coupons as it's useless information here and prevents overflows from happening 2014-09-04 22:17:50 -04:00
Alison Hodges
b4ca1c12d8 Corrections to guides for 4 Sep release 
Items repaired:
- Pin_discussion.png file in wring directory
- Discussion_filters.png image in discussion_students unreadable,
replaced
- updated  release date in Research guide change log
- updated  release date in Course Author’s guide change log
- updated  “History” dates for fields added to research guide
 2014-09-04 20:57:37 -04:00