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

19195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Slater
e2ba1122c4 Proper abstraction of Module store base class implemented 
Read/Write inheritance split up into separate base classes
 2013-10-30 16:35:56 -04:00
Don Mitchell
80c83f0b88 Merge pull request #1508 from edx/dhm/expect_json 
Change expect_json to put parsed json in new attr
 2013-10-29 14:02:32 -07:00
Christina Roberts
9c6d0d6d70 Merge pull request #1523 from edx/christina/import-export 
Convert import to new URL pattern.
 2013-10-29 13:41:55 -07:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
cahrens
15c12bc386 csrf token not passed to template. 2013-10-29 16:09:28 -04:00
Calen Pennington
13d9a8c4de Merge pull request #1460 from cpennington/incidental-cleanup 
Incidental cleanups discovered while making XBlock handler urls work
 2013-10-29 12:48:58 -07:00
cahrens
a9d1d4eefc Convert import to new URL pattern. 2013-10-29 15:33:22 -04:00
Will Daly
d0f659d67d Merge pull request #1525 from edx/will/textbook-js-wait 
Added wait for JavaScript when navigating to textbook page
 2013-10-29 12:21:23 -07:00
e0d
b9c00ae337 Merge pull request #1252 from edx/e0d/boto-upgrade 
updating boto to get boto.elasticache.layer1
 2013-10-29 11:53:33 -07:00
Sarina Canelake
7224af154b Merge branch 'release' 2013-10-29 14:21:37 -04:00
Brian Talbot
2a9f55dd26 Merge pull request #1532 from edx/talbs/fix-studio-datepicker 
Studio: FIX - Datepicker UI Background
 2013-10-29 09:21:17 -07:00
Brian Talbot
0f111c1b0c Studio: resolves issue where datepicker UI had no background-color 2013-10-29 10:53:28 -04:00
Brian Talbot
2c4efceb35 Merge pull request #1530 from edx/talbs/fix-cms-prompts 
Studio: FIX - Prompt UI Display
 2013-10-29 07:46:09 -07:00
Calen Pennington
ac8eeb681f Make sequence module use ajax_url properly 2013-10-29 10:36:22 -04:00
Calen Pennington
ae32abfd62 Give a better error message when capa recieves an unknown action 2013-10-29 10:36:22 -04:00
Calen Pennington
10ee2dea82 Clean up imports 2013-10-29 10:36:22 -04:00
Brian Talbot
f4d56ad204 Studio: resolves a display issue with prompt UIs hiding throughout app 2013-10-29 10:22:41 -04:00
Olivier Marquez
a764a466b8 Update AUTHORS 2013-10-29 10:01:22 -04:00
Olivier Marquez
453e8f50fc Update tabs.py 2013-10-29 10:01:02 -04:00
David Baumgold
94bf8a18fd Merge pull request #1522 from edx/db/fix-release-script 
Fixes to release.py script
 2013-10-29 06:47:09 -07:00
Christina Roberts
5fb487a336 Merge pull request #1517 from edx/christina/delete-unused 
Delete unused HTML templates.
 2013-10-29 06:33:59 -07:00
Will Daly
f48dbfdc50 Merge pull request #1528 from edx/will/disable-yt-js-test 
Disable multiple YT test due to flakinesss
 2013-10-29 06:02:26 -07:00
Will Daly
1435c90306 Disable multiple YT test due to flakinesss 2013-10-29 09:01:20 -04:00
Gabe Mulley
3f89967645 Merge pull request #1478 from mulby/gabe/track-user-id 
add user_id to tracking context
 2013-10-29 05:48:43 -07:00
polesye
e587817c8b Merge pull request #1527 from edx/anton/video-speed-change-bug 
Video player: speed change bug
 2013-10-29 05:19:38 -07:00
Gabe Mulley
86bb952f53 update authors file 2013-10-29 08:18:01 -04:00
Gabe Mulley
4f4e58b5f6 add user_id to tracking context 
AN-213
 2013-10-29 08:18:01 -04:00
polesye
825571fb89 BLD-424. Update CHANGELOG.rst. 2013-10-29 12:01:41 +02:00
polesye
6130189bdf Fix slider and pause bugs. 2013-10-29 11:34:47 +02:00
polesye
389beedcf9 Fix speed change bug. 2013-10-29 11:34:47 +02:00
Brian Talbot
bd858b328e Merge pull request #1189 from edx/talbs/studio-cssarch 
Studio: Revised CSS Architecture (resolves STUD-806)
 2013-10-28 17:44:50 -07:00
Diana Huang
92c94b5317 Merge pull request #1483 from edx/diana/certs-upgrade-path 
Verified Certificate Upsell
 2013-10-28 14:28:50 -07:00
Jay Zoldak
de7bba518b Merge pull request #1526 from edx/zoldak/fix-pylint 
Fix a couple pylint violations
 2013-10-28 14:26:32 -07:00
Jay Zoldak
2d30c8b0ab Fix a couple pylint violations 2013-10-28 17:23:31 -04:00
brianhw
2428b3ca97 Merge pull request #1524 from edx/rc-peer-linking 
Ensure that peer grading modules whose linked problem is removed change ...
 2013-10-28 14:00:10 -07:00
brianhw
37b528b39e Merge pull request #1387 from edx/fix/vik/peer-linking 
Peer grading linking issue
 2013-10-28 13:59:37 -07:00
David Baumgold
da49c353b5 Ignore certain emails in release script 2013-10-28 16:56:42 -04:00
Jay Zoldak
35d58b98e2 Merge pull request #1516 from edx/zoldak/fix-component-test 
Break out Advanced Problem tests into a Scenario Outline
 2013-10-28 13:51:43 -07:00
Diana Huang
a9da48ac0a Update upsell copy. 
LMS-1127
 2013-10-28 16:49:07 -04:00
Will Daly
302484d1e3 Added wait for JavaScript when navigating to textbook page 2013-10-28 16:42:21 -04:00
Vik Paruchuri
9f9f5e4c2a Ensure that peer grading modules whose linked problem is removed change over to panel mode 2013-10-28 16:40:13 -04:00
Vik Paruchuri
fd72005a17 Ensure that peer grading modules whose linked problem is removed change over to panel mode 2013-10-28 16:35:16 -04:00
David Baumgold
d844743667 Merge pull request #1520 from edx/db/accept-db-var 
pylint: db is a valid variable name
 2013-10-28 13:08:13 -07:00
David Baumgold
881b1ef9d4 Fixes to release.py script 2013-10-28 16:06:24 -04:00
Diana Huang
8ee1807840 Fix acceptance tests 
LMS-1127
 2013-10-28 15:59:19 -04:00
e0d
da378aaf92 Merge pull request #1486 from edx/e0d/specify-coffee-sources 
E0d/specify coffee sources
 2013-10-28 12:53:15 -07:00
Diana Huang
4be5bccbcf Make sure the correct mode is chosen during upgrade 
LMS-1127
 2013-10-28 15:09:20 -04:00
Brian Talbot
c7b3e5dc04 LMS: adds verifiied track visuals to upgrade UI on dashboard 2013-10-28 15:00:29 -04:00
Brian Talbot
e78654f99d LMS: revises verified track upgrade UI on dashboard 2013-10-28 14:59:15 -04:00
Brian Talbot
e9a2787bb3 LMS: adds conditional content/instructions for registration upgrade flow 2013-10-28 14:58:14 -04:00