Commit Graph

959 Commits

Author SHA1 Message Date
Sarina Canelake
1775dd5365 Merge pull request #7315 from edx/db/creative-commons
Allow custom licensing for course content
2015-05-18 15:36:50 -04:00
AlasdairSwan
d1df7b1556 Merge pull request #7986 from edx/alasdair/ECOM-1547-footer-2015
Alasdair/ecom 1547 footer 2015
2015-05-18 14:55:06 -04:00
Sarina Canelake
ca64c665cc Default course license to All Rights Reserved
Clicking on conflicting option box unchecks all conflicts
LMS: Clicking license text should bring to new window
updated styles to reflect html reuse inside of xblock edit modal area.

Add ARIA attributes to license for a11y

Gracefully handle re-selecting of selected license
2015-05-18 14:37:32 -04:00
David Baumgold
a3887e951c Courseware license (Creative Commons): FED
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
2015-05-18 14:36:04 -04:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -04:00
AlasdairSwan
f81d88e394 ECOM-1547 created new template and Sass file for new footer. Wrapped it in a feature flag and updated previously named footer-edx-new.html to footer-edx-v2.html to better track/name updates to the footer going forward.
ECOM-1547 removed data-updated attributes from body
ECOM-1548 added JS file that inits analytics event listener and makes ajax call to API to get footer and HTML and add it to the DOM
ECOM-1547 code review cleanup
ECOM-1547 rebase and Sass appraoch update after @talbs the IE9 killer slayed the mighty beast.
ECOM-1547 updated file names and added comments in light of @talbs review of PR
ECOM-1547 update to social media link styles and nav link order
ECOM-1547 updated SOCIAL_MEDIA_FOOTER_NAMES if ENABLE_FOOTER_V3 is true
ECOM-1547 added translations to screenreader text
ECOM-1547 fixed test and renamed files in line with @talbs's pending PR
ECOM-1547 cleaned up file naming
2015-05-18 13:43:07 -04:00
David Baumgold
ffd5c1fcd8 Merge pull request #8071 from edx/db/remove-sample-feature-flag
The SAMPLE feature flag is not used anywhere
2015-05-18 11:20:58 -04:00
Brian Talbot
11ca11a411 Merge pull request #8035 from edx/talbs/sass+css-file-names
LMS/Studio: Sync Up Sass/CSS/Pipeline Names
2015-05-18 10:43:17 -04:00
Martyn James
20a32a7e4f Merge pull request #8043 from edx/dcikatic/SOL-487-filter-staff-view-rebase
Dcikatic/sol 487 filter staff view (rebase against master)
2015-05-18 10:40:57 -04:00
Andy Armstrong
358aa7754b Add "Teams Configuration" advanced setting 2015-05-15 14:13:41 -04:00
David Baumgold
2e1534d75a The SAMPLE feature flag is not used anywhere 2015-05-15 12:49:04 -04:00
Davorin Sego
a455d9d50a SOL-495 Cohort-Aware content search 2015-05-14 14:07:42 -04:00
Brian Talbot
c043e8dcf7 LMS: removing now unnecessary IE-specific _ie.scss Sass partial
* since IE9 and below are formally not supported any longer
* since most of the CSS rules are for UI that has been removed or that is supported by modern browsers
2015-05-14 14:04:53 -04:00
Brian Talbot
2899885711 LMS: renaming Sass/CSS files for consistency and clarity 2015-05-14 13:14:54 -04:00
Awais Qureshi
b8efb5423a Merge pull request #7951 from edx/awais786/ECOM-1531-fake-page-ssecure
ECOM-1531 adding the fake-page for softwar secure.
2015-05-13 12:02:32 +05:00
Brian Talbot
898012518b LMS: removing manual Sass/CSS extend files needed for IE9 and below 2015-05-12 10:36:32 -04:00
Awais
58b7e7fb33 ECOM-1531 adding the fake-page for softwar secure. 2015-05-12 14:21:49 +05:00
Martyn James
2f398559ae Merge pull request #7845 from edx/mjevtic/SOL-776
(SOL-776)(SOL-740)(SOL-532) Prerequisites for course discovery feature
2015-05-07 14:05:38 -04:00
Gabe Mulley
411df0ae3a Merge pull request #7802 from edx/gabe/user-track
Make user_track use eventtracking
2015-05-07 08:43:21 -04:00
marjev
8107073c58 (SOL-776)(SOL-740)(SOL-532) Added setting flags for COURSE DISCOVERY feature; Exposed course search input as well as the course result page; Added flag for limiting the number of course cards on the homepage; 2015-05-07 08:57:04 +02:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
muzaffaryousaf
f5de0bbf43 Enable unit preview by default.
TNL-1261
2015-05-06 12:40:44 +05:00
Greg Price
ebff94af3f Add discussion topic API
This is the first stage of the new Discussion API.

