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

36756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Usman Khalid
ecf233c1b4 Keep karma config file docs only in karma.common.conf.js. Duplicate stuff tends to get out of sync. 2016-05-05 22:35:54 +05:00
Usman Khalid
bb7b29b308 Deleted js-test-tool config files. 2016-05-05 22:35:53 +05:00
sanfordstudent
db52e0334f Merge pull request #12333 from edx/sstudent/MA-2252 
Sstudent/ma 2252
 2016-05-05 12:52:09 -04:00
Ned Batchelder
850bc6bb06 Merge pull request #12375 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-05-05 12:46:35 -04:00
Ned Batchelder
190c2ffc99 Update translations (autogenerated message) 2016-05-05 15:52:25 +00:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -04:00
Peter Fogg
4a417f2832 Merge pull request #12372 from edx/feature/catalog-admin 
Merge catalog admin into master.
 2016-05-05 10:29:13 -04:00
Peter Fogg
e6f3af654b Merge pull request #12363 from edx/peter-fogg/fix-api-email 
Correctly pull in API access email config.
 2016-05-05 09:58:36 -04:00
Edward Zarecor
ce7d4f03ae Merge pull request #12339 from edx/e0d/update-libary 
Bump SAML version.
 2016-05-05 07:45:43 -04:00
Douglas Hall
1feb4fdb9f Merge pull request #12366 from edx/douglashall/microsite_platform_name 
Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting
 2016-05-05 00:47:27 -04:00
Douglas Hall
53604648d3 Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-04 23:45:16 -04:00
Clinton Blackburn
546f5f3da4 Merge pull request #12365 from edx/release-2016-05-03-conflict 
Merging release 2016-05-03 into master
 2016-05-04 23:12:42 -04:00
Clinton Blackburn
868d962002 Merge branch 'release' into release-2016-05-03-conflict 2016-05-04 20:01:29 -04:00
AlasdairSwan
816882a130 Merge pull request #12358 from edx/alasdair/ECOM-4338-program-progress-a11y-update 
Alasdair/ecom 4338 program progress a11y update
 2016-05-04 19:41:49 -04:00
Douglas Hall
2a8f44ad5c Merge pull request #12362 from edx/douglashall/fix_logistration_platform_name_display 
Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting
 2016-05-04 18:33:01 -04:00
Ned Batchelder
ff9e9d8bcf Merge pull request #12357 from edx/ned/registered-trademark 
Add a circle-R to the initial welcome message
 2016-05-04 17:41:41 -04:00
Douglas Hall
f914c44b80 Merge branch 'master' into douglashall/fix_logistration_platform_name_display 2016-05-04 16:47:13 -04:00
AlasdairSwan
f5d2499420 UPdated a11y approach for program card progress bars 2016-05-04 15:39:05 -04:00
Ned Batchelder
16fbad3f56 Add a circle-R to the initial welcome message 2016-05-04 15:13:18 -04:00
Christina Roberts
8127158e2a Merge pull request #12360 from edx/christina/tnl-4238 
Fix incorrect truncation issue.
 2016-05-04 15:02:56 -04:00
Douglas Hall
e97fa49bea Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-04 14:31:26 -04:00
Peter Fogg
268cb2ea17 Correctly pull in API access email config. 2016-05-04 14:23:46 -04:00
cahrens
b1f715690a Fix incorrect truncation issue. 
TNL-4238
 2016-05-04 13:28:06 -04:00
Clinton Blackburn
d6f68ca5ff Merge pull request #12307 from edx/rc/2016-05-03 
Release Candidate rc/2016-05-03
 2016-05-04 12:44:10 -04:00
Peter Fogg
85a6954d87 Merge pull request #12265 from edx/peter-fogg/catalog-admin-ui 
Catalog admin UI.
 2016-05-04 12:31:56 -04:00
Brian Jacobel
6055205dd4 Merge pull request #12356 from edx/karma 
JS tests no longer use js-test-tool
 2016-05-04 12:27:23 -04:00
Peter Fogg
bcde8e5588 Flesh out UI now that the backend is there. 2016-05-04 11:50:14 -04:00
Douglas Hall
6ba7133ba7 Merge pull request #12343 from edx/afzaledx/SOL-1780-increased-in-exam-polling-interval 
Bumped the proctoring version.
 2016-05-04 11:14:16 -04:00
