Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lduarte1991
26eb16ebc2 Added unit signifier - narrower annotation target 2014-04-30 12:24:07 -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
Joe Blaylock
c5834eb6a2 Certs: pass course name on queue 
Stanford had a problem a few times that certificate requests had
different values for the course display name and the course name printed
on the certificate and verification pages because of human error. This
passes the course display name on the queue to the certificate requests,
so that at least one place where the course name is reproduced (the
certificate agent's settings.py) can be eliminated.
 2014-04-29 15:35:00 -07: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
Adam Palay
c806c8a954 fix wiki hide button not working in firefox (STUD-1581) 2014-04-29 15:17:53 -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
lduarte1991
24abd2bb86 Fix comment formatting and Timezone explanation 2014-04-29 13:23:53 -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
zubair-arbi
643e82ace3 Revert "remove location of item from loc_mapper and cache" 
This reverts commit d2b8b4f0dd.
 2014-04-29 18:31:27 +05:00
Waheed Ahmed
4f8dbc15e1 Fixed accessibility labels are not always created in problems. 
STUD-1524
 2014-04-29 10:04:26 +05:00
Dave St.Germain
14f2f67c78 Set the page in the correct place. 2014-04-28 17:01:03 -04:00
Adam Palay
8ad4cdb366 factor out google analytics ids (LMS-2555) 2014-04-28 16:47:17 -04:00
David Baumgold
82f98b2974 Reorganize information in CONTRIBUTING.rst, link to ReadTheDocs 2014-04-28 16:44:06 -04:00
Mark Hoeber
c747ebddbb Merge pull request #3496 from edx/markhoeber/documentation/doc-327 
Fixed all links in release notes
 2014-04-28 16:28:51 -04:00
Mark Hoeber
5c55b5df95 Fixed all links in release notes 
moved links to links.rst

Doc-327
 2014-04-28 16:28:28 -04:00
Mark Hoeber
df7ef98953 Merge pull request #3499 from edx/markhoeber/documentation/doc-310 
Updated note about accessing wiki after hiding page
 2014-04-28 16:18:36 -04:00
Mark Hoeber
1e57b107a3 Updated note about accessing wiki after hiding page 
doc-310
 2014-04-28 16:16:17 -04:00
David Baumgold
b95966e959 Merge branch 'release' 
Conflicts:
	CHANGELOG.rst
 2014-04-28 14:50:49 -04:00
Sarina Canelake
cba08d0bac Merge pull request #3494 from edx/sarina/fix-video-i18n 
Fix i18n of video transcript
 2014-04-28 14:18:50 -04:00
lduarte1991
2fd071fc39 Fixed Unit Test Issues 2014-04-28 13:59:22 -04:00
Adam
23ee963c4c Merge pull request #3476 from edx/usman/lms2556-wiki-urls 
Fixed transform_url function in WikiAccessMiddleware.
 2014-04-28 12:38:07 -04:00
Sarina Canelake
e76f6dc8fe Fix i18n of video transcript 2014-04-28 12:31:41 -04:00
Usman Khalid
f591b1db28 Fixed transform_url function in WikiAccessMiddleware. 
In the current implementation if the path prefix contains the
wiki_path value it gets deleted. For example if the prefix is
'/courses/edx/math101/2014' and wiki_path is '101/' the final
prefix becomes '/courses/edx/math2014'.

LMS-2556
 2014-04-28 20:33:01 +05:00
Sarina Canelake
7a51382020 Merge pull request #3438 from edx/sarina/fix-video-i18n 
Don't scrape unnecessary strings for i18n
 2014-04-28 10:45:04 -04:00
srpearce
e4c5eb4d99 Merge pull request #3478 from edx/sylvia/docs/TIM-476 
Add info about removing prompt
 2014-04-28 09:38:01 -04:00