JIRA: MA-604
2015-04-30 14:25:05 -04:00
Feanil Patel
934207bf03 Fixes to get it working with master. 2015-04-28 10:23:08 -04:00
Martyn James
1eeca4d81f Merge pull request #7522 from edx/feature/dashboard-search
Feature/dashboard search
2015-04-27 09:46:35 -04:00
Davorin Sego
71feb068e3 Dashboard search feature 2015-04-24 09:45:12 -04:00
zubair-arbi
05068f1b94 fix reverification link in lms
ECOM-1437
2015-04-23 17:58:33 +05:00
Aamir
a900e1f7ec Merge pull request #7660 from edx/aamir-khan/ECOM-1396/checkoint-name-field
Aamir khan/ecom 1396/checkoint name field
2015-04-23 12:06:09 +05:00
Andy Armstrong
4f5a2e1bc8 Fix default profile images for edx.org
TNL-2054
2015-04-22 16:33:00 -04:00
aamir-khan
d606ae97fb ECOM-1396: added the function to check is the xblock published 2015-04-22 19:23:33 +05:00
Muhammad Ammar
7babb3efed Merge pull request #7696 from edx/ammar/tnl1740-add-simplified-and-traditional-chinese-transcript-language-options
Add Simplified and Traditional Chinese as Transcript language options
2015-04-21 18:28:17 +05:00
cahrens
39688e337b Set default profile visibility to all_users. 2015-04-17 17:23:14 -04:00
Andy Armstrong
6c3b94d249 Bump User API and Profile Images API to v1
TNL-1669
2015-04-17 17:23:13 -04:00
Daniel Friedman
23f02d9492 Configurations for filesystem and s3 backends.
TNL-1789
2015-04-17 17:23:13 -04:00
Andy Armstrong
c898e4137b Add default profile images
TNL-1796
2015-04-17 17:23:12 -04:00
jsa
46b63164a0 Implement profile_image upload and remove endpoints
TNL-1537

Co-Authored-By: Andy Armstrong <andya@edx.org>
Co-Authored-By: cahrens <christina@edx.org>
2015-04-17 17:23:12 -04:00
Daniel Friedman
97e44ed20f Implement language proficiencies.
TNL-1488
2015-04-17 17:23:12 -04:00
Andy Armstrong
650a9a9b85 Implement parental controls for user profiles
TNL-1606
2015-04-17 17:23:11 -04:00
Daniel Friedman
6f6fdbfb5f Integrate profile images into Accounts API
TNL-1545
2015-04-17 17:23:11 -04:00
Adam
2745398dc0 Merge pull request #7729 from edx/adam/different-queue-small-emails
Adam/different queue small emails
2015-04-17 16:02:11 -04:00
Adam Palay
f37c7934f0 reset queue reference in aws.py, use low priority queue (TNL-1591) (TNL-2003) 2015-04-16 15:41:16 -04:00
Braden MacDonald
513591f409 Bump problem builder version to latest edx-release build 2015-04-16 11:56:50 -07:00
Adam Palay
afb2dae631 Revert "Revert "use different queue for smaller emails (TNL-1591)""
This reverts commit 228cca4e38ec79f5cbb54098c788ab9556f602e2.
2015-04-15 12:03:23 -04:00
muhammad-ammar
cec4bb3101 Add Simplified and Traditional Chinese as Transcript language options
TNL-1740
2015-04-15 15:38:42 +05:00
Marko Jevtić
a3aecb2014 Merge pull request #7548 from edx/mjevtic/SOL-531
(SOL-531)(SOL-532) Course Cards update on the homepage;
2015-04-14 16:17:34 +02:00
marjev
939a3672d4 (SOL-531)(SOL-532)Course Cards update; A link to course discovery page has been added to the OpenEdX homepage 2015-04-14 14:58:06 +02:00
Matt Drayer
ffe30da7a5 Add course-specific URL overrides for social sharing icons on student dashboard
- sharing enabled for custom URLs only if URL actually specified
2015-04-13 13:14:43 -04:00
David Ormsbee
03c3bbb379 Merge pull request #6636 from jazkarta/feature-pocs
MIT CCx (was Personal Online Courses)
2015-04-11 11:15:43 -04:00
cewing
7f691e4a92 MIT: CCX. Rename POC to CCX
Final official name is Custom Courses for EdX (CCX), rename all code to remove previous name.

Rename the FEATURE constant used to identify this feature

Rename the middleware for the CCX change

rename the constant used for storing the current poc id on the session.

rename the _PocContext threading local

rename the override provider in all places where it is referenced

`PersonalOnlineCoursesOverrideProvider` -> `CustomCoursesForEdxOverrideProvider`

generally rename symbols from overrides.py to replace `poc` with `ccx` where possible without changing model names or attributes

rename more symbols from poc to ccx
rename util functions from app utils module

general symbol renaming poc -> ccx in views.py and related url changes

Rename the coach role wherever it is used.

reword poc_coach to ccx_coach

UI rename

replace POC with CCX globally

template context variable renamed

rename poc_ to ccx_ in urls and all related locations (views, js, scss etc)

remove pocs migrations

Final massive renaming, including models.  Re-built migration.

cleaning up a few tailing references

Fix reference typo in schedule template JS

undo modifications made on the fly in test setup to ensure that our tests are properly isolated from the rest of the system tests.

Fixes jazkarta/edx-platform#38

Clean up some leftover strings and comments

fixing more strings and comments in python files

fix a naming error in the schedule tab that was causing problems in deleting courseware items.

Fixes jazkarta/edx-platform#36

updating tests and utility code to match changes in infrastructure from latest rebase
2015-04-10 23:30:25 -04:00
Carlos de la Guardia
bb7eed58db MIT: CCX. Refactore using backbone.js 2015-04-10 23:28:00 -04:00