Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

780 Commits

Author SHA1 Message Date
Andy Armstrong
c28003b50d Merge pull request #8416 from edx/andya/common-list-component 
Create a common paginated list view
 2015-06-15 14:55:20 -04:00
Andy Armstrong
1689004189 Create a common paginated list view 
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
 2015-06-15 13:51:09 -04:00
Will Daly
2175b5baa4 Merge pull request #8509 from edx/will/deprecate-course-about-v0 
Deprecate course details API v0
 2015-06-15 13:14:32 -04:00
Sarina Canelake
09425c3d8f Merge pull request #8402 from edx/sarina/annotate-middleware 
Fix dark lang and django.middleware.locale behaviors LOC-72 LOC-85
 2015-06-15 11:29:15 -04:00
Sven Marnach
52f56ddd37 Add feature flag to allow hiding the discussion tab for individual courses. 2015-06-14 20:36:45 +02:00
Sarina Canelake
d312d0e152 Port django.middleware.locale.LocaleMiddleware from Django 1.8 2015-06-12 18:14:24 -04:00
Will Daly
c31a510607 Deprecate course details API v0 2015-06-12 15:59:20 -04:00
zubair-arbi
3204c8b3fe show credit eligibility requirements in studio 
ECOM-1591
 2015-06-12 13:19:57 +05:00
Will Daly
9d60b0e07a Merge pull request #8444 from edx/will/credit-provider-part-two 
Credit provider integration Python API (Part 2 of 3)
 2015-06-11 17:38:42 -04:00
Will Daly
8988aa1c9e Credit provider integration Python API 
* Add end-point for initiating a request for credit from a provider.
* Add an end-point for a provider to update the status of a request (approved / denied).
 2015-06-11 11:34:25 -04:00
David Baumgold
77facf13ba Merge pull request #8419 from edx/sass-output-to-css-dir 
Compile Sass to CSS dirs, move Creative Commons CSS into Sass
 2015-06-09 17:00:15 -04:00
Will Daly
36d1eb22cd Merge pull request #8338 from edx/will/credit-provider-integration 
Credit provider integration Python API (Part 1 of 3)
 2015-06-09 11:12:51 -04:00
David Baumgold
a7c710a0de Moved Creative Commons CSS into Sass 
Also reconfigured paver to compile Sass into CSS directories
 2015-06-09 10:55:20 -04:00
Will Daly
e5a62aaaba Credit provider integration Python API 
* Add Python API functions for creating and updating requests for credit.
* Add Django models and migrations for tracking credit requests and status.
 2015-06-08 13:30:32 -04:00
Xavier Antoviaque
b32629d62f Default to filestorage when S3 isn't configured (aws.py) 
Also moves the default icons to the badges subfolder to avoid storage conflicts.
 2015-06-08 11:30:16 +02:00
Matt Drayer
3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns 2015-06-06 23:15:17 -04:00
Matt Drayer
af7277cdd9 New Feature: Certificates Web View 
- SOL-465: Initial implementation of certificates web view and signatories (names/titles)

- SOL-718 Close button is working properly

- SOL-801 Backbone Signatories Modeling

- SOL-803 Underscore template: Editor (Add)

- SOL-802 Signatories: Underscore template - Details

- SOL-804 Signatories: Underscore template: Editor (Edit)

- Add signatory delete Django view

- SOL-805 Signatory editor (Delete)

- Add Coffeescript router

- SOL-716 Jasmine Tests

- Added missing minified JS library

- client side validation of signatory fields

- SOL-390 signatories names

- Remove obsolete extends Sass files

- input maxlength limiting for signatory information

- SOL-389: Course title override

- SOL-466: Add capability to upload digitized signatures in Studio

- ziafazal: fixed css for upload signature image

- ziafazal: completed deletion of signature images

- UX-1741: Add initial static rendering/styling for Open edX web certs
  * creating new global static dir
  * adding static version of edX UX pattern library assets
  * adding web certificates static assets
  * adding static (+abstracted) web certificates rendering
  * creating two tiers of rendering (base + distinguished)
  * providing sample assets for certificate rendering
  * supporting RTL layouts
  * adding certifcates assests to edX static asset pipeline
  * temporarily hiding the mozilla open badges share action
  * wiring print button to print view/page
  * fixup! addressing conflict artifact in valid cert template
  * fixup! adding missing %hd-subsection sass extend + components comment clean up
  * fixup! correcting pattern library .hd-4 font-weight value

