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

8146 Commits

Author SHA1 Message Date
Muhammad Ammar
411a13b56c Convert lettuce video tests specifically using youtube stub 2014-05-07 06:11:07 +00:00
Ned Batchelder
e25bbde4f2 Merge pull request #3618 from edx/ned/remove-press-stories 
Remove press-page machinery and assets
 2014-05-06 17:35:21 -04:00
Ned Batchelder
db8c4de202 Remove press-page machinery and assets 2014-05-06 13:29:17 -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
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
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
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
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
Sarina Canelake
8f0173dc10 Add new languages 2014-05-05 09:13:51 -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
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
Andy Armstrong
f3a23f3973 Only show drag handles in draft mode 2014-05-02 16:20:12 -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
cahrens
7e05f3cdab pep8/pylint cleanup 2014-05-02 15:36:22 -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
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
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
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
Adam
a5235a9cb4 Merge pull request #3574 from edx/release 
Release
 2014-05-02 11:56:26 -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
Usman Khalid
c955fd0bce When sending bulk email check if course is authorized. 
Also the idash_mode property is stored seperately for each course.

LMS-2565
 2014-05-02 20:09:25 +05: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
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
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
Adam Palay
80f5784657 puts GA id in quotes 2014-05-01 14:41:13 -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
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
Victor Shnayder
a2bb5f29ff Merge pull request #3556 from edx/victor/give-audit-certs 
Issue certificates to all students who earn them, even if they are in an audit track
 2014-04-30 16:00:12 -04:00
Victor Shnayder
821d5874a8 Issue certificates to all students who earn them, even if they are in an audit track 
LMS-2573
 2014-04-30 14:44:08 -04:00
e0d
2bfb1b4a56 Merge branch 'release' 2014-04-30 14:42:27 -04:00
Victor Shnayder
9dd9422a74 Remove google analytics tracking from iframes used in Drupal course about pages 
This fixes two issues:
 - if the course pointed to doesn't exist, GA was added to the iframe twice
 - more importantly, we don't want to count these as separate views anyway--
   we just care about the about page itself.
 - I also added a note about where we would put our segment.io widget if we want it
   later

LMS-2581
 2014-04-30 14:34:45 -04:00
Jay Zoldak
5d371581f6 Disable unreliable test 2014-04-30 13:02:22 -04:00
Dave St.Germain
5811fdc84e Merge pull request #3506 from edx/dcs/LMS-2562 
Set the page in the correct place.
 2014-04-30 11:30:09 -04:00
Joe Blaylock
c5834eb6a2 Certs: pass course name on queue 
Stanford had a problem a few times that certificate requests had
different values for the course display name and the course name printed
on the certificate and verification pages because of human error. This
passes the course display name on the queue to the certificate requests,
so that at least one place where the course name is reproduced (the
certificate agent's settings.py) can be eliminated.
 2014-04-29 15:35:00 -07:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
Dave St.Germain
14f2f67c78 Set the page in the correct place. 2014-04-28 17:01:03 -04:00
Adam Palay
8ad4cdb366 factor out google analytics ids (LMS-2555) 2014-04-28 16:47:17 -04:00
Sarina Canelake
cba08d0bac Merge pull request #3494 from edx/sarina/fix-video-i18n 
Fix i18n of video transcript
 2014-04-28 14:18:50 -04:00