Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
Bill DeRusha
98254e5cec Safe templatize: choose.html 2016-05-12 11:29:20 -04:00
Bill DeRusha
970fd6db1d Safe Templatize: wiki templates 2016-05-12 11:27:16 -04:00
Ned Batchelder
76449b6a32 Merge pull request #12400 from reciproco/master 
Fix CRI-57 Bug
 2016-05-12 11:22:41 -04:00
Ned Batchelder
1ef94b7694 Update translations (autogenerated message) 2016-05-12 14:48:44 +00:00
Douglas Hall
6c4f471787 Always include the course price in the course_about template context 2016-05-11 21:26:56 -04:00
Douglas Hall
2e7a5a0f6a Include course price in course_about template context if either the ecommerce service is enabled or shoppingcart is enabled 2016-05-11 16:35:07 -04:00
Matt Drayer
a9b7e4c63d mattdrayer/course-mode-bulk-sku: Add new CourseMode field 
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
 2016-05-11 10:57:24 -04:00
Christina Roberts
8340703f41 Merge pull request #11620 from openfun/regisb/include_geo_data_in_student_profile_report 
Include non-obsolete location info in student profile report
 2016-05-11 09:25:59 -04:00
Robert Raposa
80c3f84262 Fix safe template issues for 0 violations for some rules 2016-05-10 15:35:57 -04:00
Calen Pennington
099ce1303a Re-generate the modulestore collection names for every test 2016-05-10 14:32:14 -04:00
AlasdairSwan
599070e5ef Merge pull request #12412 from edx/alasdair/program-listing-certificate-fix 
If not certificates remove the container element from the DOM
 2016-05-10 13:00:11 -04:00
Régis Behmo
fe41e50d74 Include non-obsolete location info in student profile report 
The student profile report that can be downloaded from the course staff
dashboard included the "location" field (which is obsolete) and the
mailing address, which is seldom completed. Here, we add the "country"
and "city" fields to the csv report. To do so, we need to be able to
dump the new fields to JSON so we convert the user fields to unicode
when needed.

Note that this breaks compatibility with earlier reports.
 2016-05-10 18:25:15 +02:00
AlasdairSwan
9becd565b3 If not certificates remove the container element from the DOM 2016-05-10 11:42:29 -04:00
cahrens
a49cdc7a1a These old discussion templates are not referenced in the codebase. 2016-05-10 10:46:59 -04:00
tasawernawaz
6404150365 Merge pull request #12403 from edx/tasawer/story/ecom-3729-update-verification-status-area 
Update student verification area
 2016-05-10 18:00:50 +05:00
Chris Rodriguez
6951497a16 AC-396 updating courseware nav to display correctly on high contrast displays 2016-05-10 08:23:36 -04:00
Tasawer
03e241ecc4 Update student verification area 
ECOM-3729
 2016-05-10 09:11:51 +00:00
attiyaishaque
dbad1881d2 Screenreader added to the button "Upgrade to Verified" and "View Xseries Details" in LMS Dashboard. 2016-05-10 12:42:12 +05: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
Chris Rodriguez
96ca09f45c Membership page label additions and fixes 2016-05-09 12:32:46 -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
wajeeha-khalid
05b2e65e0f MA-2247 return student view data for discussion module 2016-05-09 17:37:31 +05:00
reciproco
c9727a2bbb Fix CRI-57 Bug 
Fix error in instructor dashboard, data download section, when trying to download a csv with the issued certificates in a spanish (es-419) configured edx-platform deployment returns a UnicodeEncodeError: 'ascii' codec can't encode character u'\xf3' in position 16: ordinal not in range(128)
 2016-05-08 22:18:12 +02: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
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
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
Chris Rodriguez
cb19cdd256 AC-405 calculator image to icon 2016-05-06 12:48:44 -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
Diana Huang
07573c5141 Replace old conditional lettuce test with bok choy version. 2016-05-06 09:38:36 -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
e13ab68090 ECOM-4352 Update the min height of the title of the program cards 2016-05-05 15:21:07 -04: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
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
Usman Khalid
855fdbd387 Moved all logic from karma config files to karma.common.conf.js. 
The config files just declare lists of files.
 2016-05-05 22:38:34 +05:00
Usman Khalid
ecf233c1b4 Keep karma config file docs only in karma.common.conf.js. Duplicate stuff tends to get out of sync. 2016-05-05 22:35:54 +05:00
Usman Khalid
bb7b29b308 Deleted js-test-tool config files. 2016-05-05 22:35:53 +05:00
sanfordstudent
db52e0334f Merge pull request #12333 from edx/sstudent/MA-2252 
Sstudent/ma 2252
 2016-05-05 12:52:09 -04:00
Ned Batchelder
190c2ffc99 Update translations (autogenerated message) 2016-05-05 15:52:25 +00:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -04:00