Commit Graph

2914 Commits

Author SHA1 Message Date
asadiqbal
a4197eded5 WL-399 Course Details List Fields 2016-05-01 20:02:09 -04:00
Ibrahim
f7f281b65b WL-398 Add Course Background Image and Video Thumbnail Image Fields to Studio 2016-04-30 15:25:17 -04:00
Eric Fischer
955282f9c7 Merge pull request #12165 from edx/efischer/hide_timed_exams
TNL-4366 Hide Timed Exams
2016-04-29 09:28:16 -04:00
Usman Khalid
09594d6305 Merge pull request #12243 from edx/usman/tnl4416-spec-nesting
When using RequireJS load spec files one by one.
2016-04-29 17:09:57 +05:00
Ehtesham Kafeel
8cf89d3a8e Merge pull request #12289 from edx/mzfr/backbone-cleanup
Replace backbone-min.js to backbone.js
2016-04-29 16:53:02 +05:00
Usman Khalid
6c26715a14 Make hashes unique so that they do not conflict with hashes from module_edit_spec.coffee. 2016-04-29 15:54:48 +05:00
Usman Khalid
4d228199d1 When using RequireJS load spec files one by one.
Jasmine has a global stack for creating a tree of specs. We need to load
spec files one by one, otherwise some end up getting nested under others.
2016-04-29 15:54:47 +05:00
Eric Fischer
ea77c3ec42 Hide After Due setting for Timed Exams
TNL-4366
Changes in studio to allow the hide_after_due setting to be utilized.

Includes:
    -python changes to contentstore, where the data is stored.
    -refactoring of timed-examination-preference-editor.underscore, to add this
        setting and make the editor more accessible.
    -javascript changes to link the new setting to the correct data model.
    -sass updates to fix a11y issues on the editor modal.
    -addition of post-due visibility information to course outline in studio.
    -new tests: python, js, acceptance, and a11y
2016-04-28 13:27:19 -04:00
Ned Batchelder
861e8a0e9e Update translations (autogenerated message) 2016-04-28 14:55:52 +00:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
muhammad-ammar
4fd2a7d176 LMS fixes required to upgrade BackboneJS 2016-04-27 12:51:13 +05:00
Ehtesham
c87821446b CMS event fixes required to upgrade backbonejs 2016-04-27 12:48:46 +05:00
Ehtesham
59e1cafc02 CMS fixes required to upgrade backbonejs 2016-04-27 12:48:45 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm.
TNL-4335
2016-04-27 12:48:45 +05:00
Ibrahim Ahmed
8b014f2650 Merge pull request #12107 from edx/ibrahimahmed443/WL-309-new-fields-in-studio
WL-309 Add new text fields to Studio schedule and details settings page
2016-04-26 14:30:43 +05:00
Ibrahim
720bde1da9 add new text fields to schedule and details settings page 2016-04-25 23:44:13 -04:00
Awais Jibran
34b06932e5 Safe tempaltes 2016-04-25 16:30:09 +05:00
Ehtesham
8603026795 making preprocessor files path absolute to have coverage reporter include file only once 2016-04-22 19:09:35 +05:00
Ehtesham
3507792b78 coverage fixes 2016-04-22 19:09:35 +05:00
Usman Khalid
aee139ae61 Cancel modals in afterEach in UploadDialog spec. 2016-04-22 19:09:34 +05:00
Andy Armstrong
66b53926ff Fix spec initialization ordering 2016-04-22 19:09:34 +05:00
Usman Khalid
c728c9d30a Post-rebase fixes. 2016-04-22 19:09:33 +05:00
muzaffaryousaf
c0fef0b0e0 Js test fixes for cms and cms-squire. 2016-04-22 19:09:33 +05:00
muzaffaryousaf
db672f4631 Karma configurations for common, lms and cms.
TNL-4102
2016-04-22 19:09:27 +05:00
Ned Batchelder
2248bc6c9c Update translations (autogenerated message) 2016-04-21 10:30:10 +00:00
Ned Batchelder
a2b06dc617 Merge pull request #12159 from edx/ned/update-translations
Update translations (autogenerated message)
2016-04-15 09:41:51 -04:00
Renzo Lucioni
5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master
Manually merge release into master
2016-04-15 00:47:54 -04:00
Andy Armstrong
60fab86f01 Reconcile double reverts
Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.
2016-04-14 23:28:55 -04:00
Ned Batchelder
958795d5cb Update translations (autogenerated message) 2016-04-14 16:44:22 -04:00
Chris Rodriguez
df5520bdf9 Video player: adding Dragabilly to closed captions
* tests for dragging
* icon location reference updates
* pattern library usage
2016-04-14 15:29:38 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
2016-04-12 08:22:14 -04:00
Andy Armstrong
9290c52b33 Introduce Pattern Library test pages (take two)
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html

