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

22863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Bau
2e97d472d9 Bump django 1.4 minor version to 1.4.12 to pick up patches 2014-05-01 12:14:59 -07:00
Gabe Mulley
a0db425f91 Merge pull request #3558 from mulby/gabe/event-tracking-doc 
Create a skeleton of event-tracking developer docs
 2014-05-01 14:58:52 -04:00
Gabe Mulley
e6d2184021 Merge pull request #3523 from mulby/gabe/tracking-shim 
Integrate event-tracking in to the LMS
 2014-05-01 14:53:59 -04:00
Gabe Mulley
bde8482eeb Create a skeleton of event-tracking developer docs 
A first pass at providing details about how to emit events, what to emit etc.
 2014-05-01 14:11:20 -04:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS 
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
 2014-05-01 14:04:35 -04:00
srpearce
6ea681f405 Merge pull request #3554 from itsbenweeks/itsbenweeks/checkbox_doc_example_update 
Modifying the checkbox examples syntax so that it works in studio.edge now.
 2014-05-01 10:42:01 -04:00
Sarina Canelake
fbde1cf318 Merge pull request #3485 from edx/sarina/public-sandboxes-doc 
Add documentation on public sandboxes
 2014-05-01 09:16:28 -04:00
Ned Batchelder
f3952f2a96 Merge pull request #3533 from johncox-google/johncox/bug/pipeline 
Fix bug that prevented account association during registration
 2014-04-30 16:59:59 -04:00
clytwynec
74621f91f3 Merge pull request #3522 from edx/clytwynec/update-testing-docs 
Adding more about the --failed functionality
 2014-04-30 16:09:08 -04:00
clytwynec
8356c86725 Adding more about the --failed functionality 2014-04-30 16:05:53 -04:00
Victor Shnayder
a2bb5f29ff Merge pull request #3556 from edx/victor/give-audit-certs 
Issue certificates to all students who earn them, even if they are in an audit track
 2014-04-30 16:00:12 -04:00
Ben Weeks
b8bc909a01 Adding my name to the AUTHORS file. 2014-04-30 14:55:49 -04:00
Mark Hoeber
b580f60f8e Merge pull request #3502 from edx/markhoeber/documentation/doc-330 
Release Notes 4/29/14
 2014-04-30 14:52:43 -04:00
Victor Shnayder
821d5874a8 Issue certificates to all students who earn them, even if they are in an audit track 
LMS-2573
 2014-04-30 14:44:08 -04:00
e0d
2bfb1b4a56 Merge branch 'release' 2014-04-30 14:42:27 -04:00
clytwynec
1c1a36a491 Merge pull request #3525 from edx/clytwynec/update-bok-choy-setup-tasks-prereqs 
Update to bok-choy setup task prereqs
 2014-04-30 14:29:12 -04:00
Mark Hoeber
f428540ed0 Release Notes 4/29/14 
Doc-330
 2014-04-30 13:19:12 -04:00
Jay Zoldak
71b3266356 Merge pull request #3555 from edx/zoldak/disable-test 
Disable unreliable test
 2014-04-30 13:13:37 -04:00
Jay Zoldak
a4edd44fca Merge pull request #3498 from edx/zoldak/jenkins-reset-venv 
Reset the jenkins python virtualenv before test runs.
 2014-04-30 13:12:03 -04:00
Christine Lytwynec
b69ae300d1 Updated test:bok-choy:setup task to not require that memchache or mongo be running 2014-04-30 13:02:43 -04:00
Jay Zoldak
5d371581f6 Disable unreliable test 2014-04-30 13:02:22 -04:00
Ben Weeks
1c4069a0df Modifying the checkbox examples syntax so that it works in studio.edge.edx.org now. 2014-04-30 12:27:12 -04:00
Christina Roberts
c5ef12558b Merge pull request #3535 from edx/christina/typo 
Minor reword to server timed out message.
 2014-04-30 11:35:51 -04:00
Dave St.Germain
5811fdc84e Merge pull request #3506 from edx/dcs/LMS-2562 
Set the page in the correct place.
 2014-04-30 11:30:09 -04:00
