Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,799 Commits 1 Branch 0 Tags
96e05913d70d6ce55004fbda2cf6be97b3c2d2bc
Commit Graph

44799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
96e05913d7 Merge pull request #17282 from edx/jmbowman/PLAT-1890 
PLAT-1890 Fixed assorted ModifyingEnforceTypeWarning warnings
 2018-01-24 13:17:45 -05:00
Jeremy Bowman
ebc54c8f1a PLAT-1890 Fixed assorted ModifyingEnforceTypeWarning warnings 2018-01-24 11:49:42 -05:00
Harry Rein
2935578b9a Merge pull request #17294 from edx/HarryRein/a11y-footer-upgrade-div 
Ensuring div and not button inside link tag for a11y.
 2018-01-24 11:18:04 -05:00
Matthew Piatetsky
d716d7409c Merge pull request #17293 from edx/bundles_dashboard_fix 
Bundles dashboard fix
 2018-01-24 10:21:02 -05:00
Calen Pennington
69348d06d7 Merge pull request #17009 from cpennington/cms-login-factory-page 
Convert cms login.html to the require_page pattern in preparation for…
 2018-01-24 10:19:27 -05:00
Michael Frey
90bb8af3c6 Merge pull request #15618 from open-craft/bdero/failed-password-reset-email 
Add optional password reset failure emails
 2018-01-24 10:06:16 -05:00
Michael Frey
51499e2c4b Merge pull request #15921 from open-craft/haikuginger/advertised-start-date-courseware-detail-page 
Show advertised start date on course details page
 2018-01-24 10:04:57 -05:00
Harry Rein
98b8eaf27e Ensuring div and not button inside link tag for a11y. 2018-01-24 10:01:50 -05:00
Saleem Latif
ca3a6654cf Merge pull request #17232 from edx/saleem-latif/837 
ENT-837: Fix styling of enterprise sidebar on registration page.
 2018-01-24 16:11:04 +05:00
Saleem Latif
4ed64ee5d0 Fix styling of enterprise sidebar on registration page. 2018-01-24 14:28:04 +05:00
Tasawer Nawaz
4be097253e Merge pull request #17217 from edx/tasawer/learner-2437-update-learner-help-link-to-help-center 
update help link in header
 2018-01-24 13:10:16 +05:00
Tasawer Nawaz
f16cfea801 update help link in header 
LEARNER-2437
 2018-01-24 11:53:06 +05:00
Matthew Piatetsky
955dc60a3f Merge pull request #17292 from edx/add_screenshots 
Add screenshots
 2018-01-23 19:49:24 -05:00
Matthew Piatetsky
8cf1e04781 Add screenshots 2018-01-23 17:51:03 -05:00
Matthew Piatetsky
eeb05406a0 fix list price on bundle button 2018-01-23 17:46:55 -05:00
Jae Bradley
6bfb9c9478 Merge pull request #17291 from edx/mobile-learner-analytics-modal 
Make Learner Analytics Test Modal Mobile Responsive
 2018-01-23 16:48:30 -05:00
Michael Roytman
8e667d8bdf Merge pull request #17287 from edx/mroytman/assets-api-zero-assets 
mroytman/assets api zero assets
 2018-01-23 16:16:43 -05:00
Calen Pennington
974f099835 Teach the xss_linter about the require_page tag 2018-01-23 15:58:12 -05:00
Jae Bradley
7fb4ca5ce1 Merge pull request #17284 from edx/jaebradley/LEARNER-3945 
LEARNER-3945: Add try/catch in Learner Analytics View
 2018-01-23 15:48:06 -05:00
jaebradley
a2cc48d37d fix mobile responsive modal 
fix errors
 2018-01-23 15:38:37 -05:00
Michael Roytman
97954d48fb add condition for when no assets are found in the database 2018-01-23 15:13:12 -05:00
AlasdairSwan
b241e56f0f Merge pull request #17286 from edx/alasdair/LEARNER-3935-style-updates 
LEARNER-3935 Style updates
 2018-01-23 12:37:40 -05:00
AlasdairSwan
77d254dcad LEARNER-3935 Style updates 2018-01-23 11:28:06 -05:00
jaebradley
5ab2533b1e add try/catch for analytics api calls 
add comment

update jsx comment

simplify try block and update comment

fix comment
 2018-01-23 11:10:04 -05:00
Ari Rizzitano
a54b6d2dda Merge pull request #16680 from edx/ari/node-8 
Upgrade Jenkins Node version to 8.9.3
 2018-01-23 10:32:32 -05:00
