Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,451 Commits 1 Branch 0 Tags
c87821446be56eb85d2b7041982c1069af31aaca
Commit Graph

6860 Commits

Author SHA1 Message Date
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
Awais Jibran
b4e8086397 Merge pull request #12049 from edx/aj/safe-templates 
Safe templates
 2016-04-26 09:40:31 +05:00
Ibrahim
720bde1da9 add new text fields to schedule and details settings page 2016-04-25 23:44:13 -04:00
Andy Armstrong
fe88402982 Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials 2016-04-25 16:51:25 -04:00
Andy Armstrong
56d003e47e Merge pull request #12219 from stvstnfrd/staticfiles/cms 
Remove LMS_ROOT / static from cms/common.py
 2016-04-25 16:50:29 -04:00
clrux
8e347f4078 Merge pull request #12101 from edx/clrux/ac-342-tweaking-skip-links 
AC-342 sending skip links to single main, relevant
 2016-04-25 11:36:26 -04:00
AlasdairSwan
a9971ef2ba FEDX-118 Adding header to test page 2016-04-25 10:56:28 -04:00
Chris Rodriguez
2a23757fbc Sending skip links to single main, making more relevant 2016-04-25 10:00:45 -04:00
Awais Jibran
34b06932e5 Safe tempaltes 2016-04-25 16:30:09 +05:00
J. Clifford Dyer
001874c42e Update seq_* to edx.ui.lms.sequence.* format 
seq_next, seq_prev, and seq_goto events are all renamed, and maintain
legacy compatibility.

This PR also introduces new EventTransformer framework to shim events
based on name prefix.

MA-2221
 2016-04-22 13:38:41 -04: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
Edward Zarecor
9db6b04f2c Merge pull request #11983 from edx/e0d/cookie-updates 
Updating cookies settings
 2016-04-22 07:25:09 -04:00
David Adams
a79da7e77b Remove LMS_ROOT / static from cms/common.py 2016-04-21 10:15:00 -07:00
attiyaIshaque
fb83cd71f1 Merge pull request #12051 from edx/attiya/safe-templates 
Safe Templates
 2016-04-21 19:06:53 +05:00
attiyaishaque
002ad84d4d Safe Templates 2016-04-21 17:55:29 +05:00
Ned Batchelder
2248bc6c9c Update translations (autogenerated message) 2016-04-21 10:30:10 +00:00
Adam
96cbc7c50f Merge pull request #12202 from edx/adam/fix-pre-1900-course-setting-date 
fix issue with pre-1900 course setting dates (TNL-4397)
 2016-04-20 11:38:41 -04:00
Adam Palay
26377a5732 fix issue with pre-1900 course setting dates (TNL-4397) 2016-04-20 10:44:13 -04:00
Dmitry Viskov
1836065754 Dynamic values for the selectboxes with tags (tags are stored in the database tables) 2016-04-20 16:07:32 +03:00
Ayub khan
0becea942f Merge pull request #12144 from Ayub-Khan/SUST-35-course_key_from_string_or_404 
SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404
 2016-04-19 18:44:13 +05:00
Ayub-khan
66f52ba6e9 -fixed Tests. 2016-04-19 16:04:39 +05:00
Ayub-khan
e687f1e754 -Adressed all comments 2016-04-18 11:57:31 +05:00
attiyaishaque
4c15dd93ba Course export page will not be opened for course id that does not belong to any course. 2016-04-18 09:12:40 +05:00
Calen Pennington
33af47a72a Merge pull request #11841 from CredoReference/copy_question_should_also_copy_tags 
Duplicate item in Studio should also duplicate related xblock aside
 2016-04-15 12:34:25 -04: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
Ayub-khan
ef70d017c8 -fixed failing tests 
-Adressed all comments
 2016-04-15 15:40:21 +05: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
Ayub-khan
d8464dbfb0 -changed method name from "from_string_or_404" to "course_key_from_string_or_404". 
-Updated method "course_key_from_string_or_404" to raise message too.
-Wrote tests for "course_key_from_string_or_404" when exception message is given.
-Modified existing methods to use "ddt.data".
-Used Splunk logs to find exectly where we were getting "Invalid Key Error"
-Updated Views where we were getting "Invalid Key Error" in splunk logs.
-Wrote tests for those View End points where we were getting "Invalid Key Error"
 2016-04-14 15:57:39 +05:00
Omar Khan
6fc4b38ea0 Disallow free verified course modes 
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
 2016-04-12 18:06:16 -07:00
Matt Drayer
40c5c47791 Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder." 
This reverts commit 266f593d2d.
 2016-04-12 16:22:34 -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
Clinton Blackburn
d6ba8839bf Stripping auth querystring from S3 URLs 
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
 2016-04-11 12:20:37 -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
Eric Fischer
08c3a13f5e Merge pull request #11968 from edx/efischer/refactor_date_utils 
Course Updates date validation
 2016-04-08 15:23:00 -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