cahrens
d250f1f086 Minor reword to server timed out message. 2014-04-30 09:33:29 -04:00
Waheed Ahmed
37d3d4a869 Merge pull request #3451 from edx/waheed/stud1524-accessibility-labels-missing-in-problems 
Fixed accessibility labels are not always created in problems.
 2014-04-30 13:56:09 +05:00
John Cox
5333bd7d14 Fix bug that prevented account association during registration 2014-04-29 17:42:08 -07:00
Sarina Canelake
1599e0ff2c Respond to Alison comments 2014-04-29 20:30:59 -04:00
Sarina Canelake
cacb58365c Respond to DB comments 2014-04-29 19:12:22 -04:00
Sarina Canelake
4c1c2ea0bc Add documentation on public sandboxes 2014-04-29 19:12:22 -04:00
Alison Hodges
2d7d3bf221 Merge pull request #3521 from edx/ahodges/documentation/DOC239 
Documents in data packages are in raw format, not compressed or minified
 2014-04-29 16:37:37 -04:00
Alison Hodges
dd71ee5186 Documents in data packages are in raw format, not compressed or minified 2014-04-29 16:36:58 -04:00
Jason Bau
00d52e39ff Merge pull request #2685 from edx/jbau/lti-20-outcomes-rest 
LTI 2.0 results service endpoint
 2014-04-29 13:31:27 -07:00
Han Su Kim
8522847676 Merge pull request #3519 from edx/han/json-lint 
Small JSON correction
 2014-04-29 16:20:22 -04:00
Adam
a2817d9cd7 Merge pull request #3505 from edx/adam/google-analytics 
factor out google analytics ids (LMS-2555)
 2014-04-29 16:16:23 -04:00
Jim Abramson
f76838339a Merge pull request #3526 from edx/jsa/jasmine-fix 
crude fix for intermittent jasmine test failures
 2014-04-29 15:39:18 -04:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
jsa
03977a4666 crude fix for intermittent jasmine test failures 2014-04-29 14:26:12 -04:00
Mark Hoeber
d78dd92ca2 Merge pull request #3520 from edx/markhoeber/documentation/devdoc-changelog 
added contributor guidelines to change log
 2014-04-29 14:18:17 -04:00
Jay Zoldak
dddac0b5dd Reset the jenkins python virtualenv before test runs. 2014-04-29 13:12:36 -04:00
clytwynec
f4ace61579 Merge pull request #3467 from edx/clytwynec/add-auto-auth-page-object-for-lms-tests 
Add AutoAuthPage to lms pages for bok-choy tests
 2014-04-29 13:07:45 -04:00
frances botsford
021b41c297 Merge pull request #3516 from edx/frances/bug/xblock-studio-editor 
Fix for xblock settings scroll
 2014-04-29 12:46:21 -04:00
Mark Hoeber
fc3d8fcd38 fixed JS link and add contributor guidelines to change log 2014-04-29 11:52:56 -04:00
Han Su Kim
7f673194fd Correcting JSON 2014-04-29 11:14:14 -04:00
Waheed Ahmed
edabab3412 Merge pull request #3514 from edx/waheed/stud1514-toggle-cheatsheet-not-working 
Fixed advanced editor not working due to cheatsheet undefined.
 2014-04-29 19:49:46 +05:00
Dave St.Germain
c5627b41c8 Merge pull request #3002 from edx/dcs/status-object 
Convert CAPA inputtype statuses from strings to objects,
 2014-04-29 10:35:05 -04:00
Frances Botsford
8ed92f3c5b temporary fix for xblock settings scroll 
UX-623
 2014-04-29 10:27:21 -04:00
zubair-arbi
ce9e8d73d1 Merge pull request #3515 from edx/zub/revert/std1441/deleteitemfromlocmapper 
Revert "remove location of item from loc_mapper and cache"
 2014-04-29 19:25:45 +05:00
zubair-arbi
87408d2399 Revert "remove location of item from loc_mapper and cache" 
This reverts commit d2b8b4f0dd.
 2014-04-29 18:53:35 +05:00
Waheed Ahmed
a02f3f73cf Fixed advanced editor not working due to cheatsheet undefined. 
STUD-1514
 2014-04-29 18:44:54 +05:00