Brian Jacobel
|
69dd20ffed
|
Mako should be able to render even if webpack hasn't run
|
2017-05-04 12:56:21 -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 |
|
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 |
|
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 |
|
Ben Patterson
|
1778c1fc95
|
Fix paver tests for watcher.
|
2017-05-01 17:09:32 -04:00 |
|
Ben Patterson
|
6e5769f279
|
Fix webpack service location for testing.
|
2017-05-01 17:09:32 -04:00 |
|
Brian Jacobel
|
a2323797f5
|
Work on sandbox bundling for webpack
|
2017-05-01 17:09:32 -04:00 |
|
Brian Jacobel
|
3b43fb38a4
|
Paver runs Webpack (incl watcher) in dev and test
|
2017-05-01 17:09:32 -04:00 |
|
Brian Jacobel
|
ef4b5cb8c3
|
Clean up spec and feature; both pass lint and run in Karma
|
2017-05-01 17:09:32 -04:00 |
|
Brian Jacobel
|
c5df4aa6b7
|
Work on getting Karma to run
|
2017-05-01 17:09:32 -04:00 |
|
Brian Jacobel
|
57e8250619
|
Webpack in LMS
|
2017-05-01 17:09:32 -04:00 |
|
J. Cliff Dyer
|
ea0027f338
|
refactor CAPA to use scorable xblock mixin
for TNL-6594
|
2017-05-01 15:08:17 -04:00 |
|
Ben Patterson
|
ec6dfeeac4
|
Merge pull request #15011 from edx/benp/update-lettuce-db-cache
Update lettuce db cache for faster test set-up.
|
2017-05-01 14:10:47 -04:00 |
|
Calen Pennington
|
3deb3a3c1b
|
Merge pull request #14977 from cpennington/cale/fix-learner-542
Cale/fix learner 542
|
2017-05-01 12:18:03 -04:00 |
|
Matthew Piatetsky
|
d1729c555a
|
Fix footer css
|
2017-05-01 11:56:10 -04:00 |
|
Ben Patterson
|
449228ec31
|
Update lettuce db cache for faster test set-up.
|
2017-05-01 11:32:57 -04:00 |
|
Ben Patterson
|
0959399849
|
Merge pull request #14998 from edx/benp/update_bokchoy_db_cache
Update bok-choy cache files.
|
2017-05-01 09:24:02 -04:00 |
|
Cliff Dyer
|
ea9fe1de62
|
Merge pull request #15004 from edx/neem/shuffled-backfill-tasks
Shuffle tasks.
|
2017-05-01 09:17:51 -04:00 |
|
Ahmed Jazzar
|
0da29d1786
|
Added unicode to CourseUserGroup
|
2017-05-01 13:14:20 +03:00 |
|