Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,175 Commits 1 Branch 0 Tags
f4e55ccb761ad78f6dcc156144d4cd4a45f8f388
Commit Graph

22175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
f4e55ccb76 Merge pull request #3061 from cpennington/model-metrics 
Add datadog metrics logging for django model creates, updates, and deletes
 2014-03-28 16:33:53 -04:00
Jay Zoldak
b5fb8cb0d6 Merge pull request #3114 from edx/zoldak/skip-failing-video-test 
Disable failing video test
 2014-03-28 16:21:09 -04:00
Jay Zoldak
748fc120cd Disable failing video test 2014-03-28 16:20:04 -04:00
Mark Hoeber
6dfcb8e2d3 Merge pull request #3006 from edx/markhoeber/documentation/DOC-105 
Markhoeber/documentation/doc 105
 2014-03-28 16:02:51 -04:00
Mark Hoeber
7ac2270853 Custom JavaScript Display and Grading 
DOC-105
 2014-03-28 16:01:57 -04:00
Adam
a343d3368d Merge pull request #3113 from edx/adam/merge-release-2 
Adam/merge release 2
 2014-03-28 15:59:25 -04:00
Jay Zoldak
ce787d2759 Merge pull request #3112 from edx/zoldak/skip-failing-tests 
Temporarily disable the bok-choy test that is intermittently failing
 2014-03-28 15:39:09 -04:00
Mark Hoeber
cef471d4bf Merge pull request #3038 from edx/ahodges/documentation/dataczar 
AN-167 New chapter on role & skills of data czar and research team
 2014-03-28 15:37:43 -04:00
Alison Hodges
8d82733284 AN-167 New chapter on role & skills of data czar and research team 2014-03-28 15:37:16 -04:00
Adam Palay
c6743376f0 Merge remote-tracking branch 'origin/release' into adam/merge-release-2 2014-03-28 15:15:47 -04:00
Jay Zoldak
65bae9a655 Temporarily disable the bok-choy test that is intermittenly failing 2014-03-28 15:12:46 -04:00
Jay Zoldak
5471bab8ed Merge pull request #3111 from edx/zoldak/skip-failing-tests 
Skip video test that is failing in master
 2014-03-28 15:08:19 -04:00
Jay Zoldak
1532badfe5 Skip video test that is failing in master 2014-03-28 15:01:29 -04:00
Calen Pennington
81a038cbaf Add datadog metrics logging for django model creates, updates, and deletes 2014-03-28 14:45:59 -04:00
John Jarvis
8929373111 Merge pull request #3109 from edx/jarv/upgrade-newrelic-agent 
this will allow for clientside javascript reporting
 2014-03-28 14:08:38 -04:00
John Jarvis
e87e931681 this will allow for clientside javascript reporting 2014-03-28 14:04:19 -04:00
Gabe Mulley
05d959bc09 Merge pull request #3089 from mulby/gabe/publish 
Support emitting analytical events from xblocks running in the LMS
 2014-03-28 13:58:52 -04:00
Adam
94966a0e28 Merge pull request #3105 from edx/adam/hotifx-js 
temporarily remove SR on capa alerts to fix problem submissions (LMS-247...
 2014-03-28 12:19:02 -04:00
Calen Pennington
ffd47c45c5 Merge pull request #2613 from edx/bugfix/ichuang/idash-raw-grades-dump 
fix raw grade dump in standard instructor dashboard
 2014-03-28 11:51:47 -04:00
Carson Gee
9e58ef692d fix raw grade dump in standard instructor dashboard 
Added test and cleaned up code formatting
Review based changes
Converting class method and attributes to private
 2014-03-28 11:10:14 -04:00
Usman Khalid
e1afbe5011 Merge pull request #3058 from edx/usman/lms2429-unicode-error-fixes 
Unicode support fixes
 2014-03-28 20:08:27 +05:00
Adam Palay
8e01f1781e temporarily remove SR on capa alerts to fix problem submissions (LMS-2474) 2014-03-28 09:45:59 -04:00
Dave St.Germain
3e9d1b395e Merge pull request #3097 from edx/dcs/paver-reqs 
Reduce false cache misses when evaluating prerequisites
 2014-03-28 09:40:35 -04:00
Nimisha Asthagiri
2561c0106e Merge pull request #3064 from edx/nimisha/studio-reorder-and-hide-tabs 
Nimisha/studio reorder and hide tabs
 2014-03-28 06:55:54 -04:00
Nimisha Asthagiri
1bd6792a08 Support for "View Live" on Pages page. 
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
 2014-03-28 05:41:32 -04:00
Brian Talbot
3b0f71482e Studio - revising markup, templates and styling for page editing UI: 
* added in fixed state markup/logic
* added in collection markup/logic
* revised styling for page titles, collection, and fixed elements
 2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Valera Rozuvan
6bcae9aa94 Merge pull request #3085 from edx/valera/make_youtube_mocked_server_serve_youtube_api 
Make YouTube mocked server serve YouTube API
 2014-03-28 11:10:40 +02:00
Valera Rozuvan
3f41aae9f7 Make YouTube mocked server serve YouTube API 
1.) Making YouTube mock server serve YouTube API.
2.) Adding ability to block YouTube API from YouTube mock server.
3.) Adding acceptance tests that check YouTube mock server for availability of YouTube API, and for it's ability to block YouTube API.

