Commit Graph

13667 Commits

Author SHA1 Message Date
Calen Pennington
7f19d48985 Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock
Migrate to the open source XBlock repo
2013-04-04 10:12:00 -07:00
brianhw
b7c8a6977e Merge pull request #1805 from MITx/fix/brian/user-on-progress
add user name and email to progress page
2013-04-04 10:09:52 -07:00
chrisndodge
0ff31adf74 Merge pull request #1779 from MITx/feature/ichuang/studio-sort-my-courses
sort course index in studio my courses page
2013-04-04 09:30:16 -07:00
Mark L. Chang
00abaffe1d Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics 2013-04-04 12:17:58 -04:00
Mark L. Chang
db1c0bf081 added dev key so tests run 2013-04-04 12:14:34 -04:00
Brian Wilson
d3e7739b3b add user name and email to progress page 2013-04-04 12:03:08 -04:00
Mark L. Chang
1c7e13e1e8 copy change 2013-04-04 11:54:37 -04:00
John Jarvis
ea6174af28 fixing image resolution for the stanford-university image 2013-04-04 11:40:44 -04:00
Will Daly
1b7e552d5d Merge pull request #1804 from MITx/fix/brian/remove-input-state-logging
add progress logging while running remove_input_state management command
2013-04-04 08:32:45 -07:00
Brian Wilson
4c511c3c66 add progress logging 2013-04-04 11:14:52 -04:00
Calen Pennington
039ccb83cc Migrate to the open source XBlock repo 2013-04-04 10:55:31 -04:00
Diana Huang
8304e9031c Merge pull request #1797 from MITx/diana/fix-matlab-queueing-message
Matlab Unit Tests and Minor Bugfix
2013-04-04 07:39:05 -07:00
Chris Dodge
c0fc029b03 switch over the variable 'ms' to be 'store' 2013-04-04 10:33:30 -04:00
Will Daly
fb14bedfdf Merge pull request #1803 from MITx/fix/zoldak/pep8-psychometrics
pep8 fixes for psychoanalyze and capa module
2013-04-04 07:26:13 -07:00
Chris Dodge
c7061a0262 add a command line utility to walk through the course and find common errors 2013-04-04 10:20:31 -04:00
Jay Zoldak
22017ac24c pep8 fixes for psychoanalyze and capa module 2013-04-04 09:57:19 -04:00
Chris Dodge
ac01079502 add a command line utility to walk through the course and find common errors 2013-04-04 09:35:35 -04:00
Piotr Mitros
1717782c5b Merge pull request #1776 from MITx/feature/ichuang/psychometrics-fix
fix psychometrics to be compatible with new xblocks
2013-04-04 05:50:59 -07:00
Mark L. Chang
1043958a73 Merge branch 'feature/markchang/studio-analytics' of github.com:MITx/mitx into feature/markchang/studio-analytics 2013-04-04 01:51:38 -04:00
Mark L. Chang
8fb6ce2eca added tracking to unit page and components 2013-04-04 01:51:15 -04:00
Mark L. Chang
4ce34fa298 instrumented checklists 2013-04-04 01:51:15 -04:00
Mark L. Chang
7b5ec1bc41 instrumented advanced settings 2013-04-04 01:51:14 -04:00
Mark L. Chang
22bd8da1f2 added event tracking to static pages 2013-04-04 01:51:14 -04:00
Mark L. Chang
64b7603d37 outline page event tracking 2013-04-04 01:51:14 -04:00
Mark L. Chang
d9bbed305e newline 2013-04-04 01:51:14 -04:00
Mark L. Chang
8439013f64 studio: added segment.io tracking 2013-04-04 01:51:14 -04:00
Mark L. Chang
587402cddc added tracking to unit page and components 2013-04-04 01:47:37 -04:00
Mark L. Chang
405b18618c instrumented checklists 2013-04-04 00:49:09 -04:00
Mark L. Chang
bab42b1cce instrumented advanced settings 2013-04-04 00:40:06 -04:00
Mark L. Chang
c6f8b32dd4 added event tracking to static pages 2013-04-04 00:34:37 -04:00
Mark L. Chang
1ce2affdd2 outline page event tracking 2013-04-03 23:45:05 -04:00
Mark L. Chang
2e48212715 newline 2013-04-03 22:21:18 -04:00
Mark L. Chang
4265f5b48f studio: added segment.io tracking 2013-04-03 22:07:23 -04:00
John Jarvis
d2313d851a renaming image 2013-04-03 16:02:41 -04:00
John Jarvis
b2e8780f9b adding a smaller stanford image 2013-04-03 16:01:15 -04:00
Brian Talbot
ea1387a5f9 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-03 15:50:00 -04:00
Brian Talbot
e3d35afb7a studio - changing visual padding around alerts 2013-04-03 15:49:26 -04:00
John Jarvis
e8ee6616c4 removing old logo 2013-04-03 15:39:46 -04:00
John Jarvis
6d78425a82 dding stanford-univ logo 2013-04-03 15:39:22 -04:00
John Jarvis
1c581835f2 changing stanford logo 2013-04-03 15:39:11 -04:00
Brian Talbot
f06892e9f9 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-03 15:38:52 -04:00
Christina Roberts
56d5f13b5e Merge pull request #1801 from MITx/fix/btalbot/studio-outlinedates
Resolving display issues around outline release dates
2013-04-03 12:38:51 -07:00
John Jarvis
71cfc4441b university->logo 2013-04-03 15:37:12 -04:00
John Jarvis
0c81329fa5 updating image link 2013-04-03 15:35:50 -04:00
Brian Talbot
b0021e7346 studio - resolved z-index issue with release date modal and JQUI timepicker + conslidated all vendor styling overrides/extensions 2013-04-03 15:35:22 -04:00
John Jarvis
7b226c34f8 Adding new logo for stanford 2013-04-03 15:34:54 -04:00
cahrens
f77aaec392 Need to mock datetime.datetime.utcnow. 2013-04-03 15:33:51 -04:00
Brian Talbot
eb6f2d8c09 studio - revising outline layout per date changes and gradable status UI issue 2013-04-03 15:22:27 -04:00
Diana Huang
2230fe3c23 Set the queue_len more consistently. 2013-04-03 15:08:33 -04:00
Brian Talbot
d87c4e3866 resolving local merge with master 2013-04-03 15:01:55 -04:00