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

2724 Commits

Author SHA1 Message Date
Ali Mohammad
54f62a85f6 Merge pull request #8224 from Stanford-Online/kluo/course-creation-after-deletion 
Allow course creation after deletion at same URL
 2015-06-16 11:24:50 -04:00
Matt Drayer
5d2ef56b68 Merge pull request #8520 from edx/ziafazal/SOL-978 
remove in-memory files
 2015-06-16 10:29:26 -04:00
Zia Fazal
ed434c55d1 remove in-memory files 
no need to create zero by in memory images

added contents to test upload files
 2015-06-16 14:14:15 +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
Calen Pennington
9821323946 Merge pull request #8504 from cpennington/bdero/ccx-query-tests 
A version of #8260 that is consistent on jenkins and locally
 2015-06-15 11:51:33 -04:00
Brandon DeRosier
5c6ccc8f0b Add CCX SQL query/mongo read tests 2015-06-15 09:50:44 -04:00
Adam Palay
b199a72c62 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
 2015-06-12 16:22:06 -04:00
Diana Huang
a41d9a5491 Prevent duplication of tabs with different names. 2015-06-12 13:39:51 -04:00
Ben Patterson
4b6e2f4880 Merge pull request #8471 from edx/benp/flaky-cms-component-jun2015 
Fix flaky lettuce test. TNL-1452
 2015-06-12 12:28:38 -04:00
Ben Patterson
d96b581485 Fix flaky lettuce test. TNL-1452 2015-06-12 10:32:28 -04:00
Waheed Ahmed
36d321c4e3 Merge pull request #8496 from edx/waheed/plat674-improve-test-with-ddt 
Specified number of mongo and split calls in xblock outline handler test with ddt.
 2015-06-12 19:14:41 +05:00
Waheed Ahmed
4323109cad Specified number of mongo and split calls in xblock outline handler test with ddt. 
PLAT-674
 2015-06-12 17:17:59 +05:00
Syed Hassan Raza
c9778a5f57 add name param check_transcripts 2015-06-12 16:34:45 +05:00
zubair-arbi
3204c8b3fe show credit eligibility requirements in studio 
ECOM-1591
 2015-06-12 13:19:57 +05:00
Edward Zarecor
c12c5c926d fixing post-release merge conflicts with DKH 2015-06-10 16:56:21 -04:00
Waheed Ahmed
b328c0dcdc Fixed slow transaction on xblock outline handler. 
TNL-2425
 2015-06-10 21:03:52 +05:00
Syed Hassan Raza
ecc3473d36 transcript name param url 2015-06-09 20:04:16 +05:00
Awais Jibran
3cd48e4d61 Merge pull request #8317 from edx/aj/plat643-cms-export-command-export-to-wrong-place 
Fixed cms course export using management command.
 2015-06-09 18:59:03 +05:00
Awais Jibran
3e6670d1a4 PLAT-643 
Fixed cms course export
 2015-06-09 11:19:46 +05:00
Diana Huang
cddd387beb Merge pull request #8367 from edx/diana/merge-course-view-and-tab 
Refactor and merge CourseViewType and CourseTab.
 2015-06-08 16:08:27 -04:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab. 
TNL-2321
 2015-06-08 15:18:39 -04:00
Sarina Canelake
c9796b83a9 Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors 
Use Django 1.4 @ensure_csrf_cookie method PLAT-664
 2015-06-08 11:44:25 -04:00
Matt Drayer
3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns 2015-06-06 23:15:17 -04:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Adam
ef5cd63cf2 Merge pull request #8345 from edx/adam/time-imports 
time how long imports take in datadog
 2015-06-05 13:52:55 -04:00
Awais Jibran
c1807c66d6 Merge pull request #8216 from edx/aj/tnl2159-studio-grade-range-bug 
Unconsistant view in Overall Grade Range
 2015-06-04 15:48:23 +05:00
Waheed Ahmed
c0f4c26e06 Fixed wiki pointing to old course's wiki in rerun courses. 
TNL-2314
 2015-06-04 14:36:30 +05:00
Adam Palay
67b56ae859 time how long imports take in datadog 2015-06-03 15:06:01 -04:00
dino-cikatic
099be9e7e3 Merge pull request #8229 from edx/dcikatic/SOL-536 
Dcikatic/sol 536 [WIP]
 2015-06-03 13:55:42 +02:00
Davorin Sego
d3aa9dfd87 SOL-536 Experiment-Aware content search 2015-06-03 12:47:45 +02:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00
Awais Jibran
a2fc4bd216 Overall Grade Range in Grading does not show consistant view when grades are removed 
TNL2159
 2015-06-02 20:15:19 +05:00
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -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
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
Kevin Luo
760bda1c58 Allow course creation after deletion at same URL 
After deleting a course, creating one with the same URL did not
work because its mapping is not removed from the modulestore. This
fix adds a more robust check to see if a course with the URL
actually exists.
 2015-05-27 21:04:07 -07:00
Ben Patterson
176770efad Revert "Enable PyContracts during tests" 
This reverts commit 4312c0e763.
 2015-05-22 15:05:11 -04:00
Calen Pennington
a2cbd16680 Merge pull request #7789 from cpennington/wrap-csm 
Wrap access to CSM (inside FieldDataCache) to use the new interface
 2015-05-20 16:11:07 -04:00
Calen Pennington
4312c0e763 Enable PyContracts during tests 2015-05-20 15:07:18 -04:00
David Baumgold
8fbaa66d33 Make courseware licenses show up in Studio XBlock previews 2015-05-18 14:35:40 -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
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
Ned Batchelder
7c704f3959 Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py 2015-05-14 16:03:50 -04:00
Davorin Sego
a455d9d50a SOL-495 Cohort-Aware content search 2015-05-14 14:07:42 -04:00
Adam
4a8cd270a1 Merge pull request #7988 from edx/shr/bug/PLAT-612-video-component-missing-tests 
edx-val-Fix VAL error on re-import
 2015-05-11 13:25:43 -04:00
Syed Hassan Raza
103fa38860 edx-val-Fix VAL error on re-import 2015-05-11 20:00:55 +05:00
Awais Jibran
5e91c37b4e Configuration error on course re-run 
TNL 2098
 2015-05-11 16:19:21 +05:00
Adam
58b34e1cc4 Merge pull request #7974 from edx/merge-release-to-master 
Merge release to master
 2015-05-08 14:24:14 -04:00