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

8071 Commits

Author SHA1 Message Date
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
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
Muhammad Ammar
1bbfbedb1f Bok-Choy video tests batch2 2014-04-23 14:37:26 -04:00
Valera Rozuvan
450dfe17b0 TESTS: Add tests for fix of end-time in the video player. 
BLD-662
 2014-04-23 18:44:10 +03: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
Adam
1934586afa Merge pull request #3422 from edx/usman/lms2554-tinymce-js 
Fixed path of tinymce.js.
 2014-04-22 12:31:17 -04:00
Usman Khalid
543306b29f Fixed path of tinymce.js. 
LMS-2554
 2014-04-22 20:41:02 +05:00
Renzo Lucioni
cfd841b872 Correct ordering of Segment.io identify and page calls 2014-04-22 11:29:36 -04:00
Sarina Canelake
deb9eb822e Merge pull request #3416 from edx/sarina/042214-language-update 
Sarina/042214 language update
 2014-04-22 11:03:07 -04:00
Sarina Canelake
f4332bb413 Add new languages from Transifex 2014-04-22 09:48:28 -04:00
Dave St.Germain
5bd944a3a6 Update codejail to enable logging 2014-04-22 09:46:48 -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
Adam
cc67c07dfb Merge pull request #3385 from edx/adam/add-event 
pass event to callback functions in membership.coffee (LMS-2547)
 2014-04-18 13:53:21 -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
Adam Palay
82142a4936 pass event to callback functions in membership.coffee (LMS-2547) 2014-04-17 11:43:36 -04: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
Brian Talbot
5940f1ff1a Studio: updating Sass ui-disabled placholder syntax and creating utility is-disabled class 
Studio: revising .fake-link utility class to use Sass placeholder and syncing commenting style

LMS: updating Sass ui-disabled placholder syntax and creating utility is-disabled class

Studio: adding in basic action Sass placeholder for use in enabling/disabling UI

Studio: applying action Sass placeholder to publish/create-draft Unit view actions

STUD-1497
 2014-04-16 14:44:30 -04:00
Sarina Canelake
1622216b58 Merge pull request #3084 from edx/sarina/improve-bulk-beta-add 
Improve the batch beta tester add feature
 2014-04-16 14:07:51 -04:00
Jim Abramson
8e0caa8935 Merge pull request #3355 from edx/jsa/user-profile-tests 
django_comment_client/forum: add test coverage for user_profile view
 2014-04-16 13:38:47 -04:00
jsa
0738b6c327 django_comment_client/forum: add test coverage for user_profile view 
JIRA: FOR-496
 2014-04-16 11:51:33 -04:00
Sarina Canelake
bddae213f6 Accept usernames in Batch Enrollment widget 
Respond to pull request comments
 2014-04-16 10:46:54 -04:00
Will Daly
84f63cd79e Merge pull request #3283 from edx/will/ora2-delete-student-state 
Reset submission API scores in beta and legacy instructor dash
 2014-04-16 10:17:41 -04:00
Will Daly
0b40354c12 Reset submission API scores in beta and legacy instructor dash 2014-04-16 09:25:53 -04:00
Sarina Canelake
82b085b4e1 Clear batch enrollment and beta text fields upon button click 2014-04-16 09:20:23 -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
William Desloge
01e01555be Fix missing call to translate in shoppingcart model 2014-04-16 12:08:45 +02:00
Sarina Canelake
3ba143eb9c Fix batch enrollment box email sending 2014-04-15 16:14:11 -04:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -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
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03: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