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

41153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rabiaiftikhar
ffa9b7efe3 EDUCATOR-217-364 add logs in bulk email 2017-05-15 09:50:58 +00:00
Renzo Lucioni
6d1c23b7dc Treat empty upgrade deadlines consistently 
The course and program dashboards interpret an empty upgrade deadline to mean that a given seat is available. Previously, program dashboard pages interpreted empty upgrade deadlines to mean that a given seat was not available.

LEARNER-935
 2017-05-14 13:23:13 -04:00
Cliff Dyer
8312abdb3a Merge pull request #13263 from edx/cdyer/xblock3-integration 
Update xblock requirement
 2017-05-12 15:35:39 -04:00
J. Cliff Dyer
c61f2ddc69 Update xblock requirement to 1.0.0. 2017-05-12 14:51:02 -04:00
Brian Jacobel
9c6d94ada0 Require and Webpack can eat the same files 2017-05-12 14:40:31 -04:00
Brian Jacobel
480a3ca60b Move course import JS to Webpack 2017-05-12 14:40:31 -04:00
Renzo Lucioni
49b11cb697 Exclude UTM parameters from marketing URLs when caching programs 
LEARNER-382
 2017-05-12 12:26:54 -04:00
Zubair Afzal
4919868c79 Merge pull request #15100 from edx/zub/ENT-277-enterprise-version-bump-to-0.33.15 
bump enterprise version from 0.33.13 to 0.33.15
 2017-05-12 20:49:50 +05:00
Brittney Exline
69d85dc103 Merge pull request #14985 from open-craft/jill/update-registration-login 
ENT-332/ENT-333 Updates Register and Login as per new design
 2017-05-12 11:07:10 -04:00
Renzo Lucioni
78a9b1f0ae Remove use of read_cached_programs switch 
The read_cached_programs switch was used to control the release of changes for reading programs exclusively from the cache. With those changes stable, the switch is no longer necessary.

LEARNER-382
 2017-05-12 11:06:08 -04:00
Matt Drayer
278fea9d75 Merge pull request #15055 from edx/mattdrayer/ENT-307 
ENT-307: Add waffle switch to disable account activation requirement for onboarding
 2017-05-12 09:49:46 -04:00
Edward Zarecor
4d1694d0e5 Merge pull request #15090 from edx/e0d/icp-footer 
Basic support for an optional ICP number in the footer
 2017-05-12 09:28:01 -04:00
Jillian Vogel
71ba54a963 Updates combined Register, Login, and Password Reset views as per new design 
* Reorders form fields, and updates labels, placeholders, and tip text
* Increases clickable area for links and labels.
* Removes "*" markers from required fields, and instead adds
  "(optional)" labels to visible optional fields.
* Updates font colors and sizes, and removes box shadows
* Adds custom drop-down styles
* Improves responsive design scaling for small screens
* Make Terms of Service and Honor Code open in new window to avoid losing form
  field values.
 2017-05-12 09:18:36 -04:00
adeel khan
18268e6f38 Merge pull request #15039 from edx/adeel/ECOM_7772_log_time_for_sailthru_api_call 
Logging Sailthru api call time for exploring optimal connection timeout time
 2017-05-12 17:49:24 +05:00
Adeel Khan
73e6029de7 Logging Sailthru api call time for exploring optimal connection timeout value. 
ECOM-7772
 2017-05-12 17:06:55 +05:00
Ned Batchelder
af6465b665 Merge pull request #15094 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-05-12 07:41:10 -04:00
Ned Batchelder
25aa711ec8 Update translations (autogenerated message) 2017-05-12 06:28:34 -04:00
zubair-arbi
cb8095a745 bump enterprise version from 0.33.13 to 0.33.15 
ENT-330
 2017-05-12 12:10:45 +05:00
Diana Huang
61c0ec7f42 Merge pull request #15096 from edx/diana/masquerade-issues 
Fix test to use the start instead of due date.
 2017-05-11 17:12:00 -04:00
