Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,302 Commits 1 Branch 0 Tags
5e433cda2e7b061a06500a0a3e4e1d4d7cfafcf1
Commit Graph

4065 Commits

Author SHA1 Message Date
Kevin Chugh
8d766c4b51 fix conflict 2013-03-13 21:01:37 -04:00
Your Name
97eb7eb58b remove whitespace 2013-03-13 19:07:46 -04:00
Your Name
6ee14ec34a candidate without inline 2013-03-13 18:51:40 -04:00
Your Name
fc907fe055 candidate without inline 2013-03-13 18:50:00 -04:00
Your Name
117be695cb candidate without inline 2013-03-13 18:40:10 -04:00
Your Name
08bc073fa5 updates 2013-03-13 16:40:04 -04:00
Your Name
a2f9e4d565 almost there 2013-03-13 15:29:57 -04:00
Your Name
7450128064 update coffeescript 2013-03-13 12:52:07 -04:00
Kevin Chugh
07534a7231 fix thread/thread id issue 2013-03-13 09:02:57 -04:00
Your Name
8280c55992 pinning .1 2013-03-12 17:40:26 -04:00
Brian Wilson
046e0fd75e Merge remote-tracking branch 'origin/master' into fix/brian/regrade-partial 2013-03-12 16:09:10 -04:00
Brian Wilson
47e708e713 fix pylint and pep8 warnings 2013-03-12 15:49:48 -04:00
Brian Wilson
6aed059d5f Change date and remove filtering by grade. Add check for student_answers. 2013-03-12 14:55:27 -04:00
Brian Wilson
fe0447093c add management command to regrade partial-credit problems affected by get_npoints bug. 2013-03-12 14:00:18 -04:00
Vik Paruchuri
554cb752fa Pep8 cleanup 2013-03-12 12:20:11 -04:00
Kevin Chugh
a2be6dd420 first cut of UI 2013-03-12 10:31:05 -04:00
John Hess
331806f155 Merge pull request #1646 from MITx/feature/jkarni/folditx 
Feature/jkarni/folditx
 2013-03-11 15:50:05 -07:00
Julian Arni
6e92666a20 Fixed score order. 
Less is more.
 2013-03-11 14:57:19 -04:00
David Ormsbee
0605c94113 Merge pull request #1636 from MITx/feature/brian/htmlbook 
Initial implementation of htmlbook.
 2013-03-11 11:38:46 -07:00
Brian Wilson
cd95872b52 htmlbook-specific styling to make Heroes text presentable. 2013-03-11 11:56:48 -04:00
Julian Arni
588b27c9dc Added Descriptor method, fixed order issue. 2013-03-11 11:17:12 -04:00
Brian Wilson
2199ae673b add checks that book_index is in range 2013-03-11 11:10:08 -04:00
Calen Pennington
fcc3113bbf Merge pull request #1637 from MITx/fix/cdodge/performance-optimize-comment-client-use-jumpto 
Fix/cdodge/performance optimize comment client use jumpto
 2013-03-11 08:02:28 -07:00
Brian Wilson
fcb618f04e fix basic alignment issue with html textbook display 2013-03-11 10:38:32 -04:00
David Ormsbee
a8ff7911f6 Update of Delft logo (lighthouse ticket #234) 2013-03-11 10:21:03 -04:00
Chris Dodge
cbcda0fc65 oops didn't mean to commit the test API key 2013-03-10 11:14:25 -04:00
Chris Dodge
18ee1018e6 optimize forum page rendering as we don't pre-compute the link urls to inline discussions. We can use jump_to urls and then figure out the link path if/when end-user clicks on it. This saves a lot of unnecessary round trips to the DB as path computation is expensive, especially when it being done for every discussion module in a course in a loop. 2013-03-10 11:11:17 -04:00
Brian Wilson
bed7dbdb6b fix plumbing for anchors and chapters. 2013-03-08 18:25:33 -05:00
Calen Pennington
d9b68e2de2 Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics 
Add datadog metrics capture around heartbeat timing
 2013-03-08 08:59:44 -08:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -05:00
Calen Pennington
a44c0932d2 Fix https://edx.lighthouseapp.com/projects/101932-lms/tickets/237-Production-500-error-for-undefined-variable-user 2013-03-08 10:08:39 -05:00
Brian Wilson
49dee5080a first pass at chapter navigation 2013-03-07 18:45:00 -05:00
Jay Zoldak
1b7863e79e Merge pull request #1603 from MITx/fix/will/merge_jnater_unittests 
Fix/will/merge jnater unittests
 2013-03-07 06:47:55 -08:00
Brian Wilson
aee7d85694 fix bug in tabs 2013-03-07 02:01:42 -05:00
Victor Shnayder
5ec39825e0 Merge pull request #1604 from MITx/hotfix/jkarni/folditscore 
Hotfix/jkarni/folditscore
 2013-03-06 17:32:29 -08:00
Brian Wilson
b5ab766092 initial framework for htmlbook 2013-03-06 17:57:33 -05:00
Victor Shnayder
12b6b7d403 Merge pull request #1609 from MITx/diana/refactor-chemical-equation 
Refactor Chemical Equation Preview
 2013-03-06 12:09:03 -08:00
Victor Shnayder
fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule 
Feature/abarrett/annotatable xmodule DO NOT MERGE
 2013-03-06 12:05:27 -08:00
Diana Huang
1aa3580dcb Switch over to using the inputtype ajax handler for chemical input. 2013-03-06 14:41:48 -05:00
Arthur Barrett
5029d3a3dd Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule 2013-03-06 13:51:18 -05:00
Julian Arni
5682e02f53 Fix indendation that was causing only first submission to be saved 2013-03-06 11:05:10 -05:00
Will Daly
e1b99186ef Removed test_permissions.py 2013-03-06 10:20:02 -05:00
Will Daly
2f5ea630e7 Cleaned up courseware test_tabs unittests 2013-03-06 10:16:43 -05:00
Will Daly
0d1b380008 Removed test_grades.py in courseware django app. 2013-03-06 09:44:53 -05:00
Will Daly
72411a175f Added jnater's unit tests, cleaned up broken tests, ran pep8fix 2013-03-06 09:41:26 -05:00
Arthur Barrett
2ed7394f27 visually distinguish instructions from guided discussion section 2013-03-06 00:05:28 -05:00
Christina Roberts
e093431d75 Merge pull request #1581 from MITx/feature/vik/advanced-studio 
Feature/vik/advanced studio
 2013-03-05 12:28:29 -08:00
Vik Paruchuri
9475c6edac Address review comments 2013-03-05 14:41:08 -05:00
Victor Shnayder
d7484c5e10 Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all 
removed un-enroll all button for fear of disaster
 2013-03-05 10:18:30 -08:00
Will Daly
a018b8ac38 Merge pull request #1599 from MITx/feature/deena/testing 
Feature/deena/testing
 2013-03-05 09:48:23 -08:00