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

4867 Commits

Author SHA1 Message Date
Andy Armstrong
4adc608f48 Specify that split_test_modules support children. 2014-05-13 12:36:45 -04:00
Brian Wilson
d6a74a644d Merge branch 'master' into release 
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
 2014-05-13 11:10:48 -04:00
Carson Gee
eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes 
Additional logic to handle more course_image URL edge cases
 2014-05-13 09:19:07 -04:00
Adam
4ecf41126a Merge pull request #3626 from edx/adam/fix-import-bug 
fix importing bug (STUD-1599)
 2014-05-12 16:54:21 -04:00
Adam Palay
a51a0c558e fix importing bug (STUD-1599) 
add target_location_namespace check
 2014-05-12 15:59:41 -04:00
Adam Palay
e5fa0c5dd9 add max-attempts to inheritance.py (LMS-2130) 2014-05-12 15:55:15 -04:00
Ned Batchelder
2f7adda00d Simple fixes 
- Ensure temp files are cleaned up.
- Refactor a function with three return statements.
 2014-05-12 15:52:57 -04:00
Anton Stupak
839887246c Merge pull request #3643 from edx/anton/fix-video-in-ff 
Anton/fix video in ff
 2014-05-12 10:24:47 +03:00
Sarina Canelake
b7003a1d76 Merge pull request #3672 from edx/sarina/fix-unicode 
Remove unicode character inserted into video_xfields
 2014-05-09 16:57:12 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -04:00
Adam
5b40604b1c Merge pull request #3671 from edx/adam/rebase/anton-fix-video-in-ff 
BLD-1057: Fix Video player in FF.
 2014-05-09 14:31:00 -05:00
Sarina Canelake
22d17a21ec Remove unicode character inserted into video_xfields 2014-05-09 15:25:56 -04:00
Dave St.Germain
eab8445eb1 Merge pull request #3156 from edx/dcs/LMS-1740 
Fixes LMS-1740 by activating the zooming diagram with the spacebar.
 2014-05-09 14:28:24 -04:00
Sylvia Pearce
c1ef41fe6a Update Video component UI text 2014-05-09 12:37:28 -04:00
polesye
18edab35f3 BLD-1057: Fix Video player in FF. 2014-05-09 08:54:09 -05:00
polesye
47ec168ea4 BLD-1057: Fix Video player in FF. 2014-05-09 15:00:18 +03:00
lduarte1991
edeebe7bea Fixes from @singingwolfboy in PR #3466 2014-05-08 11:37:49 -04: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
Diana Huang
4778eff817 Disable a flaky ORA Javascript test. 2014-05-07 14:51:27 -04:00
Waheed Ahmed
998af82baa Fixed cheatsheet for open ended editor. 
STUD-1583
 2014-05-07 12:58:35 +05:00
Christina Roberts
ee0970fc04 Merge pull request #3616 from edx/christina/remove-template 
Christina/remove template
 2014-05-06 13:25:32 -04:00
cahrens
3c1b363c01 Remove (Grade Me!) template until it can be productized. 2014-05-06 11:49:54 -04:00
Waheed Ahmed
b873cfc26d Fixed simple editor text showing in advanced editor. 2014-05-06 20:35:38 +05: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
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
cahrens
c6b96f32a2 Allow for no runtime_type in the context. 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
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
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
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
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
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
lduarte1991
24abd2bb86 Fix comment formatting and Timezone explanation 2014-04-29 13:23:53 -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
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
lduarte1991
2fd071fc39 Fixed Unit Test Issues 2014-04-28 13:59:22 -04: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
lduarte1991
7dee976850 Removed diacritic mention and explained token 2014-04-25 18:53:29 -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
Sarina Canelake
dac6270345 Fix i18n of video player string 2014-04-25 14:02:24 -04:00