Diana Huang
ef5c23c59c Fix test to use the start instead of due date. 2017-05-11 14:16:26 -04:00
Alex Dusenbery
caf7c8912a Merge pull request #15046 from edx/aed/TNL-6832 
TNL-6832 | Grade reports should include unenrolled learners
 2017-05-11 13:14:02 -04:00
Alex Dusenbery
b33a9436d6 TNL-6832 | Include inactive enrollees in course and problem grade reports. 2017-05-11 13:10:38 -04:00
sanfordstudent
fd5eef3812 Merge pull request #15026 from edx/neem/TNL-6637 
treat empty string as None for letter grades
 2017-05-11 10:45:17 -04:00
Sanford Student
42fe9bd9b3 treat empty string as None for letter grades 2017-05-11 10:00:19 -04:00
Attiya Ishaque
0e3e90f806 Merge pull request #15057 from edx/ai/EDUCATOR-283 
EDUCATOR-283 Old mathjax not load in preview box.
 2017-05-11 15:59:53 +05:00
attiyaishaque
9188dbdb47 EDUCATOR-283 Old mathjax not load in preview box. 2017-05-11 15:02:17 +05: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
Robert Raposa
10fd02f946 Merge pull request #15074 from edx/robrap/LEARNER-922 
LEARNER-922: Fix logic error in calculating last accessed.
 2017-05-10 14:54:15 -04:00
Douglas Hall
6c36980c2b Merge pull request #15086 from edx/douglashall/fix_activation_email_from_address 
Allow override of initial account activation from address.
 2017-05-10 14:41:27 -04:00
Robert Raposa
8569cb3587 Fix logic error in calculating last accessed. 2017-05-10 13:48:22 -04:00
Douglas Hall
665ec6c475 Allow override of initial account activation from address. 
In PR #15030, we missed adding the override of the initial account activation from address using the ACTIVATION_EMAIL_FROM_ADDRESS SiteConfiguration setting. We had only added the override when a subsequent activation email was sent.

ENT-318
 2017-05-10 13:44:19 -04:00
sanfordstudent
9bedb066cc Merge pull request #15084 from edx/neem/grade_report_revert 
Revert "Fix column alignment issue when Teams is disabled"
 2017-05-10 13:36:34 -04:00
Attiya Ishaque
1bbde0073c Merge pull request #15083 from edx/ai/EDUCATOR-293-remove-flaky 
EDUCATOR-293 Remove flaky decorator from test_proctored_exam_flow.
 2017-05-10 22:33:43 +05:00
attiyaishaque
377283a353 EDUCATOR-293 Remove flaky decorator from test_proctored_exam_flow. 2017-05-10 21:32:18 +05: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
Carol Tong
f3153651d2 Merge pull request #15072 from edx/carol/DOC-3411Help 
DOC-3411 Update lms_config.ini: instructor dashboard Help landing page
 2017-05-10 11:45:22 -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
Carol Tong
9442a2629c DOC-3411 Update lms_config.ini for instr dash landing page 2017-05-10 10:58:41 -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
Douglas Hall
ec45278b05 Merge pull request #15073 from edx/douglashall/activation_email_followup 
Remove edx.org theme override of activation email body.
 2017-05-09 20:58:58 -04:00
Nimisha Asthagiri
e97283ae44 Fix column alignment issue when Teams is disabled 2017-05-09 19:44:34 -04:00
Renzo Lucioni
750d448799 Avoid passing a generator expression to cache.get_many() 
Generator expressions passed to the memcached backend's implementation of get_many() are exhausted prematurely. This results in KeyErrors when the backend tries to map keys returned by memcached back to keys passed by application code.

See https://github.com/django/django/blob/stable/1.8.x/django/core/cache/backends/memcached.py/#L99.

LEARNER-382
 2017-05-09 18:24:39 -04:00
Matt Drayer
b455bd8a98 mattdrayer: Add flag to disable account activation requirement for onboarding 2017-05-09 17:37:25 -04:00
Matthew Piatetsky
5cf828a728 Merge pull request #15077 from edx/LEARNER-886 
LEARNER-886 Fix check for image url on program detail page
 2017-05-09 17:31:57 -04:00