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

25864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
f34a1c9d11 Add the 'meta' column from the UserProfile table to the CSV download 
add special case logic to get the 'meta' field into the downloaded CSV

wip

wip
 2014-09-23 15:08:38 -04:00
Adam
96ac506f6f Merge pull request #5296 from edx/adam/hide-very-long-answers 
keep large answers from appearing (TNL-441)
 2014-09-23 14:01:03 -04:00
chrisndodge
c79a68486e Merge pull request #5306 from edx/cdodge/fix-delete-item-with-coupon 
be sure to constrain the select to the course_id that is being delete
 2014-09-23 13:46:14 -04:00
Jim Abramson
ad002f526b Merge pull request #5323 from edx/jsa/tnl444 
fix 404s when students access group-less threads in cohorted topics
 2014-09-23 13:10:17 -04:00
David Baumgold
15b8aa4b6c Merge pull request #3747 from edx/pmitros/sane-course-listing-order 
Puts course listings in a sane order
 2014-09-23 13:09:09 -04:00
frances botsford
4e1aa77b99 Merge pull request #5303 from edx/diana/update-prof-ed-flow 
Change some text when in professional ed flow
 2014-09-23 12:44:58 -04:00
David Baumgold
9f6454411e Update tests for changed text 2014-09-23 12:02:31 -04:00
David Baumgold
c0a25da964 Skip invalid test when in CMS 2014-09-23 12:02:31 -04:00
Brian Talbot
1b25be655c revising markup and styling for listing header on LMS course dashboard 2014-09-23 12:02:30 -04:00
Piotr Mitros
19356ffd4b Puts course listings in a sane order 2014-09-23 12:02:30 -04:00
Jason Bau
83c54d4e6e Merge pull request #5048 from Stanford-Online/jbau/edx/custom-response-fractional-grades 
capa custom response support for decimal grades
 2014-09-23 06:49:13 -07:00
clytwynec
1e6084b960 Merge pull request #5331 from edx/clytwynec/disable_flaky_video_times_test 
disabling test_video_start_time_and_end_time
 2014-09-23 09:23:26 -04:00
Christine Lytwynec
2887121390 disabling test_video_start_time_and_end_time 2014-09-23 09:15:58 -04:00
Chris Dodge
60de9ba20a be sure to constrain the select to the course_id that is being delete 
wip
 2014-09-22 21:46:11 -04:00
Carlos Andrés Rocha
874c338175 Merge pull request #5316 from rocha/use-default-locale-in-openid-claim 
Use default locale to OpenID profile claims.
 2014-09-22 17:36:26 -04:00
Carlos Andrés Rocha
c35f4bf794 Merge pull request #5314 from rocha/configurable-oauth-enforce-secure 
Allow SSL enforcement for OAuth2 provider to be configurable
 2014-09-22 17:35:43 -04:00
Jason Bau
637f55414f capa custom response support for decimal grades 2014-09-22 13:27:46 -07:00
Frances Botsford
ef1ef98653 adjusting ID verified status to be just verified status 2014-09-22 16:10:23 -04:00
jsa
e00d3330fe fix 404s when students access group-less threads in cohorted topics 
TNL-444
 2014-09-22 15:22:10 -04:00
Carlos Andrés Rocha
5500cc6816 Use default locale to OpenID profile claims. 
If the user has not selected a default locale, then return the default one.
 2014-09-22 15:19:40 -04:00
Carlos Andrés Rocha
e04c6c2a48 Merge pull request #5315 from rocha/fix-fullname-in-oauth2-handler 
Return OpenID Connect user name from user profile.
 2014-09-22 15:14:15 -04:00
Mark Hoeber
c9357985a2 Merge pull request #5318 from edx/markhoeber-doc936 
Content experiments update
 2014-09-22 13:51:17 -04:00
Adam
ef525f288f Merge pull request #5295 from edx/adam/add-simple-help-modal-test 
add simple help-modal-test
 2014-09-22 13:17:47 -04:00
Mark Hoeber
7889585c48 Content experiments update 
comments from Anant
 2014-09-22 13:06:00 -04:00
