Clinton Blackburn
0dc5000eb7
Disabled Enterprise integration for devstack
...
This feature is not always needed and is not properly provisioned for devstacks.
2017-06-15 10:46:29 -04:00
Simon Chen
8185b5cea1
Merge pull request #15328 from edx/schen/learner-1464
...
Revert "fix valid signature" from OSPR-1539
2017-06-15 08:29:58 -04:00
Simon Chen
4ce1222e99
Revert "fix valid signature"
...
This reverts commit e58e295ca0
2017-06-14 16:46:54 -04:00
Nimisha Asthagiri
c21b3c8f7a
Merge pull request #15323 from edx/ret/exclude-non-english-courses
...
Planning Prompts experiment: exclude non-English courses
2017-06-14 15:41:05 -04:00
Harry Rein
1904a93ad2
Merge pull request #15315 from edx/HarryRein/LEARNER-1297-course-date-formatting
...
LEARNER-1297: Updating date formatting in course home page.
2017-06-14 14:58:34 -04:00
Robert Raposa
3b70b9b7f4
Merge pull request #15322 from edx/robrap/bokchoy-comment
...
Add comment to save future self time.
2017-06-14 14:19:01 -04:00
Nimisha Asthagiri
d465d6f779
Planning Prompts experiment: exclude non-English courses
2017-06-14 14:03:31 -04:00
Christina Roberts
09e22f373b
Merge pull request #15312 from edx/christina/share-template
...
Remove extra div.
2017-06-14 13:36:36 -04:00
Ned Batchelder
47f42fdc10
Merge pull request #14591 from mitodl/pdpinch/better-error-from-codejail
...
Return only error value to students when codejail raises an exception
2017-06-14 12:58:58 -04:00
Harry Rein
6cbfb6c9f5
1) Updating version two of styling variables to use a file layout similar to the initial version.
...
2) Updating the course experience sass file to use variables it can reference in the version two variable sass file.
3) Updating date styling on course home page as explained in LEARNER-1297.
4) Expanding side outline panel to take up a third and not a quarter of the content size.
2017-06-14 12:30:14 -04:00
Robert Raposa
340fb2b082
Add comment to save future self time.
2017-06-14 11:52:25 -04:00
Rabia Iftikhar
0ee7600696
Merge pull request #15321 from edx/ri/EDUCATOR-394-disable-self-generated-certs
...
EDUCATOR-394 disable self-generated certificates when course is reset to instructor-paced
2017-06-14 20:35:42 +05:00
rabiaiftikhar
7bf0674de8
EDUCATOR-394 disable self-generated certificates when course is reset to instructor-paced
2017-06-14 19:46:59 +05:00
Christina Roberts
23d480f457
Merge pull request #15306 from edx/christina/edu-511
...
Remove skip from test where failure cannot be reproduced
2017-06-14 09:15:11 -04:00
Nimisha Asthagiri
7d6ab17385
Merge pull request #15316 from edx/ret/planning-prompt-population
...
Planning Prompts experiment: check content availability date
2017-06-14 09:10:03 -04:00
Noraiz Anwar
5b400bc0b3
Merge pull request #15319 from edx/revert-15163-ri/EDUCATOR-394-disable-self-generation-certificates
...
Revert "EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced."
2017-06-14 18:04:30 +05:00
Asad Iqbal
d4e1e3eb22
Merge pull request #15272 from edx/asadiqbal08/ENT-368
...
ENT-368 Hide Register or Sign In links in Header on Logistration
2017-06-14 16:54:24 +05:00
Noraiz Anwar
371c422aaf
Revert "EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced."
2017-06-14 15:57:07 +05:00
Rabia Iftikhar
c2c32e7231
Merge pull request #15163 from edx/ri/EDUCATOR-394-disable-self-generation-certificates
...
EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced.
2017-06-14 15:27:10 +05:00
rabiaiftikhar
2eab85ebf7
Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates
2017-06-14 13:38:29 +05:00
M. Rehan
a42f930614
Merge pull request #15288 from edx/mrehan/fix-studio-header-menu
...
EDUCATOR-294 – Fix studio header menu
2017-06-14 13:35:33 +05:00
asadiqbal
cd896501ca
ENT-368
2017-06-14 11:50:37 +05:00
Qubad786
afd45996d9
fix studio header menu
2017-06-14 11:49:30 +05:00
Peter Pinch
b9e768410f
return only error value to students when codejail raises an exception
...
remove comment for translators
inst.args[0] is more reliable than inst.message
consistent escaping
2017-06-13 21:17:00 -04:00
Andy Armstrong
1592ee2b15
Merge pull request #15173 from edx/andya/course-search-page
...
Enable course search for the unified course experience
2017-06-13 17:41:26 -04:00
Nimisha Asthagiri
3bbeb75c58
Planning Prompts experiment: check content availability date
2017-06-13 17:32:56 -04:00
Nimisha Asthagiri
764c310c80
Merge pull request #15314 from edx/ret/add-todo-comments-ivp
...
Add comments around In-course verification prompt throwaway code
2017-06-13 17:28:38 -04:00
Carol Tong
c8de3af589
Merge pull request #15313 from edx/carol/DOC-3687
...
DOC-3687: Change help target for enrollment track groups on Studio Group Configs page
2017-06-13 16:48:26 -04:00
Andy Armstrong
c0007a11f3
Add new course search results page
...
LEARNER-1112
2017-06-13 16:36:32 -04:00
sarahkf
086b503b51
Merge pull request #15219 from edx/sarahkf/courseware-lang
...
Added course level lang attribute for LMS WIP
2017-06-13 16:06:59 -04:00
Carol Tong
82b8cf40b3
Change help target for enrollment track groups
2017-06-13 15:51:13 -04:00
Andy Armstrong
0096c80a13
Refactor course search into openedx/features
2017-06-13 15:30:09 -04:00
Calen Pennington
39048048da
Add comments around In-course verification prompt throwaway code
2017-06-13 15:18:46 -04:00
cahrens
04bf257d91
Remove flaky decorator.
...
Test passed > 130 times. Perhaps
querying for the content changes timing.
2017-06-13 15:10:38 -04:00
Eric Fischer
7721237989
Merge pull request #15310 from edx/sylvia/update_help_tokens
...
Update Studio help tokens following doc reorg for Publisher
2017-06-13 14:43:52 -04:00
Sarah Fischmann
eafb79defc
Added lang attribute in LMS and Studio; added language col to course_overviews
...
Added course level lang attribute for LMS
added lang attribute to Studio
fixed error when trying to get language attribute on course that does not exist
simplified code
added lang attribure to more places in LMS, added migration for language attribute in course_overview
fixing contraints in the database for language attribute
added lang attribute to several more places in LMS and Studio
added lang attribute to discussion and custom pages; cleaned up code
fixed issue that was causing test failures
moved lang attribute higher in tree in two places
2017-06-13 14:42:29 -04:00
Feanil Patel
3fbe60ef57
Merge pull request #14463 from edx/robrap/edx-search-upgrade
...
[DELAY MERGE] TNL-6319: Upgrade edx-search for ES 1.x upgrade.
2017-06-13 14:32:26 -04:00
Eric Fischer
c60cb6a604
Merge pull request #15299 from edx/efischer/ora_rc
...
edx-ora2 1.4.2 release
2017-06-13 14:03:03 -04:00
Eric Fischer
3ea7a18994
Revert "Merge pull request #15309 from edx/efischer/fix_studio_link_tests"
...
This reverts commit 8ca5c11a2b1acb51559a
2017-06-13 13:52:31 -04:00
Sylvia Pearce
fe3105cc38
Update Studio help tokens following doc reorg for Publisher
2017-06-13 13:52:07 -04:00
Dmitry Viskov
0272b84fd0
Open Response Assessment tab for Instructor Dashboard - bugfix (prevent loading ORA Block more than one time)
2017-06-13 12:58:19 -04:00
Eric Fischer
4af499cdd5
edx-ora2 1.4.2 release
2017-06-13 12:58:19 -04:00
Eric Fischer
8ca5c11a2b
Merge pull request #15309 from edx/efischer/fix_studio_link_tests
...
Skip failing tests temporarily
2017-06-13 12:50:45 -04:00
Renzo Lucioni
1acb51559a
Prevent footer loaded via branding API from loading unused CSS
...
Footer HTML requested from the branding API was including two CSS files, lms-footer.css and lms-footer-edx.css. edx.org pages only require lms-footer-edx.css to render the footer. The template code being removed here appears to have been accidentally left in place during a theming change: c0648ab164
2017-06-13 12:43:33 -04:00
Eric Fischer
9e6b449a62
Skip failing tests
2017-06-13 11:59:42 -04:00
cahrens
fdc9ebe809
Remove extra div.
...
This was probably left over from a previous variation
(there was no closing div).
2017-06-13 11:51:42 -04:00
Brandon Baker
7d2d0657fe
Merge pull request #15290 from edx/bbaker/educator-344
...
Bbaker/educator 344
2017-06-13 10:42:35 -04:00
rabiaiftikhar
22d3b02807
respond to comments
2017-06-13 16:29:17 +05:00
rabiaiftikhar
b84d4c0209
Review Rehan
2017-06-13 15:43:36 +05:00
rabia23
511e653627
Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates
2017-06-13 06:54:38 +00:00
