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

10026 Commits

Author SHA1 Message Date
Kevin Luo
af9dce82a3 Make LTI grade submissions respect deadlines 2015-01-21 17:05:46 -08:00
Sarina Canelake
e70a5e265c Merge pull request #6082 from openfun/edx/translate-enrollment-emails 
Render enrollment emails in the student's language
 2015-01-21 16:40:51 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms 
Add RequireJS and RequireJS Optimizer configuration to the LMS
 2015-01-21 15:23:35 -05:00
Brian Talbot
9d2ede98a4 LMS: resolving incorrect icon on Instructor Dashboard admin list mgmt 
UX-1466
 2015-01-21 13:47:12 -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
Brandon DeRosier
24862edf1c Add gitlogs link to instructor dashboard 2015-01-20 18:55: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
Diana Huang
134d2f57b2 Show an error when a student needs to reverify 
due to expiration.
 2015-01-20 14:51:08 -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
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
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
Awais
b12d007138 ECOM-924 Adding redeem code url in attached email file 2015-01-20 19:20:51 +05: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
polesye
1d9b5a9736 TNL-1220: Fix Harvard Text Annotation UI. 2015-01-16 22:45:07 +02:00
Ned Batchelder
e64d45b705 Merge pull request #6563 from edx/ned/fix-6013 
Fixes for #6013: Implement user service to return currently-logged-in user
 2015-01-16 15:12:31 -05:00
Brian Talbot
a8cc338711 Merge pull request #6672 from edx/talbs/fix-edxnotes-links+highlights 
LMS: Student Notes - Styling links to appear in highlighted text
 2015-01-16 14:49:08 -05:00
chrisndodge
dde097c926 Merge pull request #6676 from edx/release 
Release
 2015-01-16 14:07:44 -05:00
Nimisha Asthagiri
8ed247b362 Merge pull request #6662 from edx/mobile/MA-227 
MA-227 Mobile announcements sort order correction.
 2015-01-16 12:45:08 -05:00
Nimisha Asthagiri
8394fb71ac Merge pull request #6608 from edx/mobile/MA-216 
MA-216 Mobile API: display unreleased courses in enrollment list.
 2015-01-16 12:41:21 -05:00
Jason Bau
7f1b60b286 Implement user service to return currently-logged-in user 
returns XBlockuser with 2 data layers
 2015-01-16 11:40:06 -05:00
Jason Bau
dd18a8e618 User service PR: fix unrelated courseware test 
Makes lms/djangoapps/courseware/tests/test_views.py:test_index_invalid_position
actually do what it intends to do, but fixing the URL the
test client visits
 2015-01-16 11:40:05 -05:00
David Baumgold
ef43840a79 Ignore invalid-name errors for settings files 
path.py objects report themselves as class objects, which confuses the heck out of
pylint. It tries to match variable names using the class-rgx regular expression
instead of the constant-rgx regular expression, and it doesn't match, so it
throws an error. Not sure how to fix pylint, so we'll just ignore these errors.
 2015-01-16 11:37:28 -05:00
Will Daly
314ad95797 Merge pull request #6658 from edx/will/ECOM-894 
ECOM-894: Allow inactive users to request a password reset
 2015-01-16 11:27:00 -05:00
Brian Talbot
26fb3fc557 LMS: student notes - styling links to appear in highlighted text 2015-01-16 11:07:55 -05:00
Nimisha Asthagiri
caee333142 MA-227 Mobile announcements sort order correction. 2015-01-16 08:58:08 -05:00
Will Daly
8228337063 Allow inactive users to request a password reset 
Internationalize error messages for password reset on the new login page.
 2015-01-16 08:24:27 -05:00
Renzo Lucioni
2db00c5723 Merge pull request #6647 from edx/renzo/split-payment-verification-acceptance-tests 
Bok Choy tests for the split payment and verification flow
 2015-01-16 01:47:04 -05:00
Nimisha Asthagiri
dea6b764de Mobile enrollments API: sort order by recent enrollment date. 2015-01-15 21:53:42 -05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Chris Dodge
5880401d9d add a missing check for an undefined object 2015-01-15 18:58:11 -05:00
Renzo Lucioni
c6777a5b25 Bok Choy tests for the split payment and verification flow 
Adds mode creation endpoint to course_modes app and ability to bypass media device access prompt when proceeding through verification flow in a testing environment.
 2015-01-15 17:25:25 -05:00
Matt Drayer
27fee62039 Merge pull request #6126 from edx/ziafazal/add-pre-requisite-course-via-milestones-app 
Ziafazal/add pre requisite course via milestones app
 2015-01-15 14:20:44 -08:00
Nimisha Asthagiri
a07f607281 Updated strategy per review feedback. 2015-01-15 17:15:46 -05:00
Sarina Canelake
68b18a20b2 Merge pull request #6624 from mitocw/bdero/sysadmin-dashboard-link 
Add link to sysadmin dashboard on core theme
 2015-01-15 16:08:25 -05:00
Adam
b9bd659861 Merge pull request #6654 from edx/merge-release-into-master 
Merge release into master
 2015-01-15 16:00:38 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
chrisndodge
c4cd94d756 Merge pull request #6583 from edx/muhhshoaib/shoppingcart-redemption-page-cross-browser-compatibility-fix 
fix the redemption page cross browser issue on safari
 2015-01-15 14:57:05 -05:00
Adam Palay
4381ccd463 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-01-15 14:51:34 -05:00
David Baumgold
b390e18d34 Improve i18n on course about page 2015-01-15 14:38:17 -05:00
Awais Qureshi
5959edb493 Merge pull request #6645 from edx/aamir-khan/ECOM-887-post-payment-message 
ECOM-887 Removed the "We have successfully verified your identity" line.
 2015-01-15 23:12:58 +05:00
David Baumgold
b3fda9c561 Merge pull request #6646 from edx/missed-an-ellipses 
Missed an ellipsis
 2015-01-15 11:56:03 -05:00
Chris Dodge
1fcca3a942 add back inclusion of the receipt_custom_pane.html at the bottom of the receipt page 2015-01-15 11:50:15 -05:00
Waheed Ahmed
373f8e82f3 Fixed unicode error in CSV grade report generation. 
TNL-1196
 2015-01-15 11:47:25 -05:00
jsa
0049c97d8f use bulk_ops on course_about 2015-01-15 10:37:25 -05:00