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

22955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alison Hodges
ee05d018ee Added enrollment events and new member fields 2014-05-06 11:49:36 -04:00
frances botsford
3530721671 Merge pull request #3577 from edx/frances/fix/404-and-500-page-layout 
Fix for Studio 404 and 500 page layouts
STUD-864
 2014-05-06 11:44:51 -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
Alison Hodges
56924af9ac Merge pull request #3610 from edx/ahodges/documentation/changelogfail 
Corrected the change log
 2014-05-06 09:38:31 -04:00
Alison Hodges
482931d0cd Corrected the change log 2014-05-06 09:35:55 -04:00
Alison Hodges
0f96853c2f Merge pull request #3524 from edx/ahodges/documentation/DOC286 
added a new topic on interpreting score histograms
 2014-05-06 09:34:12 -04:00
Alison Hodges
41e2241200 added a new topic on interpreting score histograms 2014-05-06 09:33:14 -04:00
David Baumgold
a31624622f Merge pull request #3603 from edx/db/jenkins-reset-ruby 
Reset the jenkins ruby environment before tests run
 2014-05-06 09:21:46 -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
Usman Khalid
bbbfc33e34 Merge pull request #3552 from edx/usman/lms2565-bulk-email-display 
When sending bulk email check if course is authorized.
 2014-05-06 17:01:02 +05:00
polesye
d8e5647a10 BLD-721: SymbolicResponse i18n. 2014-05-06 12:46:33 +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
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
David Baumgold
90723bb53d Reset the jenkins ruby environment before tests run 2014-05-05 15:53:25 -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
Han Su Kim
6579364f85 Merge pull request #3593 from edx/han/cert-report 
Certificate report improvements
 2014-05-05 15:01:58 -04:00
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
Adam
5cef9f7a37 Merge pull request #3202 from edx/talbs/lms-dashboard-trackstatus 
LMS: Show Enrollment Type on Dashboard
 2014-05-05 13:19:49 -04:00
Christina Roberts
759b656ac8 Merge pull request #3594 from edx/christina/delete-dead-files 
These files are not being used.
 2014-05-05 13:07:25 -04:00
David Baumgold
70562b9dae Merge pull request #3578 from edx/db/500-template-on-studio 
Show error page templates on Studio
 2014-05-05 12:59:52 -04:00
cahrens
acd9d7d904 These files are not being used. 2014-05-05 11:36:04 -04:00
Andy Armstrong
7693659e48 Address Christina's review comments 2014-05-05 11:34:55 -04:00
David Baumgold
93b5ccac45 Merge pull request #3503 from edx/db/process-updates 
Reorganize information in CONTRIBUTING.rst, link to ReadTheDocs
 2014-05-05 11:31:55 -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
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05: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
Brian Talbot
316f25e6d5 LMS: copy change to refer to 'ID Verified' enrollment as 'Verified' in Dashboard UI 2014-05-05 19:34:23 +05:00
Brian Talbot
5365dbe2fb LMS: adding visual reinforcement of a user's enrollment type (per course) to Dashboard UI 
LMS-1071
 2014-05-05 19:34:23 +05: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
Adam Palay
3d3e15ca1b remove new_location from logging 2014-05-05 10:05:04 -04:00
polesye
d9aa28b829 BLD-715: StringResponse i18n. 2014-05-05 16:57:45 +03: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
cahrens
6f404fe2c5 Test cleanup. 2014-05-05 09:41:38 -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
Usman Khalid
8ee682d44b Fixed and added more tests for bulk email. 
LMS-2565
 2014-05-05 16:58:10 +05: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
Andy Armstrong
de80f892e2 Clean up coverage and code quality issues 2014-05-02 16:20:17 -04:00