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

22510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valera Rozuvan
2eb997cd7a Merge pull request #3272 from edx/valera/fiji 
Introducing JSHint.
 2014-04-14 16:37:08 +03:00
Waqas Khalid
70b525e259 Merge pull request #3203 from mlkwaqas/waqas/lms2479-fixed-userlazy-object-change-name 
fix change name view by replacing the request.user simple lazy object wi...
 2014-04-14 17:55:26 +05:00
Valera Rozuvan
19fe545740 Merge pull request #3318 from edx/valera/l62a 
Update acceptance tests to use real duration of YouTube video.
 2014-04-14 11:31:37 +03:00
Valera Rozuvan
92024a5b66 Introducing JSHint. 2014-04-14 10:43:54 +03:00
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03:00
Sarina Canelake
16a408837d Merge pull request #3300 from edx/sarina/lms-2217 
Fix course urls in enrollment emails (LMS-2217)
 2014-04-12 10:03:51 -04:00
Sarina Canelake
9a586edf02 InstDash: check Auto-Enroll and Email Students boxes by default 2014-04-11 18:43:43 -04:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04:00
Alison Hodges
4a7bd21c82 Merge pull request #3309 from edx/ahodges/documentation/DOC252 
DOC-252, add section on interpreting answer distribution
 2014-04-11 16:50:35 -04:00
Alison Hodges
decf2c0505 DOC-252, add section on interpreting answer distribution 2014-04-11 16:50:07 -04:00
Adam
69f11c7d53 Merge pull request #3322 from edx/release 
Release
 2014-04-11 14:40:44 -04:00
frances botsford
add0352b24 Merge pull request #3324 from edx/frances/fix/studio-pages-prompt 
Fix for fuzzy prompt on Studio Pages
 2014-04-11 14:01:19 -04:00
Frances Botsford
0309b3ad10 fix for fuzzy prompt on Studio Pages 2014-04-11 13:06:22 -04:00
Adam
b5d1019af3 Merge pull request #3308 from edx/adam/hotfix-js-draw 
Upgrade JSDraw.
 2014-04-11 12:55:12 -04:00
Anton Stupak
24b631f702 Merge pull request #3231 from edx/anton/refactor-speed-control 
Video: Refactor speed control.
 2014-04-11 19:38:04 +03:00
Waqas Khalid
43377af85a fix change name view by replacing the request.user simple lazy object with request.user.id 
LMS-2479
 2014-04-11 18:36:49 +05:00
Nimisha Asthagiri
fe4bd4cbad Merge pull request #3234 from edx/nimisha/container-duplicate-delete 
Nimisha/container duplicate delete
 2014-04-10 22:10:33 -04:00
Frances Botsford
48d935d715 fix for fuzzy prompt on container page 2014-04-10 21:22:20 -04:00
Nimisha Asthagiri
dd3c8c268c Support for Duplicate and Delete of XBlock Container Leaves (disabled under Feature Flag). 2014-04-10 21:22:15 -04:00
Jim Abramson
81597a5c6a Merge pull request #3295 from edx/jsa/disc-preview 
in Studio, render compact placeholders for inline discussions.
 2014-04-10 16:50:58 -04:00
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions. 
JIRA: FOR-429
 2014-04-10 15:44:30 -04:00
Greg Price
f233fcff4b Merge pull request #3307 from edx/gprice/deleted-thread-404 
Return 404 instead of 500 for missing forum thread
 2014-04-10 15:27:21 -04:00
Jay Zoldak
76297c3050 Merge pull request #3305 from edx/zoldak/no-lettuce-with-discussion 
Disable discussion service setting for lettuce tests
 2014-04-10 13:56:09 -04:00
Greg Price
ecf9923e96 Return 404 instead of 500 for missing forum thread 
Also show a more specific error message in the front end. This change
only has an effect if using cs_comments_service commit 1d71330 or later.
 2014-04-10 13:17:58 -04:00
