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

28200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
872870ea18 Merge pull request #6715 from edx/talbs/fix-instructordashboard-icons 
FIX - LMS: Instructor Dashboard Revoke Access Icon
 2015-01-21 15:04:27 -05:00
Chris Dodge
62b58fce02 Only put the TaxID for Invoices, not Credit Card based receipts 2015-01-21 15:02:50 -05:00
Christine Lytwynec
136f8d4efa removing jenkins doc from platform 2015-01-21 14:15:16 -05:00
Braden MacDonald
025f046b04 Fix errors with libraries when old mongo is default (first) modulestore 2015-01-21 11:01:52 -08:00
Brian Talbot
9d2ede98a4 LMS: resolving incorrect icon on Instructor Dashboard admin list mgmt 
UX-1466
 2015-01-21 13:47:12 -05:00
Stephen Sanchez
0bd1f84d6f Merge pull request #6699 from edx/sanchez/unicode_error_verification 
ECOM-959 Making verification msg strings unicode friendly.
 2015-01-21 11:02:00 -05:00
David Baumgold
e6e443c712 Merge pull request #6674 from edx/disable-pylint-name-errors-on-settings 
Ignore invalid-name errors for settings files
 2015-01-21 10:40:05 -05:00
David Baumgold
a72e129da5 Merge pull request #6532 from edx/course-about-i18n 
Improve i18n on course about page
 2015-01-21 10:23:59 -05:00
chrisndodge
ab53bad878 Merge pull request #6704 from edx/cdodge/fix-shoppingcart-back-button 
When changing quantities, be sure to return the new CyberSource submit f...
 2015-01-21 10:22:57 -05:00
Chris Dodge
7faf5cc0f3 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state 2015-01-21 09:12:06 -05:00
Sarina Canelake
6604eedbad Merge pull request #6683 from mitocw/bdero/instructor-dashboard-gitlogs-link 
Add gitlogs link to instructor dashboard
 2015-01-20 21:14:04 -05:00
Carlos Andrés Rocha
065a7f3426 Merge pull request #6702 from edx/sanchez/verification_unicode_names 
ECOM-959 Making verification msg strings unicode friendly.
 2015-01-20 18:59:14 -05:00
Brandon DeRosier
24862edf1c Add gitlogs link to instructor dashboard 2015-01-20 18:55:42 -05:00
stephensanchez
3b5bd4e777 Making verification msg strings unicode friendly. 2015-01-20 21:41:57 +00:00
Renzo Lucioni
1503043826 Merge pull request #6698 from edx/renzo/disable-flaky-bok-choy 
Disable flaky bok-choy tests of payment and verification flow
 2015-01-20 16:40:13 -05:00
stephensanchez
891b952c99 Making verification msg strings unicode friendly. 2015-01-20 21:39:36 +00:00
AlasdairSwan
2ea094e5bc Merge pull request #6700 from edx/alasdair/old-verification-flow-fontawesome-fix 
ECOM-958 fixed font awesome issues with old verification flow
 2015-01-20 16:22:42 -05:00
Diana Huang
1ccc7dc8cc Merge pull request #6677 from edx/diana/handle-expired-verification 
Show an error when a student needs to reverify due to expiration.
 2015-01-20 16:21:13 -05:00
AlasdairSwan
04fc722e1c ECOM-958 fixed font awesome issues with old verification flow 2015-01-20 16:05:55 -05:00
Renzo Lucioni
d6a823c033 Disable flaky bok-choy tests of payment and verification flow 2015-01-20 15:30:23 -05:00
Daniel Friedman
1920ab4149 Merge pull request #6650 from edx/dan-f/validate-group-configuration-group-names 
Require unique group names in group configurations
 2015-01-20 15:27:49 -05:00
Diana Huang
134d2f57b2 Show an error when a student needs to reverify 
due to expiration.
 2015-01-20 14:51:08 -05:00
Greg Price
c2a0b0f06e Merge pull request #6631 from edx/gprice/video-upload-improvements 
Improve code for video upload feature
 2015-01-20 14:47:14 -05:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS 
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
 2015-01-20 14:27:23 -05:00
Christopher Lee
e592eef09b Merge pull request #6675 from edx/clee-MA-234-hotfix 
Named_path variable now populates complete path
 2015-01-20 14:02:46 -05:00
