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
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
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
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
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
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
Brian Wilson
dde2cd0bd0
get chapter links to start working
2013-02-25 16:52:32 -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
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
Vik Paruchuri
d5865e70b8
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
2013-02-22 10:21:34 -05:00
Diana Huang
f9667849b8
Fix some minor bugs in event handling and add enter key support
2013-02-22 09:47:50 -05:00
Diana Huang
3ecafa9b42
Add hot keys to rubrics
2013-02-22 09:47:50 -05:00
Brian Wilson
6d174ef029
remove dead code
2013-02-21 15:41:28 -05:00
Brian Wilson
d503fe3d79
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
2013-02-21 15:38:28 -05:00
Diana Huang
76c4007449
Merge pull request #1522 from MITx/diana/click-tracking
...
Add more click tracking and logging to the open ended grading interface
2013-02-21 11:10:35 -08:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -05:00
Ned Batchelder
c3b571bf9b
Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.
2013-02-21 11:38:45 -05:00
Diana Huang
3a8b7156a0
Merge branch 'master' into diana/click-tracking
2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0
Address code review feedback
...
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
2013-02-21 10:17:08 -05:00
Brian Wilson
731f4abd8a
fix bug with nav to a page, and add pdfviewer.css.
2013-02-21 03:15:08 -05:00
Brian Wilson
50cae69945
define pdfviewer.js, and use from static_pdfbook.html
2013-02-20 18:37:17 -05:00
Vik Paruchuri
9bc8dbd7ca
Fix location strings, re-order checkboxes
2013-02-20 18:04:25 -05:00
Diana Huang
3fe6a74e76
Merge pull request #1528 from MITx/press/international-press-release
...
add press release: edX expands internationally
2013-02-20 14:55:58 -08:00
Victor Shnayder
84eaec3666
add press release: edX expands internationally
2013-02-20 17:50:23 -05:00
Vik Paruchuri
051b7fd21d
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
2013-02-20 17:50:09 -05:00
Victor Shnayder
bf454382d0
Merge pull request #1525 from MITx/press/international
...
Press/international
2013-02-20 14:14:11 -08:00
Victor Shnayder
4d643d36cc
Merge branch 'press/international' of github.com:MITx/mitx into press/international
2013-02-20 16:53:39 -05:00
Vik Paruchuri
d5ba5457dc
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 16:49:59 -05:00
