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

22908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Han Su Kim
8bcb70b8bf Filter just downloadable certs for report 2014-05-05 13:45:07 -04:00
Han Su Kim
4b49159205 Adding additional fields for certificate mode 2014-05-05 13:20:36 -04:00
Han Su Kim
36865b8447 flake8 cleanup 2014-05-05 11:31:39 -04:00
Han Su Kim
b8541db176 Renaming enrolled to active 2014-05-05 11:16:20 -04:00
Greg Price
f32e2892f6 Merge pull request #3569 from edx/gprice/remove-cs-email 
Remove email field from CS client user object
 2014-05-05 11:02:53 -04:00
Mark Hoeber
a2f882484a Merge pull request #3581 from edx/markhoeber/documentation/doc-332 
Markhoeber/documentation/doc 332
 2014-05-05 10:49:18 -04:00
Mark Hoeber
3635f9cecd Reorg of Research Guide 
To remove XML info that’s in course staff doc now.

doc-332
 2014-05-05 10:48:29 -04:00
Sarina Canelake
692e4b2ea7 Merge pull request #3589 from edx/sarina/050514-language-update 
Sarina/050514 language update
 2014-05-05 10:33:48 -04:00
Will Daly
8c281c2008 Merge pull request #3587 from edx/will/ora2-release-2014-05-05 
ORA2 release-2014-05-05T12.00
 2014-05-05 09:56:46 -04:00
Waqas Khalid
3be3df8760 Merge pull request #3513 from mlkwaqas/waqas/lms2516-typo-softwaresecure-resultcallback 
Update the software secure result call back by correcting the typo
 2014-05-05 18:32:05 +05:00
Sarina Canelake
436e91a5f7 Update translations (autogenerated message) 2014-05-05 09:31:44 -04:00
Sarina Canelake
8f0173dc10 Add new languages 2014-05-05 09:13:51 -04:00
Will Daly
a2225bd719 ORA2 release-2014-05-05T12.00 2014-05-05 09:08:31 -04:00
Waqas
0d7f34b5d3 Update the software secure result call back by correcting the typo 
LMS-2516
 2014-05-05 16:44:33 +05: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
Joe Blaylock
9cc30d0920 Merge pull request #2533 from edx/jrbl/certs_request_cert_endpoint 
/request_cert AJAX endpoint
 2014-05-02 15:20:41 -07: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
Giulio Gratta
3ff3973b10 Merge pull request #3435 from caesar2164/giulio/ul-ol-basic-style 
Adds very basic about page style to ul, ol and dl
 2014-05-02 14:18:32 -07:00
Giulio Gratta
fa63507034 Adds very basic about page style to ul, ol and dl 
About pages need basic support for lists since professors often want to display lists or 'definitions'
 2014-05-02 13:13:46 -07:00
Sarina Canelake
12c8f09222 Merge pull request #3580 from edx/sarina/show-enabled-checkbox 
Expose "enabled" checkbox in Embargo admin
 2014-05-02 16:10:52 -04:00
cahrens
7e05f3cdab pep8/pylint cleanup 2014-05-02 15:36:22 -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
Greg Price
4dbb104136 Remove email field from CS client user object 
This requires cs_comments_service commit 1d50176.
 2014-05-02 13:17:24 -04:00
Mark Hoeber
9d2b85d340 Merge pull request #3575 from edx/markhoeber/documentation/fix-link-in-readme 
Fixed link to docs.edx.org in readme
 2014-05-02 13:13:28 -04:00
Usman Khalid
5903ec5b17 Merge pull request #3417 from edx/usman/lms2518-refund-emails 
Parameter from_email to send_mail() should be string
 2014-05-02 22:03:04 +05:00
srpearce
c51f737895 Merge pull request #3559 from edx/sylvia/docs/DOC-99 
Update drag and drop documentation
 2014-05-02 12:15:40 -04:00
Sylvia Pearce
8b7f4f1cd2 Update drag and drop documentation 2014-05-02 12:14:08 -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
Adam
a5235a9cb4 Merge pull request #3574 from edx/release 
Release
 2014-05-02 11:56:26 -04:00
Mark Hoeber
6db6dbc05c Fixed link to docs.edx.org in readme 2014-05-02 11:47:46 -04:00
Usman Khalid
e33e9ff2d9 Parameter from_email to send_mail() should be string and not string in list. 
LMS-2518
 2014-05-02 20:35:20 +05:00
srpearce
d2f49c6946 Merge pull request #3527 from edx/sylvia/docs/DOC-295 
Add IFrame template documentation
 2014-05-02 11:33:52 -04:00
Sylvia Pearce
013ff49c47 Update IFrame documentation 2014-05-02 11:33:20 -04:00
Victor Shnayder
6e4b129f48 Merge pull request #3551 from edx/victor/remove-iframe-ga 
Remove google analytics tracking from iframes used in Drupal course abou...
 2014-05-02 10:55:36 -04:00
Adam
3d5a8eb802 Merge pull request #3564 from edx/adam-fix-GA-quotes 
puts GA id in quotes
 2014-05-02 10:40:53 -04:00
Adam
4a45719a2f Merge pull request #3560 from edx/adam/disable-links-ajax-2 
Disable draft and edit links during ajax calls
 2014-05-02 10:08:19 -04:00
David Ormsbee
1b3995810d Merge pull request #3274 from edx/ormsbee/instructor_task_admin_for_daves_vacation_enjoyment 
Add admin.py for instructor_task.
 2014-05-02 09:30:45 -04:00
Adam Palay
7c13ba0c3b Disable draft and edit links during ajax calls 
STUD-1485
STUD-1499
 2014-05-02 09:11:46 -04:00
Joe Blaylock
48e472a05f Merge pull request #3532 from edx/jrbl/certs_pass_course_name_in_dict 
Certs: pass course name on queue
 2014-05-01 14:07:55 -07:00
Gabe Mulley
a0db425f91 Merge pull request #3558 from mulby/gabe/event-tracking-doc 
Create a skeleton of event-tracking developer docs
 2014-05-01 14:58:52 -04:00
Gabe Mulley
e6d2184021 Merge pull request #3523 from mulby/gabe/tracking-shim 
Integrate event-tracking in to the LMS
 2014-05-01 14:53:59 -04:00
Adam Palay
80f5784657 puts GA id in quotes 2014-05-01 14:41:13 -04:00
Giulio Gratta
579bfe5224 fixes firefox image hidden overflow bug. 2014-05-01 11:30:28 -07:00
Gabe Mulley
bde8482eeb Create a skeleton of event-tracking developer docs 
A first pass at providing details about how to emit events, what to emit etc.
 2014-05-01 14:11:20 -04: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
srpearce
6ea681f405 Merge pull request #3554 from itsbenweeks/itsbenweeks/checkbox_doc_example_update 
Modifying the checkbox examples syntax so that it works in studio.edge now.
 2014-05-01 10:42:01 -04:00
David Ormsbee
09bc765c6e Add admin.py for instructor_task. 
This is primarily so that we can manually fail zombie instructor
tasks that are clogging up the queue for a course.
 2014-05-01 09:50:07 -04:00
Sarina Canelake
fbde1cf318 Merge pull request #3485 from edx/sarina/public-sandboxes-doc 
Add documentation on public sandboxes
 2014-05-01 09:16:28 -04:00