Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
Valera Rozuvan
78e9692aaa Adding HTML5Video class and modifying coffee sources to use it when video sources are provided instead of YouTube IDs. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
156da20c35 Renamed videox to videoalpha, as per Piotr naming scheme request. 2013-02-13 10:27:55 +02:00
Arthur Barrett
949603e3c1 Fixed issue with return link and scroll after effects. 2013-02-13 01:16:20 -05:00
Arthur Barrett
6b5bf319c3 Style and behavior changes. Added return links to discussions. 2013-02-12 19:08:23 -05:00
Julian Arni
9785bc9e70 Adding multiple-choice loncapa integration. 2013-02-12 17:21:34 -05:00
Don Mitchell
d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html
 2013-02-12 16:57:00 -05:00
jkarni
2197bd987f Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks 
Feature/julian/multiple choice tweaks
 2013-02-12 13:32:15 -08:00
Vik Paruchuri
b40a035ff7 Update error message 2013-02-12 15:32:57 -05:00
Vik Paruchuri
5cf7441da1 Fix error message passing to JS and student 2013-02-12 15:31:30 -05:00
Vik Paruchuri
53028b46c3 Remove debug statements 2013-02-12 15:23:11 -05:00
Vik Paruchuri
74b1187a39 Remove log statements 2013-02-12 15:04:49 -05:00
Vik Paruchuri
1409f8aa6b Add in checking for score list length to rubric rendering 2013-02-12 15:03:03 -05:00
Vik Paruchuri
8d3f4932e7 Add in checks to see if student can submit (ie needs to peer grade more or not) 2013-02-12 14:41:36 -05:00
Vik Paruchuri
4237df625a Add in a check function to see if students are allowed to submit peer grading 2013-02-12 14:31:30 -05:00
Arthur Barrett
0c70d201f8 Auto-expand the discussion thread after it is scrolled to by simulating a click on the show/hide button. Note: the jQuery highlight effect doesnt work here due to a CSS !important setting on .discussion-module background color. 2013-02-12 13:57:28 -05:00
Ned Batchelder
27e8d699be On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't. 2013-02-12 13:43:03 -05:00
Diana Huang
482d97d321 Better error messages for when a linked problem cannot be found 2013-02-12 13:41:26 -05:00
Vik Paruchuri
9ead4ebb35 Wire through ability to skip basic checks 2013-02-12 13:30:56 -05:00
Arthur Barrett
7e7911a08d Changed the markup and js for associating spans with discussion threads. Uses the discussion id now. 2013-02-12 13:24:50 -05:00
David Ormsbee
537d6dd18e Merge pull request #1490 from MITx/bugfix/brian/pearson-timer 
change timer to calculate relative duration in javascript
 2013-02-12 09:26:53 -08:00
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -05:00
Arthur Barrett
45a27f303f Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-12 12:09:21 -05:00
Arthur Barrett
cfa16feab5 Trying to setup jasmine specs... 2013-02-12 12:00:54 -05:00
Ned Batchelder
baee9f96dc Merge branch 'master' of github.com:MITx/mitx 2013-02-12 11:28:51 -05:00
Ned Batchelder
78d3d20069 When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons. 
Conflicts:
	common/djangoapps/util/converters.py
 2013-02-12 11:25:14 -05:00
Diana Huang
d45c539c6d Make the peer grading due date a property of the problem 
metadata, not the peer grading module metadata.
 2013-02-12 10:49:06 -05:00
Victor Shnayder
7d65c64148 Merge pull request #1485 from MITx/fix/kevin/code_show_lt_and_gt 
fix showing less than and greater than in code
 2013-02-12 07:38:16 -08:00
Chris Dodge
93d186511f clean up templates that were removed from disk - we need to remove from DB as well 2013-02-12 10:23:32 -05:00
Calen Pennington
23bb87e0bb Merge pull request #1486 from MITx/feature/ned/clean_up_tests 
We no longer need override_settings, Django has a better one.
 2013-02-12 07:22:27 -08:00
Calen Pennington
de5b3a2a39 Merge pull request #1483 from MITx/feature/victor/raw-static-files 
Feature/victor/raw static files
 2013-02-12 07:21:01 -08:00
Kevin Chugh
21f4616080 spread less than and greater than fix to responses and comments, and profile view 2013-02-12 09:18:46 -05:00
Kevin Chugh
d57c78f9d9 fix showing less than and greater than in code 2013-02-11 20:01:09 -05:00
Vik Paruchuri
65cb53b8a6 Revert logsettings 2013-02-11 19:21:22 -05:00
Vik Paruchuri
e1b2481c38 Fix remaining path issues 2013-02-11 19:08:53 -05:00
Vik Paruchuri
bdc5910cbb Fix import paths to point to xmodule, remove old JS resource strings 2013-02-11 19:03:18 -05:00
Vik Paruchuri
b5bac1e3c1 Fix some path issues in import statements 2013-02-11 18:47:01 -05:00
Vik Paruchuri
b9bf96520e Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports 2013-02-11 18:43:47 -05:00
Vik Paruchuri
c2b32b7038 Fix location that is queried on 2013-02-11 18:23:01 -05:00
Vik Paruchuri
ba650202b4 Add in logic to pass settings to peer grading xmodule 2013-02-11 18:09:57 -05:00
Vik Paruchuri
323caeb744 Properly pass around S3 interface 2013-02-11 17:58:19 -05:00
Victor Shnayder
75898bfe1a tell collectstatic not to mess with protex--it relies on the filename 2013-02-11 17:54:54 -05:00
Vik Paruchuri
01e8fe8d08 Pass S3 interface in module_render 2013-02-11 17:54:37 -05:00
Victor Shnayder
aadb885211 Merge branch 'feature/victor/raw-static-files' into 700x-sandbox 2013-02-11 17:51:36 -05:00
Victor Shnayder
3ccb33c8b3 Simplify, make it actually work. 
- regexp was too complicated, didn't work
 2013-02-11 17:50:13 -05:00
Vik Paruchuri
120c0e139e Remove url element from parent class to avoid annoying errors 2013-02-11 17:38:25 -05:00
Vik Paruchuri
0f71f5b92e Finish settings refactor 2013-02-11 17:36:33 -05:00
Vik Paruchuri
9bca4ebf21 Start to refactor grading settings 2013-02-11 17:32:11 -05:00
Victor Shnayder
2dcdeff4b6 Make replace_static_urls leave alone urls that have '?raw' at the end 
- needed for GWT'ed modules that rely on the filename to find dependencies
 2013-02-11 17:07:15 -05:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
Arthur Barrett
a144896154 Style and behavior changes to the header and tooltips. 2013-02-11 16:17:34 -05:00