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

6850 Commits

Author SHA1 Message Date
Valera Rozuvan
5cd4bae35d Start and end times function the same for YouTube and HTML5 modes. 
Fix bug when the user clicks on the video time-line either
before or after the specified end time, it jumps
to the very beginning of the video.

BLD-392
 2013-10-31 13:52:34 +02:00
Sarina Canelake
d711d29d74 Clean up pep8/pylint 2013-10-30 20:43:44 -04:00
Sarina Canelake
c89c85c70f Merge pull request #1541 from cpennington/hotfix-conditional-course-id-access 
Provide access to the course_id directly on XModules/Descriptors
 2013-10-30 15:46:32 -07:00
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
e071ebb981 Merge pull request #1542 from edx/dhm/restful_course 
RESTful refactoring of /course access continued
 2013-10-30 12:16:32 -07:00
Don Mitchell
f41816637e RESTful refactoring of /course access continued 
Move index access into the url
Move course creation into the url
Add helper methods for testing to serialize json data and set accept header.
 2013-10-30 13:28:22 -04:00
Calen Pennington
32af903f85 Provide access to the course_id directly on XModules/Descriptors 
Fixes [BLD-456] and [LMS-1392], but making sure that we're always asking
XModules about their course_id (since the ModuleSystem has access to
that data).
 2013-10-30 11:23:11 -04:00
Diana Huang
5b10e016eb Make sure the correct mode is chosen during upgrade 
LMS-1127
 2013-10-30 09:26:32 -04:00
Brian Talbot
8442f6e093 LMS: adds conditional content/instructions for registration upgrade flow 2013-10-30 09:26:32 -04:00
Diana Huang
e50397002f Better handling of the expiration date. 
LMS-1127
 2013-10-30 09:26:32 -04:00
Diana Huang
aae13c584b Move more logic into the views 
Also includes some tests

Story: LMS-1127
 2013-10-30 09:26:32 -04:00
Julia Hansbrough
19c21d2023 Fixed LMS-1062 2013-10-30 09:26:32 -04:00
Brian Talbot
c42bff6528 LMS: preps track selection view for upgrade cases 2013-10-30 09:26:31 -04:00
Diana Huang
56f6711252 Add in new hooks for the dashboard into the upgrade path. 2013-10-30 09:26:31 -04:00
Diana Huang
ebd63b6188 Add an upgrade parameter to the verification views. 2013-10-30 09:26:31 -04:00
Will Daly
83fcc318c6 Fixed test that was failing in Vagrant due to filesystem encoding 
mismatch
 2013-10-30 09:23:48 -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
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
Diana Huang
d3a4747b06 Add new user_status functionality to PhotoVerification. 2013-10-29 15:13:45 -04: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
polesye
23590102da BLD-205: fix total count. 2013-10-29 15:38:29 +02: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
Gabe Mulley
4f4e58b5f6 add user_id to tracking context 
AN-213
 2013-10-29 08:18:01 -04: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
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
Diana Huang
4be5bccbcf Make sure the correct mode is chosen during upgrade 
LMS-1127
 2013-10-28 15:09:20 -04:00
Brian Talbot
e9a2787bb3 LMS: adds conditional content/instructions for registration upgrade flow 2013-10-28 14:58:14 -04:00
Diana Huang
35ebdfdca4 Better handling of the expiration date. 
LMS-1127
 2013-10-28 14:39:46 -04:00
David Baumgold
ff5baa7ace pylint: db is a valid variable name 2013-10-28 14:31:23 -04:00
David Baumgold
3a98ee5882 Merge pull request #1295 from IainNZ/patch-1 
Added a [code] block to the problem markdown parser
 2013-10-28 10:34:05 -07:00
Christina Roberts
5449a3ccbb Merge pull request #1506 from edx/christina/codemirror-css 
Add css mode to the compressed file.
 2013-10-28 06:18:58 -07:00
Usman Khalid
e027e50028 Merge pull request #1345 from edx/usman/lms1222-email-confirm-transaction-errors 
Commit/rollback transaction after rendering response to prevent TransactionManagementErrors due to db access in templates.
 2013-10-28 03:13:01 -07:00
Brian Talbot
b7594142fc Studio: adds in specific older IE support area into Sass/CSS architecture 2013-10-26 21:26:53 -04:00
Brian Talbot
95dd21738c Studio: revises CSS reference/pipeline architecture for better organization, reduced redundancy, and to handle IE9 selector limits 2013-10-26 21:26:53 -04:00
Iain Dunning
a75b764cda Added a [code] block to the problem markdown parser 
Adds a code block to the problem markdown parser that translates
[code]
TestTest
[/code]
to
<pre><code>
TestTest
</code></pre>
 2013-10-26 13:12:58 -04:00
dcadams
5fbda0c63b Merge pull request #1396 from edx/dcadams/fix_static_paths 
Fix for static path parsing
 2013-10-25 14:54:59 -07:00
David Adams
20f1feb7b1 Fix for static path parsing 
When a url contains a query parameter it gets incorrectly parsed
when replacing the /static portion.

This fix handles urls with query parameters.
 2013-10-25 13:02:29 -07:00
cahrens
c7c0aacb00 Add css mode to the compressed file. 
STUD-833
 2013-10-25 15:33:31 -04:00
Diana Huang
23762a1569 Move more logic into the views 
Also includes some tests

Story: LMS-1127
 2013-10-25 15:29:44 -04:00
David Baumgold
dc589f723c Merge remote-tracking branch 'origin/release' 2013-10-25 15:29:03 -04:00
Julia Hansbrough
16356e5cf6 Fixed LMS-1062 2013-10-25 15:23:51 -04:00
Brian Talbot
618d307d1f LMS: preps track selection view for upgrade cases 2013-10-25 15:23:51 -04:00