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

34598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carol Tong
e7dab0dfbb Merge pull request #11126 from edx/carol/doc/cohort_help_target 
Fix cohort doc help targets in Instructor Dashboard
 2016-01-04 17:02:31 -05:00
Carol Tong
0f3da297f6 Fix help targets in Instructor Dashboard 2016-01-04 15:20:40 -05:00
David Baumgold
c6ed893df9 Merge pull request #11109 from ovnicraft/patch-1 
Remove duplicate import
 2016-01-04 14:36:58 -05:00
raeeschachar
0e88264df6 Merge pull request #11111 from edx/raees/chrome-bokchoy-test-url-routing 
Fixed test url routing failing on Chrome
 2016-01-05 00:10:38 +05:00
Bill DeRusha
77d85614b3 Merge pull request #11058 from edx/bderusha/mailchimp-activate 
Mailchimp activation
 2016-01-04 13:53:13 -05:00
Bill DeRusha
39b5eccf67 Update isActive column in mailchimp upon activation 2016-01-04 13:00:31 -05:00
Peter Fogg
c0fa05e2ae Merge pull request #11107 from edx/peter-fogg/enrollment-support-email 
Allow searching enrollments by email as well as username.
 2016-01-04 12:57:36 -05:00
Ned Batchelder
74ab0df0b7 Merge pull request #11127 from edx/ned/updated-translations 
Update translations (autogenerated message)
 2016-01-04 11:46:41 -05:00
Arbab Nazar
8576a180b5 Merge pull request #11114 from edx/arbab/devops-3388 
DEVOPS-3388 Remove unused setting from edxapp configuration
 2016-01-04 21:21:12 +05:00
Matt Drayer
2c1680a9cb Merge pull request #11080 from edx/saleem-latif/SOL-1529 
SOL-1529: Allow PMs to Invalidate Certificates
 2016-01-04 10:46:27 -05:00
Ned Batchelder
58ecfaac42 Update translations (autogenerated message) 2016-01-04 15:45:25 +00:00
Ben Patterson
99b029969c Merge pull request #11097 from edx/ziafazal/SOL-1560 
ziafazal/SOL-1560:load db_fixures when run with --testsonly
 2016-01-04 09:00:38 -05:00
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
Syed Hasan raza
6a24fd66cc Merge pull request #11005 from edx/shr/bug/TNL-2622-course_import_status_message_fix_test 
Shr/bug/tnl 2622 course import status message fix test
 2016-01-04 12:33:45 +05:00
Syed Hasan raza
482e0e457f Merge pull request #10978 from edx/shr/bug/TNL-3809-Sign-in-mutiple-clicks 
Shr/bug/tnl-3809-sign-in-mutiple-clicks
 2016-01-04 12:32:45 +05:00
raeeschachar
4694b0a6f9 Fixed test url routing failing on Chrome 2016-01-01 18:35:15 +05:00
arbabnazar
49d8ec3543 DEVOPS-3388 Remove unused setting from edxapp configuration 2016-01-01 12:50:42 +05:00
Ben Patterson
1ece96a5a8 Merge pull request #11103 from edx/benp/refresh-lettuce-db-cache 
Update lettuce db cache with the latest migrations.
 2015-12-31 10:30:01 -05:00
Zia Fazal
2f275f31b4 fixed scenario when tests run using cached sql schema 2015-12-31 20:03:28 +05:00
Zia Fazal
7cdeb3300a load db_fixures when run with --testsonly 
revert shell script change
 2015-12-31 15:39:08 +05:00
Syed Hassan Raza
912e012bb7 Add Disabled class to Sign In button 2015-12-31 15:21:29 +05:00
Syed Hassan Raza
fe0740b91e set path explicitly for storing cookie 2015-12-31 15:19:40 +05:00
Cristian Salamea
c7c542d7da Remove duplicate import 2015-12-30 21:51:14 -05:00
Peter Fogg
b96a8bf6ff Allow searching enrollments by email as well as username. 
This brings the enrollment support tool's UI in line with the other
support tools.
 2015-12-30 16:53:31 -05:00
AlasdairSwan
da7830db99 Merge pull request #11101 from edx/alasdair/ECOM-3047-programs-ida-integration-update 
ECOM-3047 update DOM to include the data-attributes that the programs…
 2015-12-30 16:43:07 -05:00
Peter Fogg
51a89cab29 Merge pull request #11102 from edx/peter-fogg/active-email-text-change 
Add mailing address to activation email form.
 2015-12-30 15:19:32 -05:00
