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

22927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marcotuts
7b751aef61 Merge pull request #3627 from edx/diana/fix-audit-cert 
Fix audit certificate display
 2014-05-06 17:57:11 -04:00
Diana Huang
aa8ae81034 Show same thing on dash for audit and honor code students. 2014-05-06 17:52:43 -04:00
marcotuts
8ef2d5ab67 Merge pull request #3620 from edx/adam-add-quotation-mark 
Adam add quotation mark
 2014-05-06 14:47:57 -04:00
Adam Palay
5613f19994 add quotation mark to _dashboard_course_listing.html 2014-05-06 14:44:40 -04:00
Christina Roberts
ee0970fc04 Merge pull request #3616 from edx/christina/remove-template 
Christina/remove template
 2014-05-06 13:25:32 -04:00
marcotuts
b0781cdd4a Merge pull request #3614 from edx/waheed/fix-simple-problem-editor 
Fixed simple problem editor text showing up in advanced editor
 2014-05-06 12:17:37 -04:00
frances botsford
04b35f6a3a Merge pull request #3611 from edx/frances/fix/codemirror-overflow-checkboxes2 
Fix for Codemirror overflowing Multiple Choice modal
 2014-05-06 12:13:49 -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
Frances Botsford
5890bc842c removing larger size for CodeMirror for funky visual behavior on Checkbox problems in release 2014-05-06 10:47:59 -04:00
Renzo Lucioni
03e6c10a81 Merge pull request #3606 from edx/renzo/no-ga 
Add ability to deactivate GA snippet
 2014-05-05 20:14:04 -04:00
Renzo Lucioni
bfee237a0d Add ability to deactivate GA snippet 2014-05-05 17:31:07 -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
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
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
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
David Baumgold
71a50c58d7 Show error page templates 2014-05-02 13:41:34 -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