Commit Graph

12158 Commits

Author SHA1 Message Date
Mark L. Chang
10377bc41c added a dummy key for segment.io so it doesn't ever fail 2013-04-04 16:08:10 -04: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
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
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
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
Jay Zoldak
22017ac24c pep8 fixes for psychoanalyze and capa module 2013-04-04 09:57:19 -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
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
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
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
Will Daly
8cd11f4f63 Merge pull request #1799 from MITx/fix/zoldak/terrain-pylint
Fix some pylint errors in the lettuce terrain module
2013-04-03 11:01:26 -07:00
Don Mitchell
9a7324ebfa Merge pull request #1798 from MITx/bug/christina/studio
Fix due date bug.
2013-04-03 10:26:40 -07:00
Jay Zoldak
c9add70a75 Fix some pylint errors in the lettuce terrain module 2013-04-03 13:01:42 -04:00
cahrens
52fdf5c7a0 Make sure due date year is always in the past. 2013-04-03 11:30:14 -04:00
Diana Huang
8cd4220b5f Fix the conditions by which we show the queueing message
for Matlab inputs
2013-04-03 10:48:27 -04:00
brianhw
7c9875870b Merge pull request #1770 from MITx/fix/brian/remove-input_state
management command to remove excess input_state entries
2013-04-03 07:35:47 -07:00
Brian Wilson
b11f0e17f7 respond to feedback 2013-04-03 10:22:43 -04:00
Diana Huang
c658c65149 Add new Matlab unit tests. 2013-04-03 10:17:28 -04:00
chrisndodge
c7c7f1da4a Merge pull request #1757 from MITx/feature/markchang/studio-nps
added net promoter score tracking javascript shim from Qualaroo
2013-04-03 06:37:00 -07:00
chrisndodge
54d45bae88 Merge pull request #1796 from MITx/feature/vaxxxa/fix-caption-asset-path
fix caption_asset_path for videoalpha
2013-04-03 06:17:13 -07:00
Vasyl Nakvasiuk
c66eabb308 fix caption_asset_path for videoalpha 2013-04-03 11:41:11 +03:00
Mark L. Chang
1d70509da1 fixed merge on env 2013-04-03 00:31:48 -04:00
Mark L. Chang
565a2cf752 Merge branch 'feature/markchang/studio-nps' of github.com:MITx/mitx into feature/markchang/studio-nps 2013-04-03 00:28:24 -04:00
Mark L. Chang
43f6f0ce8f put survey behind MITX_FEATURES flag 2013-04-03 00:28:08 -04:00
Mark L. Chang
5df7f41c8f added net promoter score tracking javascript shim from Qualaroo 2013-04-03 00:28:08 -04:00
Mark L. Chang
7a57e369d1 put survey behind MITX_FEATURES flag 2013-04-03 00:26:12 -04:00
Victor Shnayder
67fecd3e5e Merge pull request #1662 from MITx/feature/abarrett/annotation-styling-fixes
Annotation styling fixes
2013-04-02 18:36:19 -07:00
Brian Wilson
b6f95c71ce change command to handle file input instead 2013-04-02 16:20:46 -04:00
chrisndodge
d68650b4e8 Merge pull request #1786 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint
per Victor, one shouldn't change the default parameter to a function, si...
2013-04-02 12:43:00 -07:00
cahrens
f802ac2098 Remove string default value. 2013-04-02 15:21:09 -04:00
Chris Dodge
b8f1b744f2 fix up defaults per Victor's suggestions 2013-04-02 14:26:33 -04:00