John Eskew
6249584767 Merge pull request #6659 from edx/jeskew/asset_md_size_of_mongo_docs 
Performance test to find asset metadata size.
 2015-01-20 13:31:51 -05:00
christopher lee
b6c08ad213 Named_path variable now populates complete path 2015-01-20 12:53:37 -05:00
Adam
11428fa632 Merge pull request #5237 from mtyaka/mathjax-upgrade 
Upgrade MathJax to 2.4
 2015-01-20 12:26:38 -05:00
Régis Behmo
f3419bb5bb Render enrollment emails in the student's language 
Enrollment, unenrollment and beta role emails should be rendered in the
student's language, and not the instructor's language.
 2015-01-20 18:04:35 +01:00
Régis Behmo
7a2f0640b7 Add Régis Behmo to AUTHORS 2015-01-20 18:04:35 +01:00
Greg Price
874cd5c78f Improve code for video upload feature 
Fix i18n for video status strings (broken in commit 4b53f4d) and remove
unnecessary complexity from a test case. This also removes the status
whitelist in the video upload configuration. Because status is included
in the CSV report, it is not necessary to filter the included videos by
status.
 2015-01-20 11:45:21 -05:00
Sarina Canelake
c1df980077 Merge pull request #6695 from edx/sarina/20150120-update-translations 
Update translations (autogenerated message)
 2015-01-20 11:28:23 -05:00
Daniel Friedman
5cd58897ab Require unique group names in group configurations 
TNL-1142
 2015-01-20 11:25:11 -05:00
John Eskew
a4bbed3bc1 Add performance test which finds the BSON size of varying amounts 
of asset metadata in both the old Mongo and Split modulestores.
 2015-01-20 11:18:24 -05:00
Will Daly
284e78c27e Merge pull request #6690 from edx/will/inline-user-api-forms 
Inline the user api form description calls
 2015-01-20 11:09:01 -05:00
Ben Patterson
349a02e405 Merge pull request #6693 from benpatterson/benp/fix-pylint-error 
Resolve run_pylint error.
 2015-01-20 10:42:32 -05:00
Awais Qureshi
9783630dc0 Merge pull request #6666 from edx/awais786/ECOM-924-unique-code-url 
Awais786/ecom 924 unique code url
 2015-01-20 20:36:32 +05:00
Sarina Canelake
503f4d95bb Update translations (autogenerated message) 2015-01-20 10:04:06 -05:00
Xavier Antoviaque
0c7620a544 Merge pull request #6637 from open-craft/mtyaka/validate-chars 
Improve JS course key validation to not allow special chars.
 2015-01-20 16:02:32 +01:00
Awais
b12d007138 ECOM-924 Adding redeem code url in attached email file 2015-01-20 19:20:51 +05:00
Ben Patterson
11613bd26a Resolve run_pylint error. 2015-01-20 06:28:11 -05:00
Tim Babych
957e0e28cc Merge pull request #6685 from edx/tim/get_parent 
make use of xblock.get_parent() in LMS Student Notes
 2015-01-19 23:36:29 +02:00
Will Daly
0a9f9130b0 Inline the user api form description calls 2015-01-19 16:01:11 -05:00
Matjaz Gregoric
e255f4b021 Upgrade MathJax to 2.4. 
Several IE bugs have been fixed in 2.4.
 2015-01-19 08:10:45 +01:00
Tim Babych
b0c2bc2181 make use of xblock.get_parent() 2015-01-19 08:32:40 +02:00
Ben Patterson
f8a048d6e2 Merge pull request #6651 from benpatterson/benp/remove-tddium-scripts 
Remove tddium-only scripts.
 2015-01-18 12:33:46 -05:00
David Baumgold
809d09af07 Merge pull request #6191 from marcore/fix-TNL-726 
CMS fail to collectstatic when USE_CUSTOM_THEME
 2015-01-17 17:08:21 -05:00
Marco Re
d65902ed3c Add themes files to staticfiles_dir in Studio 2015-01-17 13:24:54 +01:00
Anton Stupak
95cc2bb8ab Merge pull request #6667 from edx/anton/edxnotes-fix-ui-hat 
TNL-1220: Fix Harvard Text Annotation UI.
 2015-01-17 13:04:02 +02:00
John Eskew
b14eaa038c Merge pull request #6627 from edx/jeskew/perf_test_asset_metadata_find_mongo 
Add performance test when finding asset metadata.
 2015-01-16 17:03:02 -05:00