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

35294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
srpearce
b9ccff7549 Merge pull request #11557 from edx/sylvia/DOC-2692-2 
Update screenshot for Help modal on Pages page
 2016-02-16 13:37:11 -05:00
Simon Chen
3fa62a6ff6 Merge pull request #11416 from edx/schen/ECOM-3177 
ECOM-3177 fix flaky js tests on dashboard.TrackEvents
 2016-02-16 12:45:22 -05:00
Kelketek
ddd7b61734 Merge pull request #11364 from edx/kelketek/drag-and-drop 
Add Drag-and-drop XBlock to requirements.
 2016-02-16 10:46:31 -06:00
Sylvia Pearce
a858bb9b0f Update screenshot for Help modal on Pages page 2016-02-16 11:41:46 -05:00
srpearce
b68beea4df Merge pull request #11508 from edx/sylvia/DOC-2692 
Update help text for Pages page in Studio to reflect Courseware-Course etc change
 2016-02-16 11:12:04 -05:00
Simon Chen
4b8a737168 Merge pull request #11553 from edx/schen/ECOM-3640 
ECOM-3640 add a new info log message on program certificate task to mark successful task completion
 2016-02-16 10:58:38 -05:00
Simon Chen
f6fc711cb6 ECOM-3177 fix the flaky js test by doing dependency injection 2016-02-16 15:58:23 +00:00
Toby Lawrence
9654449302 Merge pull request #11465 from edx/perf/speed-up-courseware-tests 
Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
 2016-02-16 10:06:53 -05:00
Simon Chen
2f595c111f ECOM-3640 add a new info log message on program certificate task to mark successful task completion 2016-02-16 14:48:55 +00:00
Awais Jibran
31853d49cc Merge pull request #11495 from edx/aj/tnl4115-improve-log-get-course-section 
Use Course ID in logging an exception
 2016-02-16 18:56:50 +05:00
Zia Fazal
57af11c0f0 Merge pull request #11548 from edx/ziafazal/fix-get-template-path 
WL-320: fixed get_template_path to work with absolute path also
 2016-02-16 18:47:45 +05:00
Toby Lawrence
49d3a7d35d More quality fixes. 2016-02-16 07:58:33 -05:00
Saleem Latif
cd101d5dec Merge pull request #11494 from edx/saleem-latif/WL-307 
WL-307: correct FAVICON_PATH setting for comprehensive theming
 2016-02-16 14:39:13 +05:00
Zia Fazal
6cd265751a fixed get_template_path to work with absolute path also 
fixed quality violation

skipped test in CMS

changes after feedback from mattd
 2016-02-16 11:52:19 +05:00
Toby Lawrence
ead2f0477b Quality fixes. 2016-02-15 21:18:53 -05:00
Jonathan Piacenti
97593f1966 Add Drag-and-drop XBlock to requirements. 2016-02-15 16:28:34 -06:00
Sven Marnach
8280e224f5 Merge pull request #11433 from open-craft/smarnach/studio-add-xblock 
Pass DOM element, not jQuery object to XBlock initialisation.
 2016-02-15 17:24:10 +01:00
Saleem Latif
75f17ecc8e correct FAVICON_PATH setting for comprehensive theming 2016-02-15 17:13:19 +05:00
Peter Fogg
5e9577bf43 Merge pull request #11535 from edx/peter-fogg/add-lettuce-cache 
Add accidentally deleted lettuce DB cache.
 2016-02-12 16:22:44 -05:00
Christina Roberts
36fc6162f2 Merge pull request #11534 from edx/christina/jquery-npm 
Install underscore from npm.
 2016-02-12 16:05:30 -05:00
Jim Abramson
a052a304a7 Merge pull request #11539 from edx/jsa/fix-retry-comment 
adjust comment about program certification retry
 2016-02-12 15:53:28 -05:00
Jim Abramson
f71e7cac93 adjust comment about program certification retry 2016-02-12 14:59:25 -05:00
Gabe Mulley
fcfb0f4a3c Merge pull request #11522 from edx/gabe/remove-ga-fields 
copy event on write
 2016-02-12 14:34:29 -05:00
Jim Abramson
fb3a09e68e Merge pull request #11520 from edx/jsa/ecom-3638 
Specify high priority queue for credentials generation task.
 2016-02-12 14:29:49 -05:00
