Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
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
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
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
Calen Pennington
e97af55eec Add a nicer repr to AccessResponse objects 2016-05-04 14:51:31 -04:00
Calen Pennington
853bfe7a36 Add a TestCase mixin for enabling caches in tests 
By default, disable all caching in tests, to preserve test independence.
In order to enable caching, inherit from CacheSetupMixin, and specify
which cache configuration is needed.

[EV-32]
 2016-05-04 14:51:30 -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
Peter Fogg
bcde8e5588 Flesh out UI now that the backend is there. 2016-05-04 11:50:14 -04:00
Calen Pennington
18e1610043 Remove the create_user argument to setUp. 
Instead, use a class attribute to define test behavior. This allows for
easier addition of new mixins over time.
 2016-05-04 11:35:55 -04:00
Calen Pennington
39ff841d1f Don't pass arguments to setUp (for UrlResetMixin) 
The TestCase API doesn't accept arguments, so passing arguments for some
TestCase subclasses makes adding new inheritance/mixins tricky. Instead,
prefer configuration via class attributes for TestCases.
 2016-05-04 11:34:51 -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
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
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
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
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
cahrens
76545ef49c HTML-encode string values in keyword substitution. 
TNL-4193
 2016-05-03 12:36:44 -04:00
cahrens
f0f7cf4d33 Clean up HTML encoding. 2016-05-03 12:32:48 -04:00
Chris Rodriguez
433a9deff6 Overriding display table-cell on instructor dashboard 2016-05-03 11:50:28 -04:00
Nimisha Asthagiri
0b6da4cd5a Merge pull request #12267 from edx/tnl/refactor_courseware_index 
Refactor courseware index
 2016-05-03 11:22:17 -04:00
Chris Rodriguez
3b81e73e2e Removing nav_skip block from template 2016-05-03 11:18:41 -04:00
Tasawer
4a18ec8041 ECOM-3731 update browser new course area 2016-05-03 15:14:32 +00:00
AlasdairSwan
2c8f3c8046 Styled footer on pattern library pages 2016-05-03 10:32:35 -04:00
Christina Roberts
f0f0645007 Merge pull request #12278 from edx/christina/cohort-messages 
Add messaging when verified track content MVP is enabled.
 2016-05-03 10:14:15 -04:00
Nimisha Asthagiri
c6954902e3 Create courseware/views folder 2016-05-03 09:02:45 -04:00
Nimisha Asthagiri
2f581448da Refactor Courseware Index 
MA-2189
 2016-05-03 09:02:44 -04:00
cahrens
0f8b24523c Remove second page tag. 2016-05-02 16:56:52 -04:00
cahrens
9b28afb7bd Add messaging when verified track content MVP is enabled. 
TNL-4393
 2016-05-02 14:25:25 -04:00
AlasdairSwan
e894797ee9 ECOM-3968 updated program card link alt text 2016-05-02 13:09:31 -04:00
Usman Khalid
a6635bb884 Turn off global ajaxError handler in afterEach in teams tab factory specs. 2016-05-02 13:09:31 -04:00
Usman Khalid
d851b2c951 When using RequireJS load spec files one by one. 
Jasmine has a global stack for creating a tree of specs. We need to load
spec files one by one, otherwise some end up getting nested under others.
 2016-05-02 13:09:30 -04:00
Ned Batchelder
b125922e65 Update translations (autogenerated message) 2016-05-02 13:09:29 -04:00
Ben Patterson
e6493d609c Additional shard balancing changes for unit tests. 2016-05-02 13:09:28 -04:00
Ben Patterson
d76f50d93b Create a 3rd explicit shard for unit tests. 
More accurately, this creates a 4th shard because the
last shard is always the default.
 2016-05-02 13:09:27 -04:00
AlasdairSwan
afc5b47ebe Renamed 'programId' to use 'id' 2016-05-02 13:09:27 -04:00
Ayub khan
c601e9fc48 Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-05-02 13:09:27 -04:00
muzaffaryousaf
872d225921 Replace backbone-min to actual file. 2016-05-02 13:09:27 -04:00
Waheed Ahmed
2ec3bcd22e Added Kosovo in django country list. 
ECOM-4292
 2016-05-02 13:09:26 -04:00
Chris Rodriguez
8b068d9449 Removing the focus outline for the main container in LMS 2016-05-02 13:09:26 -04:00
AlasdairSwan
70fec21347 Adding program progress bar to program cards 2016-05-02 13:09:26 -04:00
Brian Jacobel
b98a361250 Use unminified picturefill in development 2016-05-02 13:09:26 -04:00