muhammad-ammar
2318ce18c4 Merge pull request #3217 from edx/ammar/convert-lettuce-video-tests-to-bok-choy 
Convert lettuce video tests to bok choy
 2014-04-10 21:38:00 +05:00
Chris Rossi
f04cd649e4 Upgrade JSDraw. 2014-04-10 12:01:02 -04:00
Jay Zoldak
9957b1aa8e Disable discussion service setting for lettuce tests 2014-04-10 11:51:20 -04:00
David Baumgold
15a49f8782 Merge pull request #2440 from glowe/prevent-duplicate-checks 
Temporarily disable CAPA problem "Check" button.
 2014-04-10 11:37:52 -04:00
Muhammad Ammar
5b6f3f8fbf Convert first batch of lettuce video tests to bok-choy. 2014-04-10 15:18:03 +00:00
Adam
3fd89a0db4 Merge pull request #3297 from edx/merge-release-into-master 
Merge release into master
 2014-04-10 09:48:03 -04:00
Jay Zoldak
2c500a2b67 Merge pull request #3289 from edx/zoldak/quiet-acceptance-test-logs 
Quiet some noisy loggers for lettuce acceptance tests
 2014-04-10 09:29:52 -04:00
Andy Armstrong
8059547ed8 Merge pull request #2981 from edx/andya/container-editing 
Add "Edit" button to each leaf xblock on the container page
 2014-04-10 09:29:32 -04:00
Greg Price
8c8367b055 Merge pull request #3183 from edx/gprice/inline-response-pagination 
Add repsonse pagination to inline discussions
 2014-04-09 17:55:15 -04:00
Mark Hoeber
8609345bc3 Merge pull request #3298 from edx/markhoeber/documentation/doc-79 
Fixed typo in drag & drop
 2014-04-09 17:29:49 -04:00
Mark Hoeber
581702e1cb Fixed typo in drag & drop 
numbers -> number
 2014-04-09 17:22:19 -04:00
Adam Palay
b34c46ddb1 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2014-04-09 17:16:19 -04:00
Greg Price
16847d85a9 Add bok-choy tests for inline response pagination 2014-04-09 16:56:20 -04:00
Frances Botsford
df0973e771 addressing review feedback 2014-04-09 16:45:22 -04:00
Adam
0fb3a7d20f Merge pull request #3282 from edx/hotfix/2014-04-09 
Hotfix 2014-04-09
 2014-04-09 15:50:21 -04:00
Jay Zoldak
66a8685866 Merge pull request #3281 from edx/zoldak/fix-video-feature-name 
Fix video feature name so the test results roll up correctly
 2014-04-09 15:36:37 -04:00
Jay Zoldak
579e66fe88 Quiet some noisy loggers for lettuce acceptance tests 2014-04-09 14:40:50 -04:00
Mark Hoeber
430827d394 Merge pull request #3286 from edx/markhoeber/documentation/doc-254 
Removal of JS input chapter
 2014-04-09 14:33:58 -04:00
Mark Hoeber
0abedac38f Removal of JS input chapter 
DOC-254
 2014-04-09 13:55:35 -04:00
Andy Armstrong
2bf64d76d7 Remove feature flag for testing on container pages 2014-04-09 13:52:21 -04:00
Andy Armstrong
b78508a1f9 Indicate LaTex problems with a specific class on the editor 2014-04-09 13:33:01 -04:00
Andy Armstrong
a3e26e6824 Implement next round of code reviews 2014-04-09 12:15:38 -04:00
srpearce
7154ecca9e Merge pull request #3266 from edx/sylvia/documentation/DOC-265 
Add info about accessing student progress through steps
 2014-04-09 12:11:01 -04:00
Sylvia Pearce
7c8dbcf53b Document Course Staff Information field 2014-04-09 12:09:17 -04:00
Andy Armstrong
d55ad61801 Make the LaText source compiler link visible 2014-04-09 10:59:51 -04:00
Anton Stupak
a84bca233f Merge pull request #3246 from edx/anton/i18n-lti 
LTI i18n
 2014-04-09 17:59:27 +03:00