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

41060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
Andy Armstrong
97c084514f Merge pull request #15044 from edx/bjacobel/mako-bundle-nonfatal 
Mako should be able to render even if webpack hasn't run
 2017-05-04 17:55:40 -04:00
Andy Armstrong
70f4bcc619 Merge pull request #15040 from edx/andya/feature-test-coverage 
Make tests and coverage work with openedx/features
 2017-05-04 17:52:12 -04:00
Renzo Lucioni
7fc356b537 Merge pull request #15035 from edx/renzo/improved-program-caching 
Add management command for caching program data
 2017-05-04 17:34:41 -04:00
Robert Raposa
1262bf74e5 Skip test. 2017-05-04 16:56:09 -04:00
Renzo Lucioni
6cf2503f0b Add management command for caching program data 
This command requests every available program from the discovery service, writing each to its own cache entry with an indefinite expiration. It is meant to be run on a scheduled basis and should be the only code updating these cache entries.

LEARNER-382
 2017-05-04 15:35:26 -04:00
Robert Raposa
86637d7f6c Various test fixes. 2017-05-04 15:21:27 -04:00
Muzaffar yousaf
49f20a323b Merge pull request #15042 from edx/mrehan/courseoverview-broader-for-prod-clone 
EDUCATOR-218 – Add logging
 2017-05-04 23:27:59 +05:00
Brian Jacobel
69dd20ffed Mako should be able to render even if webpack hasn't run 2017-05-04 12:56:21 -04:00
Matt Drayer
d39a18b11c Merge pull request #15017 from edx/mattdrayer/ENT-328 
mattdrayer/ENT-328: Update account activation message on sign-in form.
 2017-05-04 12:33:53 -04:00
Qubad786
9db1b9cc1b address feedback 2017-05-04 21:31:08 +05:00
Brittney Exline
25ba822e43 Merge pull request #15043 from edx/bexline/enterprise_version_bump 
ENT-351/ENT-362 Enterprise package version bump
 2017-05-04 12:11:03 -04:00
Brittney Exline
907cb055d8 ENT-351/ENT-362 Enterprise package version bump 2017-05-04 11:14:19 -04:00
Matt Drayer
5097bd6e54 mattdrayer/ENT-328: Update account activation message on sign-in form. 2017-05-04 10:58:42 -04:00
Eric Fischer
a047d009c7 Merge pull request #15020 from edx/efischer/partition_scheming 
EDUCATOR-199 Fix ICRV broken courses
 2017-05-04 09:37:53 -04:00
Eric Fischer
be3e603e35 Merge pull request #15007 from edx/efischer/ora_release 
Update edx-ora2 to 1.4.0
 2017-05-04 09:37:32 -04:00
Calen Pennington
569ee38a1a Merge pull request #15024 from cpennington/cale/fix-comment 
Update comment to reflect the code in lang_pref tests
 2017-05-04 09:29:56 -04:00
Andy Armstrong
2e8c68e609 Make tests and coverage work with openedx/features 2017-05-04 09:28:16 -04:00
Robert Raposa
963519b86f Merge pull request #15032 from edx/robrap/TNL-6906-mark-flaky 
Mark test_proctored_exam_flow as flaky.
 2017-05-04 09:14:34 -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
Qubad786
657249bd6d Add broader exception. 2017-05-04 13:00:43 +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
Ned Batchelder
55e04d2cf1 Update the install reference to v1.0.0 2017-05-03 16:25:47 -04:00
Robert Raposa
0de9e7c1a0 Merge pull request #14962 from edx/robrap/LEARNER-646 
LEARNER-646: Resume Course button should say "Start Course" if the user has not yet started
 2017-05-03 16:05:53 -04:00
Robert Raposa
a47e1a84de Mark test_proctored_exam_flow as flaky. 2017-05-03 15:57:23 -04:00
Matthew Piatetsky
335b0dc46f Merge pull request #15031 from edx/revert-15028-minor_tweaks 
Revert "Add view course button"
 2017-05-03 15:54:25 -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
Eric Fischer
f3da0eb5de Implement a naive PartitionScheme for ICRV 2017-05-03 15:21:27 -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
Asad Iqbal
4a4f135f47 Merge pull request #14989 from edx/asadiqbal08/ENT-342 
asadiqbal08/Logged in user may not have access rights for catalogs api endpoint
 2017-05-03 23:02:10 +05:00
Albert (AJ) St. Aubin
185bac1837 Merge pull request #15012 from edx/aj/EDUCATOR-60 
Updated the message and style of the status notification when a user …
 2017-05-03 13:29:03 -04:00
Albert St. Aubin
d9b8d51dab Updated the message and style of the status notification when a user enters text into numerical input 2017-05-03 11:50:40 -04:00
Attiya Ishaque
8ce4e11671 Merge pull request #15023 from edx/ai/EDUCATOR-146 
EDUCATOR-146 Move button will not be shown on Pages page.
 2017-05-03 20:09:44 +05:00
Calen Pennington
74ce1ae918 Update comment to reflect the code in lang_pref tests 2017-05-03 11:09:18 -04:00
Calen Pennington
dc855dd647 Merge pull request #15019 from cpennington/cale/reset-session-language-on-cookie-update 
Reset the SESSION language when the language-preference cookie changes
 2017-05-03 10:31:03 -04:00
attiyaishaque
a5ab60aa53 EDUCATOR-146 Move button will not be shown on Pages page. 2017-05-03 18:38:34 +05:00
asadiqbal
47cdf39266 ENT-342 2017-05-03 15:03:34 +05:00
George Song
7b34fe4ba6 Merge pull request #15009 from ahmedaljazzar/patch-1 
Added unicode to CourseUserGroup
 2017-05-02 13:18:57 -07:00
Calen Pennington
4b512626f8 Reset the SESSION language when the language-preference cookie changes 2017-05-02 11:24:41 -04:00
Matthew Piatetsky
acbf860347 Merge pull request #15010 from edx/minor_tweaks 
Fix footer css on program details page
 2017-05-02 09:51:16 -04:00
sanfordstudent
bcc3d16589 Merge pull request #14929 from edx/neem/capa-refactor 
Refactor CAPA to use scorable XBlock mixin
 2017-05-02 09:43:06 -04:00
Muzaffar yousaf
d48429d1ce Merge pull request #14807 from OmarIthawi/omar/unicode-subtitles 
Allow uploading subtitles with unicode filenames
 2017-05-02 17:03:14 +05:00
Omar Al-Ithawi
ad4e3d50a5 Allow uploading subtitles with unicode filenames 2017-05-02 10:53:58 +03:00
Andy Armstrong
6fa189dc3f Merge pull request #15001 from edx/andya/unified-course-tab 
Unify the home and course tabs
 2017-05-01 19:10:17 -04:00
Andy Armstrong
2167584e5e Unify the home and course tabs 
LEARNER-609
 2017-05-01 17:22:28 -04:00
Ben Patterson
b10c71d890 Let settings flow through. 2017-05-01 17:09:32 -04:00