clrux
972cee481f Merge pull request #12351 from edx/clrux/ac-452 
AC-452 removing unnecessary and incorrect aria-label
 2016-05-04 10:55:52 -04:00
Brian Jacobel
df32d2a130 Path update for Karma debug runner 2016-05-04 10:34:59 -04:00
Brian Jacobel
1d49dd9d49 JS tests no longer use js-test-tool 2016-05-04 10:28:38 -04:00
Toby Lawrence
00cbc291e6 Merge pull request #12283 from edx/PERF-317 
Add NewRelic instrumentation to contentserver.
 2016-05-04 09:57:35 -04:00
Usman Khalid
d99978870a Merge pull request #12312 from edx/usman/tnl4398-fix-tests 
Re-enable spec files that were disabled during the Jasmine upgrade.
 2016-05-04 17:16:58 +05:00
clrux
0bf5a3d7b7 Merge pull request #12355 from edx/clrux/rc-2016-05-03-progress_fix 
Moving main element up higher to not conflict with chart
 2016-05-03 22:28:10 -04:00
Chris Rodriguez
cf0b80984b Moving main element up higher to not conflict with chart 2016-05-03 21:35:27 -04:00
Douglas Hall
da5b97284e Merge pull request #12322 from edx/malikshahzad228/additional_course_fields 
WL-401 Add CourseDetails model to course_about template context
 2016-05-03 17:21:26 -04:00
Robert Raposa
24ad0059f3 Merge pull request #12352 from edx/robrap/linter-false-positives-3 
Fix Python false positives with AST.
 2016-05-03 17:03:32 -04:00
Douglas Hall
e14004599d Merge pull request #12337 from edx/douglashall/SOL-1777/fix_gating_with_library_content 
SOL-1777 Allow content gating to work with library_content blocks
 2016-05-03 16:21:18 -04:00
Robert Raposa
60d11bf2fd Fix Python false positives with AST. 
- Use AST to parse Python.
- Refactor Mako to use Python linting.
- Add optional verbose script argument.
- Skip tests.py files when linting.
 2016-05-03 15:17:09 -04:00
Douglas Hall
f5223a36d3 Merge branch 'master' into malikshahzad228/additional_course_fields 2016-05-03 15:03:46 -04:00
tasawernawaz
6d315a9a50 Merge pull request #12324 from edx/tasawer/story/ecom-3731-update-browse-new-courses-area 
Update browser new course area
 2016-05-04 00:01:42 +05:00
Douglas Hall
c7b2d9870c Allow content gating to work with library_content blocks 2016-05-03 14:54:58 -04:00
Christina Roberts
5b26a2f73f Merge pull request #12350 from edx/christina/instructor-dashboard-xss 
Clean up HTML encoding.
 2016-05-03 14:41:19 -04:00
AlasdairSwan
bd2859977d Merge pull request #12316 from edx/alasdair/ECOM-4315-edx.org-pattern-library-page-footer 
ECOM-4313 Styled footer on pattern library pages
 2016-05-03 14:12:30 -04:00
Malik Shahzad
d64e4b064c Add CourseDetails model to course_about template context. 2016-05-03 14:00:35 -04:00
Chris Rodriguez
0723b98283 AC-452 removing unnecessary and incorrect aria-label 2016-05-03 13:53:35 -04:00
Christina Roberts
ce53392ae5 Merge pull request #12335 from edx/christina/tnl-4193 
HTML-encode string values in keyword substitution.
 2016-05-03 13:45:31 -04:00
John Eskew
b5ab64505a Merge pull request #11331 from CredoReference/invalid-studio-user-permissions 
Invalid StudioPermissionsService object in API to show/save xblock settings in CMS
 2016-05-03 13:16:43 -04:00
Christina Roberts
04b80f0404 Merge pull request #12326 from edx/christina/delete-old-jasmine-jquery 
Jasmine-jquery was moved to npm.
 2016-05-03 12:54:30 -04:00
clrux
a5237c1b28 Merge pull request #12349 from edx/clrux/rc-2016-05-03-display_issue 
Overriding display table-cell on instructor dashboard
 2016-05-03 12:40:36 -04:00