Ned Batchelder
857edaf6f3
Remove dogfood and quickedit.
2013-02-13 12:23:08 -05:00
Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
David Ormsbee
754493597d
Merge pull request #1469 from MITx/feature/ichuang/fix-verbose-staff-debug
...
Fix "staff debug" so it only appears where useful, instead of everywhere
2013-02-10 22:10:53 -08:00
David Ormsbee
80843c1561
Merge pull request #1463 from MITx/feature/brian/pearson-exam
...
Feature/brian/pearson exam
2013-02-08 11:07:15 -08:00
Victor Shnayder
a68094515c
fix capitalization and spacing
2013-02-08 12:33:19 -05:00
Victor Shnayder
83a4f40ac6
fix typo; fix phrasing for software engineer job
2013-02-08 12:24:07 -05:00
Victor Shnayder
61f5991885
Posting lots of new jobs
2013-02-08 12:15:09 -05:00
ichuang
96d119965c
limit staff debug verbosity to locations of specific categories
2013-02-08 10:52:03 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
David Ormsbee
1c07fae501
Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump
...
add instructor dashboard feature to download profile & problem state
2013-02-07 08:19:52 -08:00
Victor Shnayder
37b735d708
Merge pull request #1454 from MITx/hotfix/dave/youtube_object
...
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 22:37:41 -05:00
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9
Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 965e3b4c491a7d2a06a8
2013-02-06 20:27:01 -05:00
Victor Shnayder
965e3b4c49
Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes
...
addressed somme comments in pull request and instructor fixes and blank ...
2013-02-06 15:40:33 -08:00
Kevin Chugh
1dd0ef274d
addressed somme comments in pull request and instructor fixes and blank group fix
2013-02-06 18:26:41 -05:00
Victor Shnayder
1a7d2a06a8
Merge pull request #1442 from MITx/marketing/reg-tweak
...
Fix placeholder email in signup form
2013-02-06 15:26:26 -08:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
Brian Wilson
aae5c7ca23
remove unneeded files
2013-02-06 15:25:25 -05:00
Brian Wilson
bfc4527590
Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.
2013-02-06 15:23:11 -05:00
Diana Huang
1f5beba383
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-06 13:12:04 -05:00
Your Name
6b4a1dfd34
minor tweaks after testing
2013-02-06 12:54:06 -05:00
ichuang
0936f448fc
add disable_progress_graph key to course metadata
2013-02-06 03:45:10 +00:00
Kevin Chugh
c7a133470d
inline discussions working
2013-02-05 22:43:09 -05:00
Victor Shnayder
219c51f898
Fix placeholder email in signup form
2013-02-05 22:24:20 -05:00
Your Name
d5b70d7bfc
inline cohorting working
2013-02-05 18:38:06 -05:00
Diana Huang
51db547a63
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
2013-02-05 16:18:56 -05:00
Diana Huang
120aa3cd3b
Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule
...
Feature/vik/peer grading xmodule
2013-02-05 12:55:48 -08:00
Diana Huang
f3be02d772
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-05 09:13:14 -05:00
ichuang
8ff3dde605
for require_attempted display "attempted" instead of "completed"
2013-02-04 19:54:36 -05:00
Vik Paruchuri
bf97a6a9a9
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
...
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
2013-02-04 17:55:55 -05:00
Vik Paruchuri
eb049bda9e
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging
2013-02-04 17:18:59 -05:00
Vik Paruchuri
7f96fbb3d1
Address review comments
2013-02-04 17:15:07 -05:00
Vik Paruchuri
cbd0895aad
Add in single peer grading problem view
2013-02-04 16:42:14 -05:00
Your Name
a8a9975914
Merge branch 'feature/kevin/groups_ui_changes' of github.com:MITx/mitx into feature/kevin/groups_ui_changes
2013-02-04 16:40:22 -05:00
Brian Wilson
f8b7d5fad6
have timer redirect when it expires
2013-02-04 15:13:14 -05:00
Kevin Chugh
3009acbb10
showing group names
2013-02-04 14:50:53 -05:00
Vik Paruchuri
6cf2742e32
Trim unneeded files
2013-02-04 14:22:57 -05:00
Vik Paruchuri
c6c89e4216
Make peer grading xmodule work with notifications
2013-02-04 13:16:05 -05:00
Your Name
bdfc9d9784
Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes
2013-02-04 12:30:48 -05:00
Diana Huang
f49b5ec771
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/self_assessment_module.py
lms/djangoapps/open_ended_grading/grading_service.py
lms/static/sass/course.scss
2013-02-04 09:11:28 -05:00
Kevin Chugh
69225f6435
cohort ID showing, have to translate to display text
2013-02-04 08:33:33 -05:00
ichuang
ddc8bf2b42
add instructor dashboard feature to download profile & problem state
2013-02-04 04:47:27 +00:00
ichuang
363ca7031e
add coffeescript/js for conditional module, does XModule.loadModules
2013-02-03 18:53:51 -05:00
ichuang
8db96abb18
conditional_module.html
2013-02-03 18:53:51 -05:00
Kevin Chugh
fcbd4bd1cd
produce and consume group_id from dropdowns
2013-02-02 05:46:11 -05:00
Vik Paruchuri
d9517877a4
Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging
2013-02-01 18:32:48 -05:00
Brian Wilson
9d98b7055d
add course navigation back into timed exam. Add initial timer styling.
2013-02-01 17:52:14 -05:00
Diana Huang
1c5c54c862
Make the rubric for self-assessment selectable and remove the
...
separate grade selection.
2013-02-01 15:15:42 -05:00
