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

22828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
David Baumgold
73c30e950f Merge pull request #3434 from edx/db/dev-process 
Document our development/review process
 2014-04-28 09:32:44 -04:00
muhammad-ammar
dfa45eac16 Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy 
Configure youtube stub for bok-choy
 2014-04-28 17:32:33 +05:00
Stephen Sanchez
37cb0052c7 Merge pull request #3483 from edx/ora2/release-2014-04-27T20.17 
Release for Apr 27, 2014
 2014-04-28 07:00:50 -04:00
Sarina Canelake
4800811f72 Merge pull request #3484 from edx/sarina/042914-language-update 
Sarina/042914 language update
 2014-04-27 19:22:05 -04:00
Sarina Canelake
51188099a4 Update translations (autogenerated message) 2014-04-27 17:40:19 -04:00
Sarina Canelake
3422fcfe21 Update how translations are pulled 2014-04-27 17:40:18 -04:00
Stephen Sanchez
c9f707f49d Release for Apr 27, 2014 2014-04-27 16:21:33 -04:00
Sarina Canelake
cb5904050a Correct native spelling of Armenian language 2014-04-27 11:06:49 -04:00
Ned Batchelder
82bd46d5a5 Merge pull request #3450 from johncox-google/johncox/feature/buttons 
Change signin control from text list to buttons.
 2014-04-25 17:38:16 -04:00
John Cox
441055d8d6 Update changelog 2014-04-25 14:32:03 -07:00
David Baumgold
5edae3edb0 Merge pull request #2780 from FiloSottile/progress_success_button 
Show a success button at the top of the Progress page
 2014-04-25 16:56:58 -04:00
John Cox
0379bd34a0 Fix acceptance tests 2014-04-25 13:34:18 -07:00
srpearce
b38a923630 Merge pull request #3479 from edx/sylvia/docs/DOC-345 
Correct copy/paste error in Adaptive Hint section
 2014-04-25 16:17:17 -04:00
Sylvia Pearce
cc892d64a9 Correct copy/paste error in Adaptive Hint section 2014-04-25 16:16:26 -04:00
Sylvia Pearce
3671b91aca Add info about removing prompt 2014-04-25 16:10:04 -04:00
marcotuts
a15e43f554 Merge pull request #2810 from edx/marco/discussions/styling-cleanup 
Forums visual styling adjustments
 2014-04-25 16:08:26 -04:00
David Baumgold
7aa627b1fa Merge pull request #3145 from carsongee/cg/course_import_validation 
Add test in import code to make sure two overlapping courses aren't imported
 2014-04-25 16:03:55 -04:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
John Cox
1192b5f7c9 Make dispatch logic clearer 2014-04-25 12:11:20 -07:00
John Cox
c80b596890 Fix two error message corner cases 2014-04-25 12:11:20 -07:00