Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
32,165 Commits 1 Branch 0 Tags
9cbc8564a12eaae381ebefeb7c98b420f7265b68
Commit Graph

32165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carson Gee
1df53ac348 Merge pull request #9080 from mitocw/feature/cg/rfc6266_logger_issue 
Resolved LogHandler bug in rf6266
 2015-07-28 17:17:08 -04:00
jsa
7d8fb73934 commerce/api: pass expiration_datetime when updating modes 2015-07-28 17:17:05 -04:00
Clinton Blackburn
c2fdf8cb2a Corrected CourseMode Display Name 
The Commerce API now sets the correct display name for known course modes, but continues to default to the mode slug for unknown course modes.
 2015-07-28 17:16:43 -04:00
Chris Dodge
81502176e1 Integrate timed and proctored exam authoring into Studio 2015-07-28 17:16:06 -04:00
David Baumgold
263bcaf2fc Simplify birth_year variable 2015-07-28 16:47:03 -04:00
Carson Gee
c19a683f15 Resolved LogHandler bug in rf6266 2015-07-28 16:25:36 -04:00
Renzo Lucioni
dfbfabd8cd Merge pull request #9058 from edx/renzo/update-edx-oauth2-provider 
Update edx-oauth2-provider to 0.5.6
 2015-07-28 15:43:30 -04:00
John Baker
d96648dff1 fixed aws.py 2015-07-28 15:32:28 -04:00
christopher lee
ed3bb27df8 Thread sort key and direction for discussion api 
Discussion API for thread sorting now takes the sort_by
parameter for the sort key such as by comment_count or
vote_count. Also takes the sort_direction parameter for
sorting the thread results.
 2015-07-28 14:34:30 -04:00
Ben McMorran
2bad5946e7 Merge pull request #8982 from edx/benmcmorran/team-discussion-context 
TNL-1943 Support thread context for team discussions
 2015-07-28 14:23:11 -04:00
John Baker
7f3b5c889a Merge pull request #9003 from edx/rc/2015-07-22 
Rc/2015-07-22
 2015-07-28 14:21:48 -04:00
Will Daly
af4a569e89 Merge pull request #9093 from edx/will/ecom-1905 
Allow users to submit initial verification at in-course checkpoints.
 2015-07-28 11:13:32 -07:00
Daniel Friedman
c8e4f2ca7d Merge pull request #9103 from edx/dan-f/fix-team-count 
Fix team count in topic serializers
 2015-07-28 14:10:01 -04:00
David Baumgold
5500603742 assertTrue should be assertEqual 2015-07-28 13:59:04 -04:00
David Baumgold
51976b0616 Minor improvements to learner profile tests 2015-07-28 13:55:49 -04:00
Ben Patterson
77d7a38bd5 Merge pull request #9099 from edx/benp/fix-lettuce-flaky-jul2015 
Fix flaky lettuce test.
 2015-07-28 13:40:05 -04:00
mushtaqali
bfd49b2cd0 Fix markdown editor reference link having colon issue 2015-07-28 22:32:57 +05:00
Awais Jibran
ece64cf2fd Merge pull request #9097 from edx/aj/plat-760-fix-flaky-test_import_timestamp 
Fixed Flaky test
 2015-07-28 22:30:42 +05:00
Ben McMorran
6b08bb20f8 TNL-1943 Support thread context for team discussions 2015-07-28 17:18:45 +00:00
Daniel Friedman
db6add1c59 Fix team count in topic serializers 
TNL-2892
 2015-07-28 13:14:18 -04:00
Awais Jibran
bceb2ae378 Fixed Flaky test (TestLibraryImport.test_import_timestamp) 
PLAT-760
 2015-07-28 21:04:16 +05:00
Ben Patterson
54062801fe Fix flaky test. 
This test failed on master because it saw "Loading" and did not wait.
 2015-07-28 11:52:28 -04:00
Will Daly
945abe72a8 Respond to code review feedback 2015-07-28 08:03:24 -07:00
Clinton Blackburn
f33b451e8a Merge pull request #9081 from edx/clintonb/course-detail-whitelist 
White-listed course detail API calls
 2015-07-28 11:01:11 -04:00
Zia Fazal
41d9338fcc Merge pull request #9076 from edx/ziafazal/SOL-1062 
SOL-1062: generate verify_uuid for web based certificates also
 2015-07-28 19:57:34 +05:00