- SOL-468 Linked Student View for Web View Credential

- SOL-467: Add capability to upload organization logos for certificates

- SOL-391 / SOL-387: Signatory related info (assets) in certificates web view

- kelketek: Fixes for static asset collection in certificate HTML view.

- SOL-398 Web View: Public Access

- mattdrayer: Post-merge branch stabilization

- catong: Initial changes to Studio template and Help config file

- ziafazal: Branch stabilizations

- SOL-387: Display organization logo on LMS web view

- talbs/mattdrayer: Branch Stabilizations

- talbs: converting backpack action to use a button HTML element

- talbs: revising placeholder assets + their rendering in cert view

- mattdrayer: Username web view wireup

- SOL-386 Certificate Mode Previews

- SOL-905: Make organization logo and signatory signature uneditable

- SOL-922: Improve test coverage

- SOL-765: Add LinkedIn sharing

- [marco] temporary styling adjustment to account for smaller linkedin share image / fake button

- SOL-921: Address hardcoded template items

- SOL-927: Deleting certificate should delete org logo image also
  * updated invalid template
  * removed hr
  * fix invalid certificate error

- clrux: Add i18n to certificate templates and partials

- mattdrayer: Pylint violations

- SOL-920 Certificate Activation/Deactivation

- mattdrayer: Added LMS support

- SOL-932: Fix preview mode support in certificate view

- SOL-934: Fixed bug reported and broken tests

- SOL-935 removed the 'valid' word from web view title

- talbs: RTL support updates/fixes
  * revising certificate type icon/name vertical alignment
  * removing unused older certificate template
  * revising styling for message/banner actions
  * abstracting accomplishment type to use course mode + adding in honor/verified-specific placeholders

- mattdrayer: JSHint violations
 2015-06-01 19:48:04 -04:00
Alexander Kryklia
ef8f391888 Merge pull request #7825 from edx/alex/video_bumper 
Alex/video bumper
 2015-06-01 23:07:05 +03:00
Davorin Sego
176b1c8962 Course Discovery - Language Filtering 
Filter by Language:
Designation for course language(s) in Studio
allows for filtering of courses based on their language in the sidebar
Reuses active filter view UI/IA from find courses page on edx.org
view for clearing individual or all filters, as with edx.org filtering
 2015-06-01 10:45:51 +02:00
Alexander Kryklia
4c7bfb44dd Add Video Bumper. 
Fix n-click behaviour on poster.
Fix unit tests.
Fix handler for non_en lang for bumper.
Add more tests.
Fix docstrings.
Fix pep8.
Fix static redirection with bumper.
Fix button in IE11.
Add video_bumper field in bok_choy.

Fix pylink violations.

Update docstrings and some clean up.

Rename edx_video_id in bumper tests.

Fix too long lines in help text.

Address ui comments.

Fix bumper events.

Refactor bumper-transcripts code, fix bugs, address comments.
Squashed commits:
Fix download transcript button.
[74e0c8c] Fix quality
[a759f33] Fix error, when sub contains extension.
[b30755c] Revert "Add video files to host for transcripts."

This reverts commit cf8a96bf84346e17b6ad57ad4cc6a27d7a9118cd.
[36f038a] Add video files to host for transcripts.
[23f1655] Fix pep8 and pyling issues.
[0f1f9d2] Update acceptance test.
[765a27d] Wait for ajax in captions.
[8ae72a3] Fix logic.
[063450f] Fix unit tests.
[d1075fc] Fix handlers tests.
[25d31ad] Update bumper_utils.
[cb5f9df] Remove maxDiff.
[8738b1a] Code cleanup.
[87dbcb7] Fix issues with transcripts.
[ec899de] Fix transcripts in serializers.
[444b1fc] Fix transcripts typo.
[d524cb5] Fix bumper.
[f62cf22] Fix video mongo tests.
[8f1b55a] Fix dispatches.
[53bc308] Add more fixes.
[d5e3723] Fix test_video_handlers and rename the method.
[93efc23] Fix mobile tests.
[740e2ae] Fix pep8 and pylint.
[47cfb66] Address comments, add fixes.
[4e499d9] Add fixes.
[8353553] Add improvements.

