Your Name
b7a6eadca4
new cohorts tested
2013-03-01 16:33:27 -05:00
Vik Paruchuri
c24ba23e54
Move self assessment templates
2013-03-01 13:45:55 -05:00
Vik Paruchuri
b0c2559de8
Switch around template locations
2013-03-01 13:43:01 -05:00
Vik Paruchuri
b3d0abbd05
Start to move around templates
2013-03-01 13:31:54 -05:00
David Ormsbee
e1fcf4c317
Merge pull request #1478 from MITx/bugfix/dave/too_many_sql_queries
...
Reduce SQL queries in courseware by model caching a User's groups
2013-03-01 08:24:30 -08:00
John Hess
b400b575d0
Merge pull request #1567 from MITx/jth/admindash
...
Improved /admin_dashboard
2013-03-01 07:56:32 -08:00
David Ormsbee
1d4defd0ea
Fix bug where we weren't combining org_staff with built-in staff for group checking
2013-03-01 10:54:57 -05:00
Your Name
8a953241c1
first pass
2013-03-01 10:45:48 -05:00
David Ormsbee
bfe2809a87
Merge branch 'master' into bugfix/dave/too_many_sql_queries
...
Conflicts:
lms/djangoapps/courseware/access.py
2013-03-01 10:11:35 -05:00
Victor Shnayder
86b91e2dc0
add a question about account changes to the help page
2013-02-28 20:44:18 -05:00
Victor Shnayder
9cde21b591
Update edX media kit (LH #221 )
2013-02-28 20:16:19 -05:00
Victor Shnayder
f0a4691914
Update student FAQ (LH #213 )
2013-02-28 20:16:06 -05:00
Arthur Barrett
1da644fcb3
merge from master. resolved conflict with test_responsetypes.py by using the version from master.
2013-02-28 11:22:32 -05:00
John Hess
02e30f5072
Cleaned up admin_dashboard code and template
2013-02-28 11:11:57 -05:00
John Hess
2f5e1b9cc0
Readable admin_dashboard
2013-02-28 10:54:57 -05:00
David Ormsbee
456972de5c
Merge pull request #1562 from MITx/feature/jarv/org-staff-access
...
Creating group for organization staff access DO NOT MERGE
2013-02-28 06:53:56 -08:00
Victor Shnayder
f33c575412
Merge pull request #1565 from MITx/fix/brian/pdfchapter_ff
...
fix viewing of pdfbook on firefox
2013-02-27 15:25:36 -08:00
Brian Wilson
907cd50503
fix viewing of pdfbook on firefox
2013-02-27 17:09:50 -05:00
John Jarvis
48242d3a06
Adding instructor_<org>
2013-02-27 15:30:07 -05:00
Victor Shnayder
8543235306
Merge pull request #1558 from MITx/fix/will/symmath_check_unit_tests
...
Added additional unit tests for symmath library that verify symmath_check for simple symbolic input strings.
2013-02-27 12:19:47 -08:00
John Jarvis
ce2f1400e6
formatting
2013-02-27 15:05:02 -05:00
John Jarvis
7c0d9ff156
Creating group for organization staff access
2013-02-27 14:55:17 -05:00
Arthur Barrett
afa7fca15a
Merge branch 'master' into feature/abarrett/annotatable_xmodule
2013-02-27 11:58:38 -05:00
David Ormsbee
c7920f09ad
Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features.
2013-02-27 11:42:06 -05:00
Will Daly
e65a017c74
Added additional unit tests for symmath library that verify
...
symmath_check for simple symbolic input strings.
2013-02-27 10:19:02 -05:00
Ned Batchelder
f828049043
Change TorontoX to University of TorontoX
2013-02-27 10:05:58 -05:00
David Ormsbee
51a863bd6b
Merge pull request #1557 from MITx/feature/brian/pdfchapter
...
Feature/brian/pdfchapter
2013-02-26 15:00:58 -08:00
Brian Wilson
310073ddef
use same images for prev/next as used in image-based textbooks
2013-02-26 16:43:48 -05:00
Brian Wilson
19567cc3d5
update styling of pdfs to be more like textbooks
2013-02-26 15:19:23 -05:00
Julian Arni
b6f3042c1d
Incorporate Victor's suggestions
2013-02-26 12:38:09 -05:00
Arthur Barrett
18233ef0d7
bolded the section titles and added unittest skeleton for module
2013-02-26 12:15:43 -05:00
Julian Arni
adaa8463e3
Removed commented-out fn
2013-02-26 10:03:20 -05:00
VikParuchuri
df01064e77
Merge pull request #1536 from MITx/diana/rubric-hot-keys
...
Add in rubric hotkeys
2013-02-26 06:46:26 -08:00
Brian Wilson
fc9ab346e1
fix loading of specific pages.
2013-02-26 01:03:01 -05:00
Julian Arni
414c62115c
Fixed tests and list check
2013-02-25 20:12:33 -05:00
Julian Arni
b4387b287d
Adding migrations
2013-02-25 18:56:58 -05:00
Julian Arni
3473a5d3b0
Fixed broken reference
2013-02-25 18:39:59 -05:00
Will Daly
850d9846f8
Fixed an error in symmath_check that occurred when
...
the expected result = 0. symmath_check() was dividing
a quantity by the expected result, leading to a NaN value
that caused the answer to be marked incorrect.
Added test_symmath_check.py with basic tests for
the symmath_check() function.
2013-02-25 18:34:35 -05:00
Julian Arni
edba0978cf
Included styling and template
2013-02-25 18:18:46 -05:00
Julian Arni
0a47f27fa7
Merge branch 'master' into feature/jkarni/foldit-api
2013-02-25 17:32:30 -05:00
Julian Arni
26eaf8985c
Allow progress without leaderboard and vice-versa
2013-02-25 17:28:22 -05:00
Brian Wilson
dde2cd0bd0
get chapter links to start working
2013-02-25 16:52:32 -05:00
Arthur Barrett
1f160d6ef4
added a box around the instructions text
2013-02-25 16:29:19 -05:00
David Ormsbee
f519c4f571
Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui
...
Feature/victor/revert revert of forums ui
2013-02-25 09:03:33 -08:00
Arthur Barrett
e736ed34f5
added ability to hide/show instructions, if present
2013-02-25 11:29:59 -05:00
Julian Arni
da2d0ed6ec
Foldit with puzzle leaderboard
2013-02-25 11:16:37 -05:00
Will Daly
862ce67bfc
Fixed a bug in symmath_check(): one of the if statements
...
evaluated bool(ans), which is False when ans=0.
This led to an error message "[symmath_check] failed to get MathML for
input; dynamath=[None]" when the function reached a later condition.
The check that evaluated bool(ans) was redundant, so I removed it.
2013-02-25 10:59:33 -05:00
Your Name
9f58f6890d
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-25 09:31:28 -05:00
Brian Wilson
fa00ea442e
add first pass at multi-chapter support.
2013-02-25 01:26:34 -05:00
Arthur Barrett
66ddfa295d
more refactoring and work on annotationinput (should be working now).
2013-02-22 16:33:28 -05:00
