Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1087 Commits

Author SHA1 Message Date
Clinton Blackburn
b5d6b210fd Merge pull request #9681 from edx/release 
Release 2015-09-09
 2015-09-09 12:38:15 -04:00
Bill DeRusha
49807ab6a5 Add search specific feature flag in front of search features 2015-09-08 17:13:30 -04:00
Gabe Mulley
ab6e76c19b Add in a comment describing the reasoning for the names 2015-09-08 16:35:41 -04:00
Gabe Mulley
c652cb2d1d Fix order of tracking backends 2015-09-07 19:53:37 -04:00
Andy Armstrong
fb19d32815 Don't package or optimize assets on devstack 2015-09-03 13:28:26 -04:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name. 
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
 2015-08-27 12:59:25 -04:00
Ned Batchelder
65a317951c Add a comment explaining what ADVANCED_COMPONENT_TYPES should be. 
While I'm in there, also fix the comment for ADVANCED_PROBLEM_TYPES.
 2015-08-27 07:38:19 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration 
Integration of Proctoring into the LMS
 2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Andy Armstrong
e845dda8b0 Enable teams and deprecate the advanced setting 2015-08-07 10:35:19 -04:00
Ned Batchelder
7a7a867e6a Fix Django Debug Toolbar circular imports 
There's an "explicit" way to configure Django Debug Toolbar that isn't
prone to circular import errors:

http://django-debug-toolbar.readthedocs.org/en/1.0/installation.html#explicit-setup

Do that.
 2015-07-29 16:18:38 -04:00
Muzaffar yousaf
35503ebda2 Merge pull request #8636 from edx/muzaffar/youtube-api-v3 
Using youtube api v3.0 instead of v2.0 to get the video's metadata.
 2015-07-24 20:02:48 +05:00
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration . 
TNL-2413
 2015-07-24 17:03:46 +05:00
Will Daly
fc9ed032ad Add in-course reverification to advanced components. 2015-07-23 14:02:48 -07:00
chrisndodge
5e195c8eeb Merge pull request #8962 from edx/cdodge/proctoring-studio 
Integrate timed and proctored exam authoring into Studio
 2015-07-23 15:53:17 -04:00
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Andy Armstrong
7b5f9b8009 Implement RequireJS Optimizer in the LMS 
TNL-2487
 2015-07-20 13:59:54 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Brandon DeRosier
2bfbda3c1e Revert "edX Course/Library Import/Export API" 
This reverts commit c94abd2705.
 2015-07-08 16:55:38 -04:00
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS. 
TNL-2305
 2015-07-03 20:58:40 +05:00
asadiqbal
57d5de5d14 asadiqbal08/SOL-766: Add Facebook sharing to certificate view 
* updated the flags for social media sharing
* added facebook feed ui to share public url
* update the condition logic
* update the code as per suggestion and added pick new style for share buttons
* update the css class reference
* update the bok-choy test
* updated description and some text touch-ups
* moved the JS related to facebook into separate location
* js formatting
* Add trailing comma per chrisndodge
* Add wait to fix flaky test...maybe
 2015-07-02 18:52:15 -04:00
Brandon DeRosier
c94abd2705 edX Course/Library Import/Export API 
This is a public, versioned, RESTful API for importing and
exporting full course content. The code was initially ripped from the
existing import/export API in the CMS contentstore djangoapp and wrapped
in Django Rest Framework view classes. It's a new djangoapp in
the openedx directory which is largely an abstraction off the CMS
Import/Export views.

This PR includes configuration changes. Most notably, Studio is
configured to serve the OAuth2 provider alongside the LMS.

This is the initial thread on the code list:
https://groups.google.com/forum/#!msg/edx-code/DmnHWmly25A/ZqjD1zb4o7oJ

And this thread contains another description of the changes:
https://groups.google.com/d/msg/edx-code/6dP9SEKsmqQ/Pvyn8fBDx68J

There are a numerous non-covered lines, all of which are missing
coverage in the CMS API this was ported from. They're mostly error
conditions, such as handling of multipart file upload errors.
 2015-07-02 15:32:00 -04:00
Sarina Canelake
4f991ebaab Merge pull request #8718 from open-craft/smarnach/add-poll-xblock 
Add the Poll XBlock to the requirements.
 2015-07-01 14:00:42 -04:00
Sven Marnach
e8398b571e Add the Poll XBlock to the requirements and ADVANCED_COMPONENT_TYPES. 2015-07-01 18:34:10 +02:00
Albert Liang
4b332bfcf0 Add missing comma to tuple 
Currently, Python implicitly concatenates two string entries located next to
each other because there is no comma separating them.  The code concatenates
"*.pyc" and "sass/*.scss", creating a single entry called "*.pycsass/*.scss".
 2015-06-30 14:02:07 -07:00
muhammad-ammar
b0eda4cac9 Display warning message on course outline in Studio when course contains deprecated features/components 
TNL-2303
 2015-06-30 13:26:18 +05:00
Sarina Canelake
df0c56dde3 Port django.middleware.locale.LocaleMiddleware from Django 1.8 2015-06-26 13:15:40 -04:00
Will Daly
754eb9af18 Merge pull request #8655 from edx/will/more-login-cookie-info 
User info cookie
 2015-06-26 07:34:07 -07:00
Nimisha Asthagiri
8b5e5c5910 Merge branch 'release' 2015-06-25 13:11:41 -04:00
Will Daly
5e86a64729 User info cookie 
* Add a new cookie for user information
* Make marketing cookie names configurable.
* Handle URL reversal when URLs don't exist (in Studio)
* Move cookie code from student/helpers.py into its own module.
 2015-06-24 09:44:50 -07:00
Kyle McCormick
1726c136fa MA-772 create app course_overviews for caching course metadata 2015-06-22 18:33:12 -04:00
Sarina Canelake
1e21945e22 Revert "Merge pull request #8402 from edx/sarina/annotate-middleware" 
This reverts commit 09425c3d8f, reversing
changes made to 410b9282af.
 2015-06-22 13:55:53 -04:00
Ahsan Ulhaq
6fdff766bc Credit eligibility requirements display on student progress page 
ECOM-1523
 2015-06-22 18:36:54 +05:00
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
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
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