Carlos Andrés Rocha
19f95f0053 Return OpenID Connect user name from user profile. 2014-09-22 11:34:10 -04:00
Carlos Andrés Rocha
37d604a90f Allow SSL enforcement for OAuth2 provider to be configurable 2014-09-22 10:47:20 -04:00
Adam Palay
5fa38cb59e add simple help-modal-test 2014-09-22 09:34:32 -04:00
Waheed Ahmed
03d9a6fd29 Merge pull request #5277 from edx/waheed/tnl413-fix-course-id-kwarg-on-merge-wiki 
Fixed wiki merge url regex.
 2014-09-22 16:22:53 +05:00
Waheed Ahmed
3e64faeaa3 Fixed wiki merge url regex. 
TNL-413
 2014-09-22 15:41:19 +05:00
Waheed Ahmed
f827c538fc Merge pull request #4460 from edx/waheed/lms6617-disable-student-view-if-course-is-not-released 
Disabled student view if course is not yet released for students.
 2014-09-22 13:25:58 +05:00
Waheed Ahmed
3c8eacd440 Disabled student view if course is not yet released for students. 
LMS-6617
 2014-09-22 12:50:46 +05:00
Frances Botsford
8bd092ec4b adjusting style for professional educationand verification status 2014-09-19 16:27:20 -04:00
John Eskew
4aa2dc5289 Merge pull request #5302 from edx/release 
Release merge - post hotfix-2014-09-19-1
 2014-09-19 14:31:16 -04:00
Diana Huang
c3f88f5def Change some text when in professional ed flow 
ECOM-96
 2014-09-19 14:18:15 -04:00
John Eskew
81d8c40e32 Merge pull request #5281 from edx/adam/hide-tabs-if-not-enrolled-rebase-2 
Deployed as hotfix
 2014-09-19 13:16:01 -04:00
Renzo Lucioni
135ce24977 Merge pull request #5248 from edx/renzo/cleanup-translated-strings 
Clean up translated strings in registration page, dashboard, and track selection flow
 2014-09-19 12:57:39 -04:00
Adam Palay
f57e30959e keep large answers from appearing (TNL-441) 2014-09-19 11:41:01 -04:00
srpearce
afc07cdac2 Merge pull request #5284 from edx/sylvia/docs/DOC-866 
Sylvia/docs/doc 866
 2014-09-19 11:00:35 -04:00
Sylvia Pearce
e00fa34fbb Added note about video URLs hidden by default 2014-09-19 10:59:51 -04:00
Clinton Blackburn
a5237a858e Merge pull request #5188 from edx/insights-staff-only 
Hiding Insights link for non-staff users
 2014-09-19 10:51:19 -04:00
Clinton Blackburn
8705694743 Hiding Insights link for non-staff users 2014-09-19 10:47:54 -04:00
Piotr Mitros
4d640ee7e3 Merge pull request #4898 from edx/danielli/recommender_pyfs 
RecommenderXBlock with pyfs, better UX, and modification of logging
 2014-09-19 10:40:06 -04:00
Adam Palay
0a385544a3 update number of queries in embargo test 2014-09-19 10:19:23 -04:00
Adam Palay
ac862b7a97 only load tabs if user is enrolled in course (TNL-286) 
add tests for static tabs
 2014-09-19 10:19:23 -04:00
swdanielli
165b015fe0 move to s3fs and handle one time url 2014-09-19 09:39:17 -04:00
Ned Batchelder
10bd2b003f Merge pull request #5129 from edx/ned/python-zip-assets 
Python zip file importable from an asset
 2014-09-18 19:31:47 -04:00
Ned Batchelder
616bbbab4e Importable python_lib.zip assets 
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
 2014-09-18 17:59:12 -04:00
srpearce
c2c65c5db1 Merge pull request #5287 from edx/sylvia/docs/relnotes918revision 
Correct name of video option
 2014-09-18 16:11:16 -04:00
Sylvia Pearce
586d3ba45d Correct name of video option 2014-09-18 16:10:34 -04:00
David Baumgold
6325206d49 Merge pull request #4697 from edx/db/update-multiple-deps 
Upgrade scipy, lxml, boto, edx-ora2
 2014-09-18 15:16:04 -04:00