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

41026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
a47e1a84de Mark test_proctored_exam_flow as flaky. 2017-05-03 15:57:23 -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
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
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
Calen Pennington
2ca367a147 Extract some common logic about dirty serializers into a helper method 2017-04-28 16:10:22 -04:00
Calen Pennington
0ca11f6428 Add a trailing comma to make future diffs cleaner 2017-04-28 15:40:46 -04:00
Calen Pennington
1c78d7c02e Remove a stray maxDiff = None 2017-04-28 15:17:05 -04:00
J. Cliff Dyer
1daa4eadd5 Shuffle tasks. 2017-04-28 14:19:21 -04:00
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation 
Remove a number of unneeded super()-delegation methods
 2017-04-28 13:04:43 -04:00
Calen Pennington
1811f7235f Minimize the number of queries done while noop updating a user-preference 2017-04-28 12:26:41 -04:00
Calen Pennington
20caf52bea Use the existing user object in the case where a user is making changes to their own preferences 2017-04-28 12:26:39 -04:00
Christina Roberts
61316c3807 Merge pull request #14972 from edx/christina/ed11 
Renaming prep for allow discussions to be divided by enrollment tracks
 2017-04-28 11:00:09 -04:00
M. Rehan
ce93ad2af4 Merge pull request #14973 from edx/mrehan/educator-122-enable-course-sharing-in-future-courses 
EDUCATOR-112 – Enable sharing icons for future courses
 2017-04-28 18:33:53 +05:00
M. Rehan
3ffde4a425 Merge pull request #14766 from edx/mrehan/add-flag-for-lti-xblock 
TNL-6688 – Add flag to control lti-consumer-xblock's request username/email editing in Studio
 2017-04-28 18:33:30 +05:00
Qubad786
f3b4803066 Update lti_consumer xblock to latest version 2017-04-28 15:59:23 +05:00
Qubad786
4b2488b5ee Add config models and a configuration service to configure LTI Consumer. 2017-04-28 15:59:23 +05:00
M. Rehan
6ea581793d Merge pull request #14810 from edx/mrehan/create-or-update-overview-on-course-publish 
TNL-6601 – Create or update course overview on a course publish
 2017-04-28 15:45:58 +05:00
Qubad786
4b73bac9b2 Enable sharing icons for future courses 2017-04-28 15:45:24 +05:00
Qubad786
fad53592d2 Create or update course overview on a course publish event received from studio. 2017-04-28 14:31:45 +05:00
Ahsan Ulhaq
401eac8fa8 Merge pull request #14971 from edx/ahsan/ECOM-4478-Stop-program-cert-awarding-task-from-retrying-on-4xx 
Stop program cert awarding if cert is not configured in credentials
 2017-04-28 13:57:40 +05:00