Peter Fogg
b6ca05d939 Add accidentally deleted lettuce DB cache. 2016-02-12 14:16:54 -05:00
Ben Patterson
526e174846 Merge pull request #11510 from edx/benp/TE-1194-example 
TE-1194 update for test_teams.
 2016-02-12 14:01:46 -05:00
cahrens
c69226841d Install underscore from npm. 
FEDX-47
 2016-02-12 13:45:41 -05:00
Andy Armstrong
b46648eebf Merge pull request #11528 from edx/andya/add-js-monitoring-package 
Add monitoring version of package.json
 2016-02-12 13:40:07 -05:00
jsa
46ad8a3399 specify routing / queue for program credentials task. 
ECOM-3638
 2016-02-12 13:25:52 -05:00
jsa
8a620640c2 Disable credentials-related settings/tests under cms. 2016-02-12 13:25:44 -05:00
Andy Armstrong
7a6495ce2f Add monitoring version of package.json 2016-02-12 12:40:01 -05:00
Renzo Lucioni
4c79aba087 Merge pull request #11527 from edx/renzo/unclosed-p-tag 
Close unclosed p tag
 2016-02-12 12:15:27 -05:00
Kevin Falcone
4037b16af6 Merge pull request #11519 from edx/jibsheet/document-nose-breakpoints-twice 
Copy this doc up from the bok_choy tests.
 2016-02-12 11:41:22 -05:00
wajeeha-khalid
7a9fea0236 Merge pull request #11450 from edx/jia/MA-1985 
MA-1985 add analytics event to thread/comment vote
 2016-02-12 21:13:45 +05:00
Usman Khalid
1a66726a50 Merge pull request #11531 from edx/usman/deprecate-randomize 
Add Randomize XBlock to DEPRECATED_BLOCK_TYPES.
 2016-02-12 20:55:11 +05:00
Kevin Falcone
21b75f83aa Copy this doc up from the bok_choy tests. 
It's just as relevant to unit tests and I wish I had seen it earlier.

Stress the transient nature of this debugging step.
 2016-02-12 10:27:03 -05:00
Awais Jibran
5be6d31384 Use Course ID in logging an exception 
TNL-4115
 2016-02-12 20:10:59 +05:00
Usman Khalid
ec6a786400 Add Randomize XBlock to DEPRECATED_BLOCK_TYPES. 2016-02-12 19:54:41 +05:00
Eric Fischer
406066ca51 Merge pull request #11525 from edx/efischer/fix_global_message 
Fix config_model admin view
 2016-02-12 08:55:45 -05:00
Eric Fischer
6394238004 Exclude Reverse Foreign Keys from list_display 
These types of fields do not need to be included, and attempting
to do so causes everything to break.
 2016-02-12 08:54:25 -05:00
Gabe Mulley
239c3822a4 copy event on write 2016-02-12 06:27:53 -05:00
raeeschachar
04ca0af54c Merge pull request #11500 from edx/raees/chrome-bok-choy-test-stores-speed-for-multiple 
Fixed test_video_component_stores_speed_correctly_for_multiple_videos…
 2016-02-12 11:22:07 +05:00
Renzo Lucioni
60a3029d8b Close unclosed p tag 2016-02-11 22:18:02 -05:00
Andy Armstrong
756c8a4662 Merge pull request #11521 from edx/andya/fix-afontgarde-loading 
Fix bug with loading AFontGarde
 2016-02-11 21:33:20 -05:00
Ned Batchelder
462d0c04de Merge pull request #11524 from edx/ned/merge-dogwood-to-master 
Merge Dogwood to master
 2016-02-11 17:25:30 -05:00
Ned Batchelder
d8b9dec51e Update this command for Django 1.8 2016-02-11 15:39:35 -05:00
Ned Batchelder
432a40f035 Update post_cohort_management_fix to Django 1.8 2016-02-11 15:39:35 -05:00
Jesse Zoldak
794cecec13 Merge pull request #11517 from edx/clintonb/package-uninstall-fix 
Fixed package uninstall for django-oauth2-provider
 2016-02-11 15:25:27 -05:00
Peter Fogg
9b5b7837b5 Merge pull request #11516 from edx/peter-fogg/course-full-logging 
Better error logging for full courses during enrollment.
 2016-02-11 14:04:28 -05:00
Andy Armstrong
2ec7c17a45 Fix bug with loading AFontGarde 
The code isn't ready to start using AFontGarde from
the Pattern Library yet, so I've reverted the code back
to loading the copies from the vendor library.
 2016-02-11 13:52:50 -05:00