Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
36,820 Commits 1 Branch 0 Tags
03e241ecc4be75f2f4dc86805ddac5a1d3ca3dd2
Commit Graph

36820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tasawer
03e241ecc4 Update student verification area 
ECOM-3729
 2016-05-10 09:11:51 +00:00
Douglas Hall
632c38f6ed Merge pull request #12404 from edx/ibrahimahmed443/WL-443-delete-button-height-adjustment 
fix height of delete button to match the attached text field
 2016-05-09 16:37:50 -04:00
Christina Roberts
e953044786 Merge pull request #12388 from edx/christina/course-search-cohort-test 
Fix flaky cohort tests
 2016-05-09 15:51:31 -04:00
sanfordstudent
40c74c3a7a Merge pull request #12406 from edx/sstudent/TNL-4530 
removing redundant fields from outline.selected event
 2016-05-09 15:18:24 -04:00
AlasdairSwan
4a9e7c748c Merge pull request #12380 from edx/alasdair/ECOM-4213-move-program-list-to-pattern-library 
Alasdair/ecom 4213 move program list to pattern library
 2016-05-09 15:05:55 -04:00
AlasdairSwan
2fe52df720 UPdated a11y approach for program card progress bars 2016-05-09 13:52:55 -04:00
Sanford Student
4e7a24e706 removing redundant fields rom outline.selected event 2016-05-09 13:24:32 -04:00
Adam
4d6f8ea7c1 Merge pull request #12393 from edx/add-discussion-id-to-export 
add discussion_id to course structure dump command (AN-6696)
 2016-05-09 13:21:05 -04:00
Adam Palay
bfb319db9a add discussion_id to course structure dump command (AN-6696) 
add test case for discussion_id already set in XML
 2016-05-09 11:24:37 -04:00
cahrens
7ff3c4b3fb Verify New Cohort form is rendered. 
TNL-2257
 2016-05-09 11:21:06 -04:00
wajeeha-khalid
05f00a827c Merge pull request #12132 from edx/jia/MA-2247 
MA-2247: CourseBlockAPI - return discussion student view data
 2016-05-09 18:23:01 +05:00
wajeeha-khalid
05b2e65e0f MA-2247 return student view data for discussion module 2016-05-09 17:37:31 +05:00
Ibrahim
a51143fe38 fix height of delete button to match the attached text field 2016-05-09 16:58:01 +05:00
Douglas Hall
5496ec2ac1 Merge pull request #12399 from edx/merge-patch-2016-05-06-into-master 
Merge patch 2016 05 06 into master
 2016-05-07 10:23:41 -04:00
Douglas Hall
a90840a501 Merge remote-tracking branch 'origin/release' into merge-patch-2016-05-06-into-master 2016-05-06 17:30:51 -04:00
Douglas Hall
e4ed23faa3 Merge pull request #12367 from edx/rc/2016-05-05 
Patch Release 2016-05-05
 2016-05-06 17:22:56 -04:00
Carol Tong
26ea2dff56 Merge pull request #12311 from edx/carol/doc/DOC-2862_All 
DOC-2862: Add doc for Courses API
 2016-05-06 17:08:32 -04:00
Renzo Lucioni
0a61ab7549 Merge pull request #12389 from edx/renzo/fix-sprintf-bug 
Revert "Add js test for analytics event on LMS receipt page"
 2016-05-06 16:01:41 -04:00
John Eskew
e50c660805 Merge pull request #12346 from edx/jeskew/django_upgrade_1_8_13 
Upgrade to Django 1.8.13
 2016-05-06 15:57:50 -04:00
Carol Tong
a1394e9945 Add documentation for Courses API 2016-05-06 15:40:21 -04:00
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests 
Disable caching in LMS tests
 2016-05-06 15:22:48 -04:00
Alison Hodges
a422ad60f7 corrects guide name in template 2016-05-06 14:48:59 -04:00
Alison Hodges
289a4a2abe Merge pull request #12382 from edx/ahodges/DOC-2866 
Updates link to learner info in Numerical Input template
 2016-05-06 14:46:22 -04:00
Renzo Lucioni
c697986a3e Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit f995114d11.
 2016-05-06 14:37:23 -04:00
Adam
97a893efdf Merge pull request #12334 from edx/adam/escape-library-html-only 
escape library.html
 2016-05-06 13:38:32 -04:00
