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

3337 Commits

Author SHA1 Message Date
Sarina Canelake
e76f6dc8fe Fix i18n of video transcript 2014-04-28 12:31:41 -04: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
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
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
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
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
Waqas
442db0b4aa User doesn't exist in verify student banner toggle off view 
LMS-2510
 2014-04-23 15:36:56 +05:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
Renzo Lucioni
cfd841b872 Correct ordering of Segment.io identify and page calls 2014-04-22 11:29:36 -04:00
Sarina Canelake
a52540c8ee Merge pull request #3397 from edx/sarina/lms-2551 
Wording for batch beta email add with autoenroll (LMS-2551)
 2014-04-22 09:34:08 -04:00
David Baumgold
c854ec5c3b Merge pull request #3366 from IONISx/missing-translations 
Missing translations
 2014-04-18 13:41:04 -04:00
Sarina Canelake
d408f174e3 Wording for batch beta email add with autoenroll (LMS-2551) 2014-04-18 10:13:19 -04:00
William Desloge
8ef6a41db5 Fix missing call to translate in receipt page 2014-04-17 17:46:32 +02:00
Diana Huang
79fea6205e Merge branch 'release' 
Conflicts:
	lms/static/coffee/src/instructor_dashboard/membership.coffee
	lms/templates/instructor/instructor_dashboard_2/membership.html
	requirements/edx/github.txt
 2014-04-16 15:41:59 -04:00
Sarina Canelake
bddae213f6 Accept usernames in Batch Enrollment widget 
Respond to pull request comments
 2014-04-16 10:46:54 -04:00
Sarina Canelake
ede21224a8 Add "Auto Enroll" option for bulk beta add 2014-04-16 09:20:23 -04:00
Sarina Canelake
4f38b69eba Allow batch beta enrollment by username 2014-04-16 09:20:23 -04:00
William Desloge
36f762c275 Fix missing call to translate for shopping cart btn 2014-04-16 12:09:27 +02:00
Sarina Canelake
3ba143eb9c Fix batch enrollment box email sending 2014-04-15 16:14:11 -04:00
Renzo Lucioni
a57a62807e Remove page view events corresponding to Drupal pages 2014-04-14 18:20:17 -04:00
Renzo Lucioni
da51180815 Add comments explaining analytics improvements 2014-04-14 18:20:17 -04:00
Renzo Lucioni
74d03809a7 Add more granular pageview tracking, update Segment.io snippet 2014-04-14 18:20:16 -04:00
Dave St.Germain
ca14fba08b Merge pull request #3243 from edx/dcs/pdfbook-logging 
Added analytics event logging to PDF book viewer
 2014-04-14 17:56:26 -04:00
Dave St.Germain
1cf2696289 Added analytics event logging to PDF book viewer 2014-04-14 17:55:53 -04:00
Dave St.Germain
0a19c96a08 updated pdf viewer 2014-04-14 14:28:06 -04:00
Chris Dodge
27d7c19c40 Merge branch 'release' 
Conflicts:
	cms/templates/widgets/source-edit.html
 2014-04-14 14:17:03 -04:00
David Adams
28bf623490 Merge pull request #3240 from edx/dcadams/enhanced_metric_reporting 
This makes the metrics tab "bars" clickable.
 2014-04-14 09:42:33 -07:00
jmclaus
f05c0aa8f9 HD control is hidden initially. On first play of video, when 
player.getAvailableQualityLevels returns a non-empty array, it will eventually display, if HD qualities are available (highres, hd1080, hd720). [BLD-937]
 2014-04-14 10:26:30 -04:00
Sarina Canelake
9a586edf02 InstDash: check Auto-Enroll and Email Students boxes by default 2014-04-11 18:43:43 -04:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04:00
David Adams
0f37ee6924 This makes the metrics tab "bars" clickable. 
Clicking on any of the bars displays a list of students for that
  particular action (either opened the subsection or attempted the
  problem).
  Students are listed for the sub-sections.
  Students, grade and percent are listed for the problems.
  The on-screen list displays only the first 250 students with
  an overflow message if there are more students than that.
  The csv download lists all students.
 2014-04-11 13:56:49 -07:00
Anton Stupak
24b631f702 Merge pull request #3231 from edx/anton/refactor-speed-control 
Video: Refactor speed control.
 2014-04-11 19:38:04 +03:00
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions. 
JIRA: FOR-429
 2014-04-10 15:44:30 -04:00
David Baumgold
15a49f8782 Merge pull request #2440 from glowe/prevent-duplicate-checks 
Temporarily disable CAPA problem "Check" button.
 2014-04-10 11:37:52 -04:00
Andy Armstrong
8059547ed8 Merge pull request #2981 from edx/andya/container-editing 
Add "Edit" button to each leaf xblock on the container page
 2014-04-10 09:29:32 -04:00
Greg Price
8c8367b055 Merge pull request #3183 from edx/gprice/inline-response-pagination 
Add repsonse pagination to inline discussions
 2014-04-09 17:55:15 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page. 
STUD-1306
 2014-04-09 10:32:11 -04:00
polesye
f0492b3bb1 Refactor speed control. 2014-04-09 12:16:22 +03:00
polesye
31e9152936 BLD-753: Add i18n for LTI. 2014-04-09 12:12:52 +03:00
Greg Price
e1de25e128 Update OpenID dialog text 
We want to indicate more clearly that the information that we transmit
to the third party is governed by their terms of service and privacy
policy.
 2014-04-08 16:43:38 -04:00
Julia Hansbrough
d71aa87748 Revert refund instruction message 2014-04-08 19:34:55 +00:00
Dave St.Germain
660244201f Refactored course_nav middleware to isolate the django-wiki hack, 
remove unnecessary code, and clarify what it's doing.
 2014-04-08 15:24:48 -04:00
Sarina Canelake
9a352b9125 Unicode support for course names in reverification flow 2014-04-08 13:11:41 -04:00
Sarina Canelake
034105d2e7 Put mailto and em tags outside i18n strings 
Signup modal

Contact us form

courseware-error message
 2014-04-08 13:09:08 -04:00
Sarina Canelake
2d08b3a394 Fix i18n'd strings to be easier for translators to understand 
Signup modal

Just translate discussion sr text

Markdown editor help

Help modal and reverify dash
 2014-04-08 13:09:07 -04:00
Chris Dodge
a904fa09bd Revert "updated pdf viewer" 
This reverts commit b0a7443570.
 2014-04-08 12:59:04 -04:00