Updated dispatch values)
.

Use ddt in bumper handler tests.

Move common metadata to single place.

Fix style.

Update docstring.

Fix poster button.

Improve bumper events.

Fix test after rebase.

Address comments.

Download transcript: use def video lang, not bump.

Renamed date_last_view_bumper to bumper_last_view_date.

Rename do_not_show_again_bumper to bumper_...

Address comments.

Fix tests for download for en lang.

Fix bumper logic.

Update strings.

Update resizer.

Remove resizer.

Fix unit tests.

Add tests.

Fix bumper events.

Clean up tests.

Fix pylint violations.

Fix pep8 and pylint violations.

Update docs and method names.

Update events.

Make /static/ prefix a must.

Fix wrong code.
 2015-05-31 14:45:31 +03:00
Aamir
4a14ec694f Merge pull request #8122 from edx/aamir-khan/ECOM-1590-populate-requirements-table-new 
ECOM-1590: added the min_grade as a requirements
 2015-05-28 15:04:31 +05:00
aamir-khan
97b5ff7e8b ECOM-1590: added the min_grade as a requirements 2015-05-28 12:28:38 +05:00
Sarina Canelake
7d96174f6b Fully enable licensing on devstack 2015-05-21 18:50:47 -04:00
Awais
2599445190 ECOM-1590 adding models for credit eligibility. 2015-05-20 14:18:37 +05:00
Christina Roberts
0dbdbfef20 Merge pull request #8080 from edx/track/ga-label-shim 
Add course_id as label for Google Analytics events
 2015-05-19 09:20:07 -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
Gabe Mulley
63b0378520 Ensure GA events have a course label if available 2015-05-18 13:25:12 -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
Andy Armstrong
358aa7754b Add "Teams Configuration" advanced setting 2015-05-15 14:13:41 -04:00
Brian Talbot
d09d0a2c36 Studio: renaming Sass/CSS files for consistency and clarity 2015-05-14 13:14:54 -04:00
Brian Talbot
5e27bd229a Studio: removing manual Sass/CSS extend files needed for IE9 and below 2015-05-12 10:36:32 -04:00
Feanil Patel
6289b190d9 Fix pep8 and pylint. 2015-05-08 09:01:50 -04:00
Feanil Patel
4cc39abfa4 Update celery config for config files I missed. 2015-05-08 09:01:50 -04:00
Feanil Patel
27223ae80f Load celery for CMS as well. 2015-05-08 09:01:48 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
cahrens
5fe384ca2b Add tags plugin. 
TNL-1924
 2015-05-04 16:00:18 -04:00
Nimisha Asthagiri
b124485ed6 MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse 2015-04-18 15:30:19 -04:00
muhammad-ammar
cfcb38c498 Update user message strings 2015-04-17 17:23:19 -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
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
Eugeny Kolpakov
b1765d0a69 Merge pull request #7641 from open-craft/eugeny/problem-type-search 
Capa problem type filtering using edx-search
 2015-04-17 18:43:04 +03:00
Braden MacDonald
513591f409 Bump problem builder version to latest edx-release build 2015-04-16 11:56:50 -07:00
E. Kolpakov
bd891c21db Added setting to enable/disable library indexing + moved is_index_enabled into search indexer classes 
Added task and signal to fire library reindex
 2015-04-14 12:40:05 +03: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
Davorin Sego
e37a98d1be Indexing moved to celery task. Reorganised indexing to always allow for full course reindex. Indexing code no longer needs to be in common, because it is triggered by signal instead of being called.g 2015-04-10 14:30:19 -04:00
louyihua
9d3b65282e Fix error when STUDIO_NAME uses non-ascii characters 
The replacement strings need to be unicode, so that when STUDIO_NAME contains non-ascii characters python can handle it correctly without raising exceptions.
Also, the value of STUDIO_SHORT_NAME can be read from cms.env.json.
 2015-03-28 21:47:59 +08:00
Ned Batchelder
a84735057d Move common/lib/*.py to openedx/core/lib 
This makes these files importable, and puts them into the new best guess
as to where files should live.
 2015-03-23 12:40:24 -04:00