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

8136 Commits

Author SHA1 Message Date
srpearce
fa0e958b43 Merge pull request #3650 from edx/sylvia/docs/DOC-206 
Sylvia/docs/doc 206
 2014-05-09 12:38:05 -04:00
Sylvia Pearce
c1ef41fe6a Update Video component UI text 2014-05-09 12:37:28 -04:00
Muhammad Ammar
aa0e8041af Bok-Choy Video Tests Batch6 2014-05-09 07:22:03 +00:00
Carson Gee
c23a05b50d Merge pull request #3213 from carsongee/cg/video_transcript_static 
Add static fallback method for video transcripts
 2014-05-08 11:51:04 -04:00
Feanil Patel
1a9b505572 Merge pull request #3622 from edx/feanil/fix_enrollment_bug 
Field name is 'username' not 'user'
 2014-05-08 09:44:12 -04:00
Muhammad Ammar
af6c5efbb3 Bok-Choy video tests batch4 2014-05-08 10:53:08 +00:00
Carson Gee
c0644dc984 Only do static transcript redirect for english language, and don't offer static redirect for download 
Rename video test to real YouTube-ID
 2014-05-07 15:11:41 -04:00
Carson Gee
ab6c82342e Add last resort method to download and showing of video transcript 2014-05-07 15:11:41 -04:00
Anton Stupak
f2086f2336 Merge pull request #3586 from edx/anton/i18n-custom-response 
CustomResponse i18n.
 2014-05-07 15:13:13 +03:00
Anton Stupak
ed70a0823c Merge pull request #3608 from edx/anton/i18n-code-response 
CodeResponse i18n.
 2014-05-07 13:39:28 +03:00
Waheed Ahmed
998af82baa Fixed cheatsheet for open ended editor. 
STUD-1583
 2014-05-07 12:58:35 +05:00
Muhammad Ammar
411a13b56c Convert lettuce video tests specifically using youtube stub 2014-05-07 06:11:07 +00:00
Ned Batchelder
e25bbde4f2 Merge pull request #3618 from edx/ned/remove-press-stories 
Remove press-page machinery and assets
 2014-05-06 17:35:21 -04:00
Feanil Patel
f14146a5fa Field name is 'username' not 'user' 2014-05-06 15:39:00 -04:00
Ned Batchelder
db8c4de202 Remove press-page machinery and assets 2014-05-06 13:29:17 -04:00
Christina Roberts
df262d4fc7 Merge pull request #3229 from edx/christina/container-dnd 
Drag and drop on container page
 2014-05-06 11:09:29 -04:00
Anton Stupak
4a80b14ade Merge pull request #3607 from edx/anton/i18n-symbolic-response 
SymbolicResponse i18n.
 2014-05-06 15:58:49 +03:00
polesye
d8e5647a10 BLD-721: SymbolicResponse i18n. 2014-05-06 12:46:33 +03:00
polesye
0fa910aa3d BLD-714: CustomResponse i18n. 2014-05-06 12:02:26 +03:00
Anton Stupak
6e4cea7bfd Merge pull request #3590 from edx/anton/i18n-string-response 
StringResponse i18n.
 2014-05-06 11:58:58 +03:00
polesye
7effca9ec6 BLD-722: CodeResponse i18n. 2014-05-06 11:26:49 +03:00
Sarina Canelake
799c3611de Merge pull request #3602 from edx/sarina/LMS-2644 
Ensure system language is released in dark lang middleware
 2014-05-05 16:29:37 -04:00
Sarina Canelake
41b25fec9a Ensure system language is released in dark lang middleware 
LMS-2644
 2014-05-05 15:42:48 -04:00
Adam
0b8cc25be3 Merge pull request #3582 from edx/adam/some-cleaning 
Adam/some cleaning
 2014-05-05 15:14:59 -04:00
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05:00
polesye
d9aa28b829 BLD-715: StringResponse i18n. 2014-05-05 16:57:45 +03:00
cahrens
6f404fe2c5 Test cleanup. 2014-05-05 09:41:38 -04:00
Christina Roberts
b914ddf768 Merge pull request #3576 from edx/christina/view-studio-bug 
Do not show "View in Studio" links for child verticals of verticals.
 2014-05-04 20:59:25 -04:00
Giulio Gratta
0974507970 Certificates: 'Grade Me' YAML file 
* Sample HTML and javascript to show how you might integrate the
  /request_certificate endpoint into a course.

Co-authored-by: Joe Blaylock <jrbl@jrbl.org>
 2014-05-02 14:34:21 -07:00
Joe Blaylock
ae8847cd6e Certificates: URL endpoint for cert gen 
* API endpoint for certificate generation, an authenticated  post with course
  id requests that grading be carried out and a cert generated for
  request.user in that course, using the usual grading and certificate
  machinery (ie, it does not imply whitelisting, though whitelists and
  blacklists will be respected)
  - Logs each request as it comes in
  - Calls xq.add_cert() and consequently, does grading synchronously on
    this app host and then queues request for certificate agent.
  - example usage:
    ```
    curl --data "student_id=9999&course_id=Stanford/2013/Some_Class" http://127.0.0.1:8000/request_certificate
    ```

* Studio advanced setting added, "certificates_show_before_end", which
  determines whether a course should permit certificates to be downloadable
  by students before the coures's end date has passed.
  - Modifications to dashboard view and templates to allow display of
    certificate download links before course has ended.
    (XXX: may declare failing students as failing before the course has ended.)
  - To test, turn the setting on in a course which hasn't ended yet, and
    force certificate generation for a student, then check their
    dashboard.
 2014-05-02 14:34:21 -07:00
Andy Armstrong
de80f892e2 Clean up coverage and code quality issues 2014-05-02 16:20:17 -04:00
cahrens
c6b96f32a2 Allow for no runtime_type in the context. 2014-05-02 16:20:17 -04:00
cahrens
ff00fbd1f1 Bok choy acceptance test for drag and drop. 2014-05-02 16:20:17 -04:00
Andy Armstrong
f3a23f3973 Only show drag handles in draft mode 2014-05-02 16:20:12 -04:00
Adam Palay
ced3f67ab1 fix authentication check in auth 2014-05-02 15:28:59 -04:00
cahrens
8e00f6dc3b Restore the ability to drag at any level inside a vertical and clean up templates. 2014-05-02 15:09:24 -04:00
cahrens
fb150bcf64 Drag and drop on container page. 
STUD-1309
 2014-05-02 15:09:15 -04:00
Sarina Canelake
af31f31be8 Expose "enabled" checkbox in Embargo admin 2014-05-02 14:59:22 -04:00
cahrens
1e92a6c884 Do not show "View in Studio" links for child verticals of verticals. 
STUD-1558
 2014-05-02 13:36:44 -04:00
Giulio Gratta
78616f37c0 Merge pull request #3562 from caesar2164/giulio/zoom-image-firefox-bugfix 
Fixes firefox image hidden overflow bug.
 2014-05-02 09:10:21 -07:00
Giulio Gratta
579bfe5224 fixes firefox image hidden overflow bug. 2014-05-01 11:30:28 -07: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
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
e0d
2bfb1b4a56 Merge branch 'release' 2014-04-30 14:42:27 -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
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
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