Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chugh
1bd9366e40 Merge remote-tracking branch 'origin/master' into feature/kevin/groups 2013-01-23 16:26:06 -05:00
Kevin Chugh
59b3dc61a2 lms producing grouped content 2013-01-23 16:25:26 -05:00
chrisndodge
fe8e25e72d Merge pull request #1341 from MITx/feature/christina/tiny-mce 
Toggling of code should mark editor as dirty.
 2013-01-23 13:25:01 -08:00
cahrens
2969a9e48d Toggling of code should mark editor as dirty. 2013-01-23 16:19:17 -05:00
chrisndodge
548f3de508 Merge pull request #1340 from MITx/fix/zoldak/fix_jenkins 
Do not run the lms jasmine tests on jenkins for now, until we fix them.
 2013-01-23 13:05:50 -08:00
Jay Zoldak
29c4e6c066 Do not run the lms jasmine tests on jenkins for now, until we fix them. 2013-01-23 16:03:25 -05:00
Christina Roberts
2ed5fdf76b Merge pull request #1338 from MITx/fix/cdodge/remove-hide-progress-tab 
Fix/cdodge/remove hide progress tab
 2013-01-23 12:20:54 -08:00
chrisndodge
247199d699 Merge pull request #1337 from MITx/feature/cale/fix-staff-debug-link 
Feature/cale/fix staff debug link
 2013-01-23 12:17:17 -08:00
Chris Dodge
9c3e727889 add unit test to assert that the flag is not set on course metadata 2013-01-23 15:14:36 -05:00
Chris Dodge
9d5ac308b1 remove flag to hide progress tab 2013-01-23 15:11:41 -05:00
Calen Pennington
27b57bb48b Don't update settings based on data from content for discussion modules during init 2013-01-23 14:51:07 -05:00
Calen Pennington
993c24b72b WIP: Model data caching work 2013-01-23 14:51:07 -05:00
Calen Pennington
507d2021cd Remove unused reference to StudentModuleCache 2013-01-23 14:47:06 -05:00
Calen Pennington
abb21ab111 staff_problem_info.html only renders for staff, so don't check for staff access 2013-01-23 14:47:06 -05:00
Calen Pennington
4779043a5f Add message during 404 for debugging 2013-01-23 14:47:05 -05:00
Calen Pennington
c44898b1de Remove random printing during XModuleDescriptor equality check 2013-01-23 14:47:05 -05:00
Calen Pennington
2eca8bd0e9 Set default video position to 0, but don't overwrite it during __init__ 2013-01-23 14:47:05 -05:00
Calen Pennington
e5a6509bb0 Add a first_time_user attribute to CourseModule so that we can check for that explicitly, rather than looking for an implicitly created StudentModule 2013-01-23 14:47:05 -05:00
Calen Pennington
ce76b64bae Handle problem resets in such a way that the LoncapaProblem generates the new random seed, and the CapaModule saves that seed 2013-01-23 14:47:05 -05:00
Calen Pennington
9d66169d06 Don't set a seed to None that's already None 2013-01-23 14:47:05 -05:00
Calen Pennington
8e5373f993 Make Randomization return un-adjusted values as a passthrough 2013-01-23 14:47:05 -05:00
Calen Pennington
6e7afb968d Move xqueue handler to new module format, and continue to distinguish grades set by xqueue from those set by ajax in stats 2013-01-23 14:47:05 -05:00
Christina Roberts
cd78b27b50 Merge pull request #1334 from MITx/bug/btalbot/cms-problemmenu 
studio - resolved bug with .header CSS inheritance and problem editor
 2013-01-23 11:40:24 -08:00
Calen Pennington
ae2a8e0c58 Whitespace cleanup 2013-01-23 14:37:42 -05:00
Calen Pennington
6c181470c6 staff_problem_info.html is only put on the page for staff, so we don't need to check staff_access inside it 2013-01-23 14:37:36 -05:00
Don Mitchell
4bdabb38e4 Oops, double edit backed out. 2013-01-23 14:17:23 -05:00
Don Mitchell
3e048d7072 Removed old function 2013-01-23 14:15:09 -05:00
Don Mitchell
2db0401273 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 
Conflicts:
	cms/envs/common.py
 2013-01-23 14:13:17 -05:00
Brian Talbot
25df02fedd studio - syncing cheatsheet language with new class name for heading 1 again 2013-01-23 13:04:16 -05:00
Brian Talbot
0e061ca726 studio - syncing cheatsheet language with new class name for heading 1 2013-01-23 13:02:33 -05:00
Don Mitchell
7cca46e691 Requirejs doesn't belong here 2013-01-23 13:00:01 -05:00
Brian Talbot
5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:58:20 -05:00
Brian Talbot
2ca267dc52 studio - resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:50:10 -05:00
Don Mitchell
6a4c6ad4d8 Merge pull request #1333 from MITx/feature/christina/misc 
Import requireJS.
 2013-01-23 09:35:50 -08:00
cahrens
a1eeb56839 Import requireJS. 2013-01-23 12:30:06 -05:00
Don Mitchell
b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce 
Feature/christina/tiny mce
 2013-01-23 09:14:42 -08:00
Don Mitchell
4d0d46462c Fixed the y axis drop problem by requiring it to be within the x bounds. 2013-01-23 12:12:40 -05:00
jmvt
549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics 2013-01-23 12:02:48 -05:00
Ned Batchelder
6f322bcd81 Simplify the construction of the ErrorDescriptor 2013-01-23 11:34:42 -05:00
Ned Batchelder
376575dedd Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match. 2013-01-23 11:34:24 -05:00
Chris Dodge
54ee1607b8 add unit test to test DraftModuleStore.get_items() fix 2013-01-23 11:22:37 -05:00
Don Mitchell
ad5f00f270 Drag and drop for sections, subsections, and units works with following 
caveats: - it drops wherever the y of the cursor is no matter the x for
the cursor. I've constrained the draggables to never change x; so, the
drop doesn't care where the x of the cursor is only the y.
- if you force auto scroll, the visual thing you'll dragging gets out of
sync w/ the mouse cursor; however, the mouse cursor is the "true"
location; so, the drop's posit is the mouse cursor y not the visual
clone's y.
 2013-01-23 11:16:04 -05:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Deena Wang
ca185c034f Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-01-23 10:50:37 -05:00
Deena Wang
3fd69bcae4 more tests in test_views.py 2013-01-23 10:41:12 -05:00
Don Mitchell
c7d9eb23f1 Merge pull request #1328 from MITx/fix/cdodge/subsection-crash-no-display-name 
use property rather than referencing the metadata dictionary. This is be...
 2013-01-23 07:40:52 -08:00
Don Mitchell
966db4fbaf Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items 
add optional course_id parameter to DraftMongoStore.get_items()
 2013-01-23 07:39:36 -08:00
jmvt
4f005044d6 Added time of query display. 2013-01-23 10:17:17 -05:00
David Ormsbee
eab9511466 Merge pull request #1295 from MITx/feature/jarv/certificate-force-update 
Feature/jarv/certificate force update
 2013-01-23 06:32:41 -08:00
Chris Dodge
0042131588 use property rather than referencing the metadata dictionary. This is better because if there is no 'display_name' defined, then we get back a string of the location name 2013-01-23 09:12:24 -05:00