Clinton Blackburn
07fb1645aa Merge pull request #12381 from edx/clintonb/credit-fix 
Multiple Credit Fixes
 2016-05-06 12:40:25 -04:00
Ben Patterson
162135736c Merge pull request #12361 from edx/benp/skip-extra-flaky-tests-fedx-88 
Skip tests that are too flaky to be reliable. FEDX-88.
 2016-05-06 12:16:41 -04:00
Jesse Zoldak
611222fb7f Merge pull request #12387 from edx/zoldak/update-jshint-threshold 
Lower the jshint threshold to 7550
 2016-05-06 11:41:50 -04:00
Ben Patterson
72af8afd67 Skip tests that are too flaky to be reliable. FEDX-88. 2016-05-06 11:27:33 -04:00
Clinton Blackburn
bcd762ef91 Updated credit requirements logic 
Credit eligibility can be updated up to the point that the course is closed or the student submits a request for credit. Credit eligibility cannot be removed.

ECOM-4379
 2016-05-06 10:51:06 -04:00
Diana Huang
2c12deccdd Merge pull request #12124 from edx/diana/conditional-transaction 
Convert conditional module test to bok choy
 2016-05-06 10:48:21 -04:00
Jesse Zoldak
d7e9db66c9 Lower the jshint threshold to 7550 2016-05-06 09:56:23 -04:00
Diana Huang
07573c5141 Replace old conditional lettuce test with bok choy version. 2016-05-06 09:38:36 -04:00
Adam Palay
9ea24bf5e3 escape library.html 
show_children_previews was not being evaluated before
 2016-05-06 09:24:56 -04:00
Clinton Blackburn
9b24735cb9 Credit test cleanup 
Removed a lot of duplicate code!

ECOM-4379
 2016-05-06 02:59:11 -04:00
Clinton Blackburn
51715b9ec5 Exposing CreditRequirement and CreditRequirementStatus in admin 
ECOM-4379
 2016-05-06 02:59:11 -04:00
Alison Hodges
afc5686391 Updates link to learner info in Numerical Input template 2016-05-05 22:29:57 -04:00
Kevin Falcone
61ef49b94c Merge pull request #11922 from edx/jibsheet/html-escape-activation 
Enable safe by default in the activation flow
 2016-05-05 20:52:58 -04:00
Kevin Falcone
15e8829308 Enable safe by default in the activation flow 
The largest changes here were around HTML escaping in the translations.
 2016-05-05 16:39:17 -04:00
Simon Chen
759ad2eaf9 Merge pull request #12379 from edx/schen/ECOM-4352 
ECOM-4352 Update the min height of the title of the program cards
 2016-05-05 16:15:01 -04:00
Simon Chen
e13ab68090 ECOM-4352 Update the min height of the title of the program cards 2016-05-05 15:21:07 -04:00
Usman Khalid
8b645754a1 Merge pull request #12344 from edx/usman/tnl4398-karma-config-improvements 
Karma config improvements.
 2016-05-05 23:36:42 +05:00
Usman Khalid
a2dadeaaf3 Added some documentation to Karma configuration files. 2016-05-05 22:42:04 +05:00
Usman Khalid
667a9b9ae6 Moved common files into karma.common.conf.js. 2016-05-05 22:42:04 +05:00
Usman Khalid
6ed935383b Remove xmodule_js prefix from paths of edx-ui-toolkit, edx-pattern-library and common. 2016-05-05 22:42:03 +05:00
Usman Khalid
39f32f9869 Simplified normalizePathsForCoverage. 2016-05-05 22:42:03 +05:00
Usman Khalid
2839a42e0c Moved jasmine addons to common/js/spec_helpers. 2016-05-05 22:42:02 +05:00
Usman Khalid
84412ef8ea Exclude translation files from coverage tracking. 2016-05-05 22:42:02 +05:00
Usman Khalid
15acec2054 Simplify paths patterns in karma config files. 
Files which are loaded via RequireJs do not need to be individually
declared in karma config files. If we give karma directories,
it will serve all the files in them.
 2016-05-05 22:42:00 +05:00
Usman Khalid
713c79e0aa Set included=false by default because we want to move towards RequireJs. 2016-05-05 22:39:59 +05:00