Commit Graph

22621 Commits

Author SHA1 Message Date
Sanford Student
42fe9bd9b3 treat empty string as None for letter grades 2017-05-11 10:00:19 -04:00
Nimisha Asthagiri
424d3b40bf Merge pull request #15089 from edx/neem/redo_bulk_grades
Redo Bulk-reads and Request caching in Course Grade Reports
2017-05-10 18:12:19 -04:00
Andy Armstrong
482f76527e Merge pull request #15064 from edx/andya/welcome-message
Show a welcome message on the course home page
2017-05-10 17:40:25 -04:00
Nimisha Asthagiri
4430695b1c Fix column alignment issue when Teams is disabled
This reverts commit b6b704019f.
2017-05-10 17:14:45 -04:00
Nimisha Asthagiri
adb88e21f3 Bulk-reads and Request caching in Course Grade Report
This reverts commit 5388d5d1fc.
2017-05-10 17:14:29 -04:00
Andy Armstrong
64de44321b Show a welcome message on the course home page
LEARNER-879
2017-05-10 16:53:15 -04:00
Edward Zarecor
6aea3dc041 Basic support for an optional ICP number in the footer 2017-05-10 16:43:30 -04:00
edx-pipeline-bot
544d5d5996 Merge pull request #15085 from edx/release-mergeback-to-master
Merge release back to master
2017-05-10 15:19:09 -04:00
Sanford Student
b6b704019f Revert "Fix column alignment issue when Teams is disabled"
This reverts commit e97283ae44.
2017-05-10 12:10:48 -04:00
Diana Huang
208cffd64d Merge pull request #15075 from edx/diana/reverse-back-arrow-rtl
Swap direction of arrow for RTL.
2017-05-10 11:07:00 -04:00
Nimisha Asthagiri
956207b932 Merge pull request #15081 from edx/neem/bulk-read-grade-report
Grade Report: Fix column alignment issue when Teams is disabled
2017-05-10 10:19:52 -04:00
Nimisha Asthagiri
e97283ae44 Fix column alignment issue when Teams is disabled 2017-05-09 19:44:34 -04:00
Matt Drayer
b455bd8a98 mattdrayer: Add flag to disable account activation requirement for onboarding 2017-05-09 17:37:25 -04:00
Sanford Student
5388d5d1fc Revert "Bulk-reads and Request caching in Course Grade Report"
This reverts commit 16e9636513.
2017-05-09 16:25:46 -04:00
Matthew Piatetsky
21c24eb99e Fix check for image url on program detail page
LEARNER-886
2017-05-09 16:02:56 -04:00
Diana Huang
9cd819808d Swap direction of arrow for RTL. 2017-05-09 14:40:34 -04:00
Robert Raposa
698475f5d3 Merge pull request #15070 from edx/robrap/revert-waffle-hack
Revert: Default unified_course_view on in devstack.
2017-05-09 14:23:18 -04:00
Nimisha Asthagiri
3491837e9c Merge pull request #15036 from edx/neem/bulk-read-grade-report
Bulk-reads and Request caching in Course Grade Report
2017-05-09 10:53:01 -04:00
Nimisha Asthagiri
9df23dc23e Merge pull request #15066 from edx/neem/fix-block-structure-key-error
Fix KeyError issue with empty course structures
2017-05-09 10:39:53 -04:00
Robert Raposa
59522311ef Revert: Default unified_course_view on in devstack. 2017-05-09 10:08:58 -04:00
Matt Drayer
cd56cc56cd Merge pull request #15030 from edx/mattdrayer/ENT-318
ENT-318: Update activation email subject and message text
2017-05-09 09:29:13 -04:00
Nimisha Asthagiri
16e9636513 Bulk-reads and Request caching in Course Grade Report 2017-05-09 08:58:49 -04:00
Nimisha Asthagiri
8c01ffb71a Fix KeyError issue with empty course structures.
EDUCATOR-340
2017-05-09 08:44:09 -04:00
Robert Raposa
ed5412eba9 Merge pull request #15059 from edx/robrap/LEARNER-868
LEARNER-868: Default unified_course_view on in devstack.
2017-05-08 14:23:14 -04:00
Cliff Dyer
65352c9d6c Merge pull request #15060 from edx/neem/handle-iter-errors
Neem/handle iter errors
2017-05-08 14:11:36 -04:00
J. Cliff Dyer
16acfef8ff Add single retry to compute_grades tasks. 2017-05-08 13:52:27 -04:00
Diana Huang
c0b7f9b82d Only try to render dates when user is authenticated. 2017-05-08 12:24:24 -04:00
J. Cliff Dyer
5beae9d1e8 Raise error at first encounter during compute_grades_for_course(_v2) task 2017-05-08 12:18:32 -04:00
J. Cliff Dyer
cebdbc18e7 Update CourseGradeFactory().iter() to return exception objects 2017-05-08 12:16:52 -04:00
Robert Raposa
e185d886d4 Default unified_course_view on in devstack. 2017-05-08 11:45:24 -04:00
Matt Drayer
5e94c63da6 mattdrayer/ENT-318: Update activation email subject and message text 2017-05-06 00:16:43 -04:00
Matthew Piatetsky
15b111410a Merge pull request #15053 from edx/minor_tweaks2
ECOM-6602 Change buy certificate button style
2017-05-05 18:03:43 -04:00
Matthew Piatetsky
7215a86539 Change buy certificate button style
ECOM-6602
2017-05-05 16:45:16 -04:00
Andy Armstrong
6d4f499b1b Merge pull request #15050 from edx/andya/fix-query-count-test
Fix broken Python certificate tests
2017-05-05 16:08:21 -04:00
Andy Armstrong
480cf57026 Improve test failure message 2017-05-05 15:12:21 -04:00
Brandon DeRosier
3d51bd0817 Merge pull request #15022 from open-craft/bdero/ent-361
ENT-361: Allow hiding of IDP selection page during SSO
2017-05-05 15:10:35 -04:00
Andy Armstrong
9ce46a3fb5 Improve course experience tests 2017-05-05 13:55:59 -04:00
Andy Armstrong
75a0fdf0eb Enable course sidebar for new course home page
LEARNER-764
2017-05-05 13:55:59 -04:00
Noraiz Anwar
3c0e02067d Merge pull request #14954 from edx/noraiz/TNL-6870
TNL-6870 Add masquerading feature for preview mode
2017-05-05 18:58:47 +05:00
Andy Armstrong
45d7577268 Merge pull request #14994 from edx/diana/course-dates-fragment
Add course dates fragment to new sidebar
2017-05-05 07:40:52 -04:00
Diana Huang
e12a704cea Add new course dates fragment.
Also add it to the course home page.
2017-05-04 20:53:42 -04:00
marcotuts
01ae718117 visual adjustments to course outline 2017-05-04 17:05:57 -04:00
Muzaffar yousaf
2f293ccc68 Merge pull request #14901 from OmarIthawi/omar/commentable-id-unicode
Unicode fixes for django_comment_client and request_cached decorator
2017-05-04 15:07:22 +05:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app
Use a new external app for help tokens
2017-05-03 18:08:27 -04:00
Matthew Piatetsky
2b8020b673 Merge pull request #15033 from edx/minor_tweaks2
Add view course button
2017-05-03 17:49:24 -04:00
Matthew Piatetsky
e8c90847ce Add view course button
This reverts commit 55268dec72.
2017-05-03 16:37:26 -04:00
Matthew Piatetsky
55268dec72 Revert "Add view course button" 2017-05-03 15:54:10 -04:00
Matthew Piatetsky
efba5ec8cc Merge pull request #15028 from edx/minor_tweaks
Add view course button
2017-05-03 15:35:32 -04:00
Robert Raposa
3b31270e07 Fix Start Course vs Resume Course using Course Blocks. 2017-05-03 15:02:42 -04:00
Matthew Piatetsky
4d08b70bb4 Add view course button 2017-05-03 14:50:29 -04:00