AlasdairSwan
a1d81ed781 ECOM-3047 update DOM to include the data-attributes that the programs IDA expects 2015-12-30 14:43:52 -05:00
clrux
622413a8e5 Merge pull request #11050 from edx/clrux/ac-296 
LMS: re-enable Enter and Space to toggle transcript
 2015-12-30 14:43:05 -05:00
Ben Patterson
7d76db555e Update lettuce db cache with the latest migrations. 2015-12-30 13:37:42 -05:00
Peter Fogg
80848135cd Merge pull request #11100 from edx/peter-fogg/remove-update-deadline-cat 
Allow removing upgrade deadlines through the Commerce API.
 2015-12-30 13:31:48 -05:00
Peter Fogg
238968c3cd Add mailing address to activation email form. 
ECOM-3318
 2015-12-30 13:30:43 -05:00
Syed Hasan raza
a5f7f502f2 Merge pull request #11093 from edx/shr/bug/AN-4509-detail-logging 
Detail logging for backend_logger
 2015-12-30 22:23:37 +05:00
Peter Fogg
69432015f3 Allow removing upgrade deadlines through the Commerce API. 2015-12-30 12:22:22 -05:00
Peter Fogg
bc61e72c0c Merge pull request #11099 from edx/peter-fogg/remove-verification-deadline-cat 
Allow removing a verification deadline through the Commerce API.
 2015-12-30 12:20:59 -05:00
Peter Fogg
45bff268ae Allow removing a verification deadline through the Commerce API. 
ECOM-3268
 2015-12-30 11:25:52 -05:00
Peter Fogg
d2392b451f Merge pull request #11089 from edx/peter-fogg/update-account-settings-name-label 
Update name label on account settings page.
 2015-12-30 09:49:10 -05:00
Christine Lytwynec
00b1e2155b Merge pull request #11090 from edx/clytwynec/ac-250 
add sr text for show/hide answer button
 2015-12-30 09:28:30 -05:00
David Ormsbee
dba12c09a3 Merge pull request #11088 from edx/ormsbee/seq_new_relic_tagging 
Add New Relic instrumentation to SequenceModule.
 2015-12-30 08:51:08 -05:00
Syed Hassan Raza
a16791baaa Detail logging for backend_logger 2015-12-30 15:41:01 +05:00
Awais Jibran
4f185abc33 Merge pull request #10749 from edx/aj/tnl3779-use-get-courses-summaries-for-staff 
Render CMS course listing Using CourseSummary class for staff
 2015-12-30 11:49:55 +05:00
David Ormsbee
0219071502 Add New Relic instrumentation to SequenceModule. 
The goal of this is to capture more detailed usage and performance
information around the kind of course content we have out there.
Having this information will allow us to more easily query to see
how sequence size and specific block types affect front end
performance.
 2015-12-29 19:08:30 -05:00
Vedran Karačić
e30761b89a Merge pull request #10352 from edx/vkaracic/TNL-2896 
[TNL-2896] Colons in problem names
 2015-12-30 00:08:58 +01:00
Christine Lytwynec
bb329c7b6f add sr text for show/hide answer button 2015-12-29 17:03:32 -05:00
Peter Fogg
bd50186fb9 Update name label on account settings page. 
ECOM-3130
 2015-12-29 16:19:22 -05:00
vkaracic
534b32c78c Xblock utilities tests 
Tests for xblock_utils.py functions.
 2015-12-29 18:46:10 +00:00
Christine Lytwynec
64d20bb66d Merge pull request #11079 from edx/clytwynec/release-process 
remove cut-branch option from release.py
 2015-12-29 10:53:34 -05:00
Matt Drayer
d7bc32f590 Merge pull request #11071 from edx/asadiqbal08/SOL-1358 
asadiqbal08/SOL-1538 Incorrect Course Number Override appears on certificate setup page
 2015-12-29 10:10:25 -05:00
Aamir
bd1052cb72 Merge pull request #10940 from edx/aamir-khan/ECOM-3107-credit-eligibility-on-progress 
ECOM-3107: Updated the progress page to not display the eligibility in honor mode
 2015-12-29 18:31:00 +05:00
Awais Jibran
c32823dfa6 Render cms course listing using CourseSummary class. 2015-12-29 17:35:12 +05:00
aamir-khan
3fbdebcd30 ECOM-3107: Updated the progress page to not display the eligibility if user is not enrolled as credit mode 2015-12-29 17:34:34 +05:00