Part of BLD-939.
 2014-03-28 10:34:34 +02:00
Valera Rozuvan
b35994f12e Merge pull request #3090 from edx/valera/update_youtube_stub_server_doc 
Update doc string for YouTube stub server.
 2014-03-28 09:15:35 +02:00
Dave St.Germain
59333915c6 Reduce false cache misses when evaluating prerequisites 2014-03-28 00:23:23 -04:00
Gabe Mulley
d6052675da Support emitting analytical events from xblocks running in the LMS 
XBlocks can and should use the "publish" method provided by the runtime to emit analytical events. In theory we could now start replacing calls to track_function with calls to publish, however, that migration is not handled by this change.

Fixes: AN-789
 2014-03-27 18:50:46 -04:00
Alison Hodges
30f7f1cfa1 Merge pull request #3071 from edx/ahodges/documentation/bulkbeta 
LMS-1287: Added section for batch add of beta testers
 2014-03-27 17:50:18 -04:00
Alison Hodges
8e41323588 LMS-1287: Added section for batch add of beta testers 2014-03-27 17:48:59 -04:00
Dave St.Germain
a6bde7cc9e Fix broken test due to refactoring. 2014-03-27 16:44:07 -04:00
Dave St.Germain
a820b3f7a8 Merge pull request #2793 from edx/dcs/mat-17 
Add an option to prevent multiple logins of the same user.
 2014-03-27 16:12:45 -04:00
Dave St.Germain
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -04:00
Valera Rozuvan
f03a94b0f2 Update doc string for YouTube stub server. 
Included information on how to launch the server
on its own.
EOF
 2014-03-27 21:21:38 +02:00
Valera Rozuvan
6517b06708 Merge pull request #3092 from edx/valera/fix_tender 
Fix failing tender.
 2014-03-27 21:15:12 +02:00
Valera Rozuvan
e50fad6475 Fix failing tender. 2014-03-27 20:36:08 +02:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
Valera Rozuvan
0e2e19e066 Update testing.md file. 
How to run Python tests for stub servers.
 2014-03-27 20:01:56 +02:00
David Baumgold
012f3f14f4 Merge pull request #3082 from edx/db/rake-coffee-to-paver-skip-collect 
Skip collectstatic when falling through from rake assets:coffee
 2014-03-27 13:20:03 -04:00
Mark Hoeber
fffe1c4ad1 Merge pull request #3069 from edx/markhoeber/documentation/doc-196 
Markhoeber/documentation/doc 196

Release notes for 3/27/14
 2014-03-27 11:10:45 -04:00
Mark Hoeber
ca63c67f8e Release notes 3/26/14 
DOC-196
 2014-03-27 10:48:55 -04:00
Carson Gee
26f133904c Merge pull request #3083 from carsongee/cg/git_export_lazy_translation_fix 
Properly get lazily translated exception message
 2014-03-26 23:24:52 -04:00
Carson Gee
2c03c63990 Properly get lazily translated exception message 2014-03-26 21:46:22 -04:00
David Baumgold
450592f0ba Skip collectstatic when falling through from rake assets:coffee 2014-03-26 21:09:20 -04:00
David Baumgold
97f30aaedf Merge pull request #3081 from edx/sef/paver-fix-devstack-theme 
fix paver theming on devstack (SERVICE_VARIANT support)
 2014-03-26 19:49:38 -04:00
Sef Kloninger
6ed59014d5 fix paver theming on devstack (SERVICE_VARIANT support) 
When running in devstack, you need to set the SERVICE_VARIANT so that
assets.py knows what environment file to use.  Recall that in devstack
we have all our settings in ../lms.env.json, not just ../env.json.  So
you need to run like this:

    SERVICE_VARIANT=lms paver lms --settings=devstack

Previously you'd get this error:

    Warning: could not find environment JSON file at 'lms.env.json'

Note there is no path on the file, that's the bug.  By making
self.REPO_ROOT absolute, we can walk up the tree and correctly find
the file, which is /edx/app/edxapp/lms.env.json fwiw.
 2014-03-26 16:28:54 -07:00