AlasdairSwan
1b11f055a4 Merge pull request #17283 from edx/alasdair/LEARNER-3935-learner-analytics-dashboard-tweaks 
LEARNER-3935 Last minute updates
 2018-01-23 10:30:20 -05:00
Jae Bradley
407bc5ff2b Merge pull request #17256 from edx/add-passing-grade-to-learner-analytics 
LEARNER-3922: Add Grade Information
 2018-01-23 09:59:54 -05:00
adeel khan
0bff520dcf Merge pull request #17272 from edx/adeel/learner_3930_improving_html_escaping_filter 
strip_all_tags_but_br_filter would return HTML safe string.
 2018-01-23 15:26:46 +01:00
AlasdairSwan
8be1079186 Last minute updates 2018-01-23 09:14:33 -05:00
jaebradley
d52aa8c6ec add grade information 
remove console

remove whitespace

update logic

remove console statement
 2018-01-23 08:41:12 -05:00
Michael Frey
47272087cf Merge pull request #17247 from caesar2164/problem-loading-spinner 
Add FA loading spinner to each problem
 2018-01-23 08:24:58 -05:00
Eric Fischer
097e000a24 Merge pull request #16191 from proversity-org/proversity/course-visibility-in-catalog 
add DEFAULT_COURSE_VISIBILITY_IN_CATALOG flag
 2018-01-23 08:10:25 -05:00
Adeel Khan
b497210f17 strip_all_tags_but_br_filter would return HTML safe string. 
Now returning HTML safe string to template instead
of just bleaching string for br tags.

LEARNER-3930
 2018-01-23 17:15:33 +05:00
Rabia Iftikhar
e75a2ef5d4 Merge pull request #17270 from edx/ri/EDUCATOR-2147-update-message-info 
EDUCATOR-2147 update message info for Community TA's in Membership Dashboard
 2018-01-23 16:10:26 +05:00
rabia23
96df2eb35e EDUCATOR-2147 update message info for Community TA's in Membership Dashboard 2018-01-23 10:04:22 +00:00
Michael Roytman
d2320cbba5 Merge pull request #17119 from edx/thallada/files-search 
Add filename search to Files & Uploads
 2018-01-22 21:12:47 -05:00
Tyler Hallada
ad773dac5c Add text_search param for searching by displayname 2018-01-22 19:05:43 -05:00
Matthew Piatetsky
e17527c570 Merge pull request #17280 from edx/add_price_url_to_context 
Add price and url to context
 2018-01-22 17:01:08 -05:00
Feanil Patel
4ded0909d1 Merge pull request #17281 from edx/feanil/update_comment 
Update github.txt
 2018-01-22 16:55:44 -05:00
Ned Batchelder
d84d261cde Merge pull request #16533 from bzhang443/master 
Delete hard coded npm registry setting to accelerate installation
 2018-01-22 16:52:53 -05:00
Harry Rein
e3e363a342 Merge pull request #17274 from edx/HarryRein/a11y-issues-verification-sock 
LEARNER-3055: Clean up a11y issues on the verification sock
 2018-01-22 16:18:36 -05:00
Feanil Patel
6a7f941a18 Update github.txt 
Add more detail about using hashes/shas for requirements in this file.
 2018-01-22 15:47:51 -05:00
Matthew Piatetsky
ca8a1fcb29 Add price and url to context 2018-01-22 15:46:52 -05:00
Christopher Lee
3959509696 Merge pull request #17242 from edx/clee/optimizely 
Disable optimizely for xblocks for the mobile app
 2018-01-22 15:36:20 -05:00
Michael Terry
948cae4148 Fix crash using create_user 
Fix an invalid import usage to avoid a crash with the management
command create_user.

LEARNER-3932
 2018-01-22 13:46:35 -05:00
Matthew Piatetsky
e0bdd3773a Merge pull request #17273 from edx/try_bundling_test_fix 
Request correct program for bundling test
 2018-01-22 13:31:07 -05:00
Harry Rein
38cc3141cf Merge pull request #17277 from edx/HarryRein/course-dashboard-styling 
Fixing alignment of View Course button on course dashboard.
 2018-01-22 13:21:32 -05:00
Harry Rein
9dab9d2c20 a11y issues on upgrade footer. 
LEARNER-3055
 2018-01-22 13:14:47 -05:00
Harry Rein
d5e6ddc4f0 Fixing alignment of View Course button on course dashboard. 2018-01-22 12:07:47 -05:00
christopher lee
8a00b76f01 Disable optimizely for xblocks for the mobile app 2018-01-22 12:05:57 -05:00