This is the second attempt to enable the Pattern Library. The
first attempt broke Django Templates and didn't work correctly
with right-to-left styling.
2016-04-11 00:45:31 -04:00
Andy Armstrong
807fed392b Merge pull request #12092 from edx/revert-uxpl-asset-changes-in-master
Revert "Introduce Pattern Library test pages"
2016-04-08 18:03:58 -04:00
Brian Jacobel
4671970f86 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 14:25:41 -04:00
Eric Fischer
29961736db Styling changes for Course Updates errors 2016-04-08 14:07:38 -04:00
Brian Jacobel
36917398c0 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 11:41:04 -04:00
Eric Fischer
2735fdc2d4 Course Updates date validation
TNL-4115. Previously, course updates (which are intended to be posted with
dates, for sorting in the LMS) could be authored in studio with a valid
date, nothing, or a random string as the "date" for the update. As there
is no validation for this in studio, everything succeeded with no warning.

However, the LMS has problems parsing some of these values, and barfs when
loaded by learners.

The fix does two big things:
- gracefully handles invalid dates in LMS. These updates are now treated as
having a date of today, for sorting purposes.
- turns on validation in studio. Now, it is not only impossible to enter
invalid dates in studio, but notifications will draw the course author's
eye if any invalid updates were previously saved.

Test additions for this commit:

Adds:
- unit test for LMS parsing
- Jasmine test to confirm invalid dates cannot be set by the user
    -also adds event to setAndValidate instead of using a global object
- fix for lettuce test
    -It is no longer valid to enter the string "January 1, 2013" as this test
    had been doing. Keyed-in entries must use MM/DD/YY format.
2016-04-08 11:37:40 -04:00
Chris Rodriguez
fbe6160461 LMS: updating transcript skip links 2016-04-07 12:18:08 -04:00
Ned Batchelder
88e3634d82 Update translations (autogenerated message) 2016-04-06 19:32:20 +00:00
Andy Armstrong
845e3708f3 Introduce Pattern Library test pages
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html
2016-04-05 09:22:14 -04:00
Brian Jacobel
24990272b1 Do not set up underscore.string globally. 2016-04-04 10:18:44 -04:00
Andy Armstrong
db62db295c Upgrade Underscore.string
FEDX-117
2016-04-04 10:18:43 -04:00
Ned Batchelder
38a9ace7bf Update translations (autogenerated message) 2016-03-30 19:35:49 +00:00
Carol Tong
84e88ebaaa Merge pull request #11969 from edx/carol/DOC-2216
DOC-2216: Modify message text when Adv Settings saved
2016-03-29 17:11:55 -04:00
Carol Tong
a33e703910 Modify message text when Adv Settings saved 2016-03-29 16:12:00 -04:00
Christina Roberts
1fa1faeee5 Merge pull request #11903 from edx/christina/cohort-template-cleanup
Perform escaping in the templates.
2016-03-28 16:25:28 -04:00
cahrens
39dc8a5915 Perform esacaping in the templates.
Use new best practices.
2016-03-28 15:05:40 -04:00
Zia Fazal
a796b56314 saleem-latif/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
saleem-latif: Update Theme storages to work with Caching, Pipeline and collectstatic
saleem-latif: Incorporate feedback changes
mattdrayer: Pylint violation fix
mattdrayer: Fix broken pavelib test
2016-03-28 14:57:01 -04:00
Andy Armstrong
6dd09a89cf Fix issues with Underscore in the asset pipeline
FEDX-121

The previous approach for handling NPM assets was
to symlink them into the static directory. This appeared
to cause trouble with the asset pipeline where the files
in question were not installed and then old versions were
picked up instead.

This change instead copies NPM libraries to a new
static directory so that the pipeline can consume them
as with any other file. This new directory is added to
.gitignore so that the files don't get accidentally
checked in.
2016-03-25 10:02:38 -04:00