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

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy Armstrong
e20a7fc53c Fix Jasmine tests 
Also, rewrite them to be easier to comprehend, and to not use magic constants (or to use fewer, at least).
 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
Frances Botsford
fb4cab435e fix for Studio 404 and 500 page layouts 
STUD-864
 2014-05-02 16:19:59 -04: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
David Baumgold
ee33a12d75 IGNORED_EMAILS is no longer used 2014-05-02 15:57:14 -04:00
David Baumgold
9668a33563 Include author in table 2014-05-02 15:52:43 -04:00
David Baumgold
cd538bd800 Create edx remote if it doesn't exist 2014-05-02 15:41:17 -04:00
cahrens
7e05f3cdab pep8/pylint cleanup 2014-05-02 15:36:22 -04:00
Adam Palay
a35e359482 add logging to course import 2014-05-02 15:31:08 -04:00
Adam Palay
ced3f67ab1 fix authentication check in auth 2014-05-02 15:28:59 -04:00
cahrens
37da399997 Update unit test based on changes in master. 2014-05-02 15:09:25 -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
Andy Armstrong
c1fd0ca34e Switch the container page to use the new view 2014-05-02 15:09:23 -04:00
Frances Botsford
fd7142bcde dnd container page styling 2014-05-02 15:09:23 -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
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
David Baumgold
c694aaf511 removed unused import 2014-05-02 11:50:03 -04:00
David Baumgold
76d1ea0b8e Removed unused function 2014-05-02 11:49:37 -04:00
Mark Hoeber
6db6dbc05c Fixed link to docs.edx.org in readme 2014-05-02 11:47:46 -04:00
David Baumgold
333ec9d38a Major refactoring based on Cale's branch approach 2014-05-02 11:45:49 -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