Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,986 Commits 1 Branch 0 Tags
dffd8648b3e464bdb45458f18f87cc217432c653
Commit Graph

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Piotr Mitros
6d914e2b0a AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-09 08:43:18 -04:00
Usman Khalid
92a745b638 CodeMirror should use monospace fonts. 
TNL-197
 2014-09-09 08:41:59 -04:00
Gabe Mulley
7900e8d346 Add event tracking endpoint to be called by segment.io 2014-09-09 07:25:54 -04:00
Carson Gee
6b95ec8de2 Corrected NameError for invalid variable 2014-09-08 21:45:14 -04:00
Renzo Lucioni
7c89b93149 Merge pull request #5135 from edx/renzo/fix-embargo-middleware-redux 
Do not call upper on a profile country code of None
 2014-09-08 17:49:30 -04:00
Greg Price
e26457748e Merge pull request #5127 from aboudreault/discussion-request-abort-issue 
Fix discussion error popup on http request abort
 2014-09-08 17:46:16 -04:00
Renzo Lucioni
12d5c9b281 Do not call upper on a profile country code of None 2014-09-08 17:33:02 -04:00
Don Mitchell
0f8355fd47 Test inheritance to new xblocks in same request 2014-09-08 16:13:30 -04:00
Don Mitchell
74c44c5e2b Cache inherited settings outside of structure 
LMS-11363
 2014-09-08 15:55:45 -04:00
Diana Huang
4f67f0dad9 Add course_id as merchant defined data 2014-09-08 15:43:44 -04:00
Alan Boudreault
78fd5cc12a Fix discussion error popup on http request abort 2014-09-08 15:43:37 -04:00
Usman Khalid
d5973a0e44 Merge pull request #5124 from edx/usman/tnl197-codemirror-font 
CodeMirror should use monospace fonts.
 2014-09-09 00:38:49 +05:00
Clinton Blackburn
ee036ecaa6 Updated Analytics Dashboard Message 
Message to dashboard now includes the name of the application.
 2014-09-08 15:37:34 -04:00
Renzo Lucioni
ba7ff67a55 Merge pull request #5113 from edx/renzo/remove-unused-js 
Remove unused analytics JS left over by 3rd party auth changes
 2014-09-08 15:36:05 -04:00
Renzo Lucioni
80a0744e95 Merge pull request #5130 from edx/renzo/autoreg-no-audit-mode 
Skip audit enrollment if user is in the experimental branch
 2014-09-08 15:31:08 -04:00
Renzo Lucioni
0b2840ee6f Skip audit enrollment if user is in the experimental branch 2014-09-08 14:17:04 -04:00
Sarina Canelake
b0c2b73d80 Merge pull request #5112 from edx/sarina/quality-clean 
Quality cleanup
 2014-09-08 13:48:57 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -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
Will Daly
a9c73d2490 Set order status to "paying" before redirecting to the external payment processor. 2014-09-08 10:51:51 -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
Usman Khalid
10f05798e7 CodeMirror should use monospace fonts. 
TNL-197
 2014-09-08 19:45:52 +05: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
0891d9ad6e Added git clean to git export feature 
This ensures that additional exports of the content are the
same the first.
 2014-09-05 16:29:48 -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
Carson Gee
9abd35343e Fixes git export to support repositories with dots in their name 2014-09-05 15:54:58 -04:00
Renzo Lucioni
823be96843 Remove unused analytics JS left over by 3rd party auth changes 2014-09-05 15:46:23 -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
Ben Patterson
6c75704476 add paver test for bok-choy default command. 2014-09-05 13:03:03 -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