christopher lee
c42097b458
MA-318, change edx video id to video id
2015-04-13 13:31:37 -04: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
Jonathan Piacenti
51905f0cd5
Addressed notes for RCB duplication, removed management buttons from RCB container
2015-04-02 18:26:04 +00:00
marjev
29bceffcea
Fixed flaky test(s) - (SOL-336)
2015-03-27 14:48:36 +01:00
Matt Drayer
8107f803f5
Merge branch 'release'
2015-03-25 13:38:43 -04:00
Christine Lytwynec
5204fd6519
wait for both window.MathJax and window.MathJax.onReady
2015-03-24 11:03:09 -04:00
Eugeny Kolpakov
dadc78aabd
Merge pull request #7336 from open-craft/eugeny/course-team-to-backbone
...
Unified Course Team and Library Users page. Converted both to Backbone.
2015-03-24 17:06:38 +03:00
E. Kolpakov
9a56b800ee
Unified Course Team and Library Users page. Converted both to Backbone.
...
Converted lettuce Course Team page tests to bok choy
2015-03-24 12:09:19 +03:00
Greg Price
0f0ee6a394
Merge pull request #7455 from edx/aleffert/video_web_only
...
Add web-only setting to video module
2015-03-23 15:38:18 -04:00
Greg Price
438ce5f7a4
Add web-only setting to video module
...
This is needed for courses that license video content where the license
allows only for viewing on the web, not on mobile apps.
JIRA: MA-307
2015-03-23 14:45:17 -04:00
Usman Khalid
e07f45b5dd
Removed cohort_config from advanced settings page.
...
TNL-1258
2015-03-23 09:58:25 +05:00
Jonathan Piacenti
568acb56b0
Library setting for show/hide children previews + client-side code to toggle it.
2015-03-18 08:59:58 -05:00
Matt Drayer
16e63c9e1e
Added Certficates Web/HTML View
2015-03-13 12:16:13 -04:00
Kelketek
a7e1f9caf3
Merge pull request #7301 from open-craft/course-import-page-fix
...
Replace broken logic in import template with working logic in view.
2015-03-12 18:15:32 -05:00
Jonathan Piacenti
8c920b469c
Replace broken logic in import template with working logic in view.
2015-03-12 20:13:47 +00:00
Nimisha Asthagiri
8e5563d467
Do not show video_upload_pipeline advanced setting if the feature is disabled.
2015-03-11 17:58:32 -04:00
Kelketek
91642dce33
Merge pull request #7245 from open-craft/studio-home-test
...
Exfoliate flaky studio home test. (SOL-430)
2015-03-11 09:33:21 -05:00
Jonathan Piacenti
8ad4d081fb
Added library import and export via .tar.gz'd XML files.
2015-03-10 21:29:29 +00:00
Jonathan Piacenti
5aba2f0e6c
Exfoliate flaky studio home test.
2015-03-09 16:27:00 +00:00
Braden MacDonald
93e5a56d79
Show a select box when editing a library content block
2015-03-04 13:32:15 -08:00
Zia Fazal
e21ff20375
backend changes based on feedback
...
Conflicts:
lms/djangoapps/courseware/courses.py
lms/djangoapps/instructor_task/api.py
refined entrance exam student attempts reset
Quality improvements 1/16
added rescore, delete state and task history functionality
added unit tests for entrance exam reset attempts
added unit tests for re scoring of entrance exam and task history
improved test coverage
Got rid of pep violation
feedback changes and added jasmine test
added more jasmine tests for Javascript changes
added bok-choy tests for UI changes
replaced input containing <p> tags with <label>
Removed ee element assertions to avoid js error
Added call to super.setUp()
changes based on feedback on 2/18
Writing tests in JS instead of coffee script
commit related to skip entrance exam 2/13
fixed bad-continuation quality error
fixed broken bok-choy test
changes based on feedback on 2/18
added js tests and removed coffee script tests
fixed broken bok-choy and unit tests
changes left while rebasing
rephrase test titles
do not need these libs
changes based on feedback on 2/24
changes text which was left
Changes based on feedback on 3/3
2015-03-04 15:32:56 +05:00
muzaffaryousaf
a31e38416d
Adds content group "Delete" and "Usage" functionality to group configurations page on cms.
...
TNL-1185
2015-02-20 14:56:22 +05:00
Jesse Zoldak
405c92f4f4
Fix flaky library container test TE-745
2015-02-11 12:47:02 -05:00
Jesse Zoldak
07e0eee2bd
Fix flaky content library test
2015-02-06 14:59:31 -05:00
polesye
d02d3b7926
TNL-1299: Update default video.
2015-02-05 10:55:36 +02:00
Giulio Gratta
560ce55896
Add cosmetic price field to studio & logic
...
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-02-03 09:40:00 -08:00
Davorin Sego
e09d47b122
Courseware Search integration
2015-01-28 21:34:58 -05:00
Matt Drayer
9d2a0a4e9d
Merge pull request #6705 from edx/mattdrayer/update-milestones-hash
...
Bok Choy test now passes
2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a
Bok Choy test now passes
2015-01-28 17:37:49 -05:00
Matt Drayer
ce5c7948fa
Added field to FILTERED_LIST plus a new bokchoy test
2015-01-28 13:11:36 -05:00
Martyn James
9ac7176b8f
Merge pull request #6223 from edx/feature/SOL-20
...
Merge feature SOL-20
2015-01-16 12:54:45 -05:00
Martyn James
dcc8e95648
Implements SOL-20. Filtering for assets table by asset type
2015-01-16 12:53:24 -05:00
Matt Drayer
3c669e3838
New feature contribution: Entrance Exams
2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4
New pre-requisite course feature via milestones app
2015-01-15 15:17:38 -05:00
Frances Botsford
6398af715a
Make group config styles generic
2015-01-15 10:37:25 -05:00
cahrens
66375b8541
Bok choy test for editing of content groups on Group Configuration page.
2015-01-15 10:37:24 -05:00
Daniel Friedman
fff84928fa
Create and edit content groups in Studio
2015-01-15 10:37:24 -05:00
Andy Armstrong
21a9873757
Don't allow visibility editing in content libraries
2015-01-15 10:33:48 -05:00
Andy Armstrong
4fa33e25ed
Studio support for cohorted courseware
...
TNL-652
2015-01-15 10:33:45 -05:00
E. Kolpakov
195d5b57bc
pylint fixes
2015-01-12 09:58:51 -08:00
Matjaz Gregoric
ccc392893e
Update tests.
...
Most of the updates are related to the My Courses -> Studio Home change.
2015-01-12 13:41:45 +03:00
Braden MacDonald
55fb45fb24
Acceptance test
2015-01-12 13:41:02 +03:00
E. Kolpakov
2b45e10f34
Bok choy acceptance tests
2015-01-12 13:40:59 +03:00
Braden MacDonald
d38e69c69a
Acceptance & Jasmine tests for library permissions editor
2015-01-12 13:37:59 +03:00
Braden MacDonald
76b6d33b80
Refresh children automatically when library setting is changed
2015-01-12 13:37:57 +03:00
Braden MacDonald
e498872ab1
Move update link to the validation area
2015-01-12 13:37:57 +03:00
E. Kolpakov
d25673ec72
LibraryContent bok choy acceptance tests
2015-01-12 13:37:56 +03:00
Jonathan Piacenti
074e4cfa22
Addressed further review notes for Library Pagination
2015-01-12 13:37:56 +03:00
Jonathan Piacenti
ed3b972078
Added tests for Library pagination.
2015-01-12 13:37:55 +03:00
Braden MacDonald
3e0f08ebc2
Studio support for creating and editing libraries (PR 6046)
...
SOL-1, SOL-2, SOL-3
2015-01-12 13:37:50 +03:00