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

2383 Commits

Author SHA1 Message Date
Ibrahim
b3411074af show Save and Cancel button when admin change Instructor image asset path from Studio schedule and details page 2016-05-14 16:25:44 -04:00
Ibrahim
2a2560e30e fix the issue where images do not appear when set through asset linkin Studio scheduls and details page 2016-05-13 16:22:44 -04:00
Ned Batchelder
1ef94b7694 Update translations (autogenerated message) 2016-05-12 14:48:44 +00:00
Douglas Hall
24b4d5d29f Remove course details field character limits 2016-05-10 13:23:04 -04:00
Ibrahim
a51143fe38 fix height of delete button to match the attached text field 2016-05-09 16:58:01 +05:00
Usman Khalid
a2dadeaaf3 Added some documentation to Karma configuration files. 2016-05-05 22:42:04 +05:00
Usman Khalid
667a9b9ae6 Moved common files into karma.common.conf.js. 2016-05-05 22:42:04 +05:00
Usman Khalid
6ed935383b Remove xmodule_js prefix from paths of edx-ui-toolkit, edx-pattern-library and common. 2016-05-05 22:42:03 +05:00
Usman Khalid
2839a42e0c Moved jasmine addons to common/js/spec_helpers. 2016-05-05 22:42:02 +05:00
Usman Khalid
84412ef8ea Exclude translation files from coverage tracking. 2016-05-05 22:42:02 +05:00
Usman Khalid
15acec2054 Simplify paths patterns in karma config files. 
Files which are loaded via RequireJs do not need to be individually
declared in karma config files. If we give karma directories,
it will serve all the files in them.
 2016-05-05 22:42:00 +05:00
Usman Khalid
713c79e0aa Set included=false by default because we want to move towards RequireJs. 2016-05-05 22:39:59 +05:00
Usman Khalid
855fdbd387 Moved all logic from karma config files to karma.common.conf.js. 
The config files just declare lists of files.
 2016-05-05 22:38:34 +05:00
Usman Khalid
ecf233c1b4 Keep karma config file docs only in karma.common.conf.js. Duplicate stuff tends to get out of sync. 2016-05-05 22:35:54 +05:00
Usman Khalid
bb7b29b308 Deleted js-test-tool config files. 2016-05-05 22:35:53 +05:00
Ned Batchelder
190c2ffc99 Update translations (autogenerated message) 2016-05-05 15:52:25 +00:00
Usman Khalid
d99978870a Merge pull request #12312 from edx/usman/tnl4398-fix-tests 
Re-enable spec files that were disabled during the Jasmine upgrade.
 2016-05-04 17:16:58 +05:00
Usman Khalid
78af4100cd Fixes for course updates date validation. 
If the first date the user selects is invalid it is not set on the
model. This is because jQuery datepicker's getDate returns the
current date when an invalid value is put in the field and the
model's initial value is also the current date. So always update
the date.
 2016-05-03 15:41:22 +05:00
Usman Khalid
8fef4148a5 Re-enabled videolist_spec, message_manager_spec and file_uploader_spec. 2016-05-02 20:54:59 +05:00
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