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

8120 Commits

Author SHA1 Message Date
Andy Armstrong
f3a23f3973 Only show drag handles in draft mode 2014-05-02 16:20:12 -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
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
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
Adam
23ee963c4c Merge pull request #3476 from edx/usman/lms2556-wiki-urls 
Fixed transform_url function in WikiAccessMiddleware.
 2014-04-28 12:38:07 -04:00
Sarina Canelake
e76f6dc8fe Fix i18n of video transcript 2014-04-28 12:31:41 -04:00
Usman Khalid
f591b1db28 Fixed transform_url function in WikiAccessMiddleware. 
In the current implementation if the path prefix contains the
wiki_path value it gets deleted. For example if the prefix is
'/courses/edx/math101/2014' and wiki_path is '101/' the final
prefix becomes '/courses/edx/math2014'.

LMS-2556
 2014-04-28 20:33:01 +05:00
Sarina Canelake
7a51382020 Merge pull request #3438 from edx/sarina/fix-video-i18n 
Don't scrape unnecessary strings for i18n
 2014-04-28 10:45:04 -04:00
muhammad-ammar
dfa45eac16 Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy 
Configure youtube stub for bok-choy
 2014-04-28 17:32:33 +05:00
Sarina Canelake
3422fcfe21 Update how translations are pulled 2014-04-27 17:40:18 -04:00
Sarina Canelake
cb5904050a Correct native spelling of Armenian language 2014-04-27 11:06:49 -04:00
Ned Batchelder
82bd46d5a5 Merge pull request #3450 from johncox-google/johncox/feature/buttons 
Change signin control from text list to buttons.
 2014-04-25 17:38:16 -04:00
David Baumgold
5edae3edb0 Merge pull request #2780 from FiloSottile/progress_success_button 
Show a success button at the top of the Progress page
 2014-04-25 16:56:58 -04:00
John Cox
0379bd34a0 Fix acceptance tests 2014-04-25 13:34:18 -07:00
marcotuts
a15e43f554 Merge pull request #2810 from edx/marco/discussions/styling-cleanup 
Forums visual styling adjustments
 2014-04-25 16:08:26 -04:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
Sarina Canelake
dac6270345 Fix i18n of video player string 2014-04-25 14:02:24 -04:00
David Baumgold
0a022e13ba Merge pull request #3371 from carsongee/cg/pdf_textbook_urls 
Switch PDF Textbooks to use portable URLs
 2014-04-25 13:46:28 -04:00
Usman Khalid
9d3ea699e6 Merge pull request #3455 from edx/usman/lms1466-email-formatting 
Wraps long lines in bulk email messages.
 2014-04-25 20:23:32 +05:00
Usman Khalid
8fd14bfca7 Wraps long lines in bulk email messages. 
RFC 2822 states that line lengths in emails must be less than 998.
Some MTA's add newlines to messages if any line exceeds a certain
limit (the exact limit varies). Sendmail goes so far as to add
'!\n' after the 990th character in a line. To ensure that bulk
mail messages look consistent long lines are wrapped to a
conservative length.

LMS-1466
 2014-04-25 18:25:20 +05:00
Jay Zoldak
490d2fef8f Disable flaky video test 2014-04-25 09:12:02 -04:00
marco
83defda7d4 visual styling adjustments to discussion listing metadata, simplifying the visual representation of votes, increasing the line height of each post while also increasing the size of the icons for following and comments. visual styling adjustments also included for the discussion itself, pushing comments to be full width within a response, and small typography adjustments to the post count metadata and the add response button 2014-04-24 19:33:03 -04:00
cahrens
ad3d8c7871 Add support for raw HTML editor. 
STUD-1562
 2014-04-24 14:18:12 -04:00
Adam Palay
c83797ed94 fixes templating error (LMS-2560) 2014-04-24 14:17:43 -04:00
Greg Price
909903eb9c Merge pull request #3391 from edx/gprice/user-profile-pagination 
Add pagination to forum user profile
 2014-04-24 13:34:53 -04:00
Christine Lytwynec
ea3c48cf02 Removed trailing periods in two scenario names 2014-04-24 12:00:51 -04:00
Greg Price
0e59038c72 Add pagination to forum user profile page 2014-04-23 16:49:50 -04:00
Greg Price
643069c64c Remove cruft from user profile threads 
This removes the vote button from threads on the user profile, which was
the only interaction available on the page other than the link to view
the thread in the main discussion view.
 2014-04-23 16:07:36 -04:00
cahrens
ae886f1bc6 Add support for raw HTML editor. 
STUD-1562
 2014-04-23 15:12:38 -04:00