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

41172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brittney Exline
fa2eaa0c67 Merge pull request #15114 from edx/bexline/enterprise_version_bump 
ENT-359 Bump enterprise package version
 2017-05-15 13:52:29 -04:00
Brittney Exline
cb2fa7610b ENT-359 Bump enterprise package version 2017-05-15 12:05:07 -04:00
Adam
93616b0881 Merge pull request #15108 from edx/adam/fix-bulk-email-for-track 
fix for issue where emails to students in one track are sent to users…
 2017-05-15 10:43:24 -04:00
Edward Zarecor
fd33b38afe Merge pull request #15105 from edx/e0d/icp-footer-for-reals 
Fix the actual template we use
 2017-05-15 10:08:03 -04:00
Gregory Martin
277fb1d291 Merge pull request #15103 from edx/yro-register_compute_grades 
Register compute grades task in CMS
 2017-05-15 07:00:26 -07:00
Calen Pennington
6c4fbd3c11 Merge pull request #15088 from cpennington/footer-support-lang-variants 
Support fallback to supported language variants in the footer
 2017-05-15 09:00:00 -04:00
Calen Pennington
fe7c9a1476 Merge pull request #15087 from cpennington/cale/capture-lang-pref-on-login 
Capture the language preference set by an anonymous user when the reg…
 2017-05-15 08:59:44 -04:00
Adam Palay
c478e796d2 fix for issue where emails to students in one track are sent to users in other tracks, too (EDUCATOR-217) 2017-05-15 08:48:11 -04:00
Ned Batchelder
2dfb6ad2b4 Merge pull request #15101 from open-craft/mtyaka/matplotlib-install-fix 
Move matplotlib to post requirements.
 2017-05-15 07:57:37 -04:00
Muzaffar yousaf
067e33e6a6 Merge pull request #14838 from OmarIthawi/omar/video-player-fullscreen-rtl 
Fix RTL video player and subtitles misplacement in full screen
 2017-05-15 16:55:59 +05:00
Calen Pennington
c9f6872be3 Capture the language preference set by an anonymous user when the register or login 
[LEARNER-168]
 2017-05-15 07:36:56 -04:00
Calen Pennington
03b23da980 Support fallback to supported language variants in the footer 2017-05-15 07:36:38 -04:00
Rabia Iftikhar
875deed507 Merge pull request #15092 from edx/ri/EDUCATOR-217-364-add-logs-bulk-email 
EDUCATOR-217-364 add logs in bulk email
 2017-05-15 16:04:25 +05:00
Asad Iqbal
8540e8f471 Merge pull request #15091 from edx/asadiqbal08/ENT-374 
ENT-374 Ticket should be created without enterprise tags for anonymous users
 2017-05-15 15:20:18 +05:00
rabiaiftikhar
ffa9b7efe3 EDUCATOR-217-364 add logs in bulk email 2017-05-15 09:50:58 +00:00
asadiqbal
8fc31b42e3 ENT-374 Support ticket is created without enterprise tags for Anonymous users. 2017-05-15 13:24:45 +05: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
Gregory Martin
70905c8aab compute grades task register 
https://openedx.atlassian.net/browse/EDUCATOR-388
 2017-05-12 16:25:14 -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
Edward Zarecor
5fccde3e4f Fix the actual template we use 2017-05-12 11:32:23 -04: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
Matjaz Gregoric
aca929de69 Move matplotlib to post requirements. 
Matplotlib depends on numpy, so we want to ensure the correct version
of numpy is already installed when we attempt to install matplotlib.
 2017-05-12 11:16:34 +02: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