Christina Roberts
f384400bdf Merge pull request #9026 from edx/christina/tnl1653-incorrect-textbook-link 
Fix View Live link on Textbooks page in Studio.
 2015-07-28 10:04:03 -04:00
David Baumgold
c1a38a6dc7 Pull discussion underscore templates out into individual files 
No need to go through Mako
 2015-07-28 09:36:31 -04:00
Peter Fogg
505b64730a Merge pull request #9082 from edx/peter-fogg/team-list-accessibility 
Give teams view error messages focus.
 2015-07-28 09:03:40 -04:00
Aamir
1061274b52 Merge pull request #9078 from edx/aamir-khan/ECOM-1916-grade-progress-page 
ECOM-1916: updated the dispaly
 2015-07-28 17:06:10 +05:00
Arbab Nazar
84af54b2b1 Merge pull request #8848 from edx/arbab/cert-whitelist-mod 
modify the whitelist cert script to take list of users
 2015-07-28 16:58:21 +05:00
aamir-khan
9f0f081a1f ECOM-1916: updated the dispaly 2015-07-28 14:59:48 +05:00
Davorin Sego
8d6df18357 Course discovery UI improvements 2015-07-28 11:59:44 +02:00
Awais Qureshi
bee837bed4 Merge pull request #9074 from edx/awais786/ECOM-1807-credit-provider-image 
ECOM-1807 Adding provider thumbnail url.
 2015-07-28 12:41:59 +05:00
Will Daly
47b81c9274 Allow users to submit initial verification at in-course checkpoints. 
* Combine verification and reverification photo submission end-points.
* Combine verification and reverification Backbone models.
* Allow deletion of verification status in Django admin.
* Initial verification from a checkpoint is associated with the checkpoint.
* Fix critical bug in which an invalid link was sent to Software Secure
  for the photo ID image of reverification attempts.
 2015-07-27 19:32:18 -07:00
AlasdairSwan
c37df8d2f7 Merge pull request #8970 from jolyonb/jolyonb/footercss 
Fixing printing for footer v3
 2015-07-27 17:28:15 -04:00
Jim Abramson
3a1f9bd816 Merge pull request #9084 from edx/jsa/xcom-497 
commerce/api: Don’t allow setting expiration of prof modes.
 2015-07-27 17:13:03 -04:00
cahrens
44b1971a7c Fix View Live link on Textbooks page in Studio. 
TNL-1653
 2015-07-27 16:58:18 -04:00
John Eskew
4de457495e Bump mongoengine version to 0.10.0 2015-07-27 16:32:02 -04:00
Peter Fogg
becf15e50a Give teams view error messages focus. 2015-07-27 16:22:34 -04:00
jsa
03717f3940 commerce/api: Don’t allow setting expiration of prof modes. 
XCOM-497
 2015-07-27 15:56:53 -04:00
jsa
6c83bff5be commerce/api: pass expiration_datetime when updating modes 2015-07-27 15:56:27 -04:00
David Ormsbee
8d9e907635 Merge pull request #9070 from edx/ormsbee/test_ms_class_setup_teardown 
Modulestore test base class using setUpClass() and tearDownClass()
 2015-07-27 15:05:46 -04:00
chrisndodge
b40fa0a929 Merge pull request #9089 from edx/cdodge/revert-accidental-requirements-edit 
mistaken update of edx_proctoring repo hash update, this was meant fo…
 2015-07-27 14:53:03 -04:00
Jesse Zoldak
296697ab49 Merge pull request #9086 from edx/zoldak/TNL-2667 
Mark CourseTeamPageTest testcase class as flaky
 2015-07-27 14:50:48 -04:00
Chris Dodge
8da554c57e mistaken update of edx_proctoring repo hash update, this was meant for a working branch 2015-07-27 14:48:34 -04:00
Jesse Zoldak
4f9dec8b36 Merge pull request #9060 from edx/zoldak/fix-library-index-test 
Fix library index test
 2015-07-27 14:25:38 -04:00
chrisndodge
574319c412 Update github.txt 2015-07-27 14:17:26 -04:00
John Baker
d6a4949144 Merge pull request #9079 from edx/release 
Release
 2015-07-27 14:10:43 -04:00
Usman Khalid
ce0cc0a346 Merge pull request #9083 from edx/youtube-api-v3 
Upgrade video player to use Youtube API v3.
 2015-07-27 23:10:11 +05:00
Clinton Blackburn
e5ba2a5801 White-listed course detail API calls 
XCOM-518
 2015-07-27 14:06:44 -04:00