Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
38,484 Commits 1 Branch 0 Tags
0853e485fd0bb962b06bfce3b890afc822c95021
Commit Graph

1161 Commits

Author SHA1 Message Date
Ned Batchelder
caa7b472b9 Update translations (autogenerated message) 2016-09-01 11:24:52 +00:00
Ned Batchelder
c55dcc3080 Update translations (autogenerated message) 2016-08-25 13:57:01 +00:00
Ned Batchelder
411219aac8 Update translations (autogenerated message) 2016-08-18 17:05:20 +00:00
Asad Iqbal
1a179289ab Merge pull request #13220 from edx/asadiqbal08/OLIVE-75 
OLIVE-75 - CourseID Term not rendering correctly.
 2016-08-15 19:19:06 +05:00
asadiqbal
1e938162db OLIVE-75 - CourseID Term not rendering correctly 2016-08-15 17:48:25 +05:00
Ned Batchelder
8ee9fcd8b2 Update translations (autogenerated message) 2016-08-11 16:00:22 +00:00
Mushtaq Ali
95b16dba4d Merge pull request #13183 from edx/mushtaq/maintenance 
Maintenance app RequireJS
 2016-08-09 23:52:01 +05:00
Mushtaq Ali
fb2f9948e1 Fix dynamic load RequireJs issue on Maintenance Dashboard 2016-08-09 13:48:20 +00:00
Mushtaq Ali
abb6af9789 Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-08-09 18:16:13 +05:00
Brian Jacobel
d43e915dab Run eslint autofixer on /cms 2016-08-08 15:04:06 -04:00
Brian Jacobel
c7042c4879 Merge pull request #13159 from edx/bjacobel/jshint-directives-to-eslint 
JSHint directives to ESLint (WIP)
 2016-08-04 17:11:56 -04:00
Brian Jacobel
a32fd27d60 Replace JSHint ignore directives with ESLint ones 2016-08-04 16:22:59 -04:00
Ned Batchelder
02f378a6ff Update translations (autogenerated message) 2016-08-04 18:25:47 +00:00
Ned Batchelder
7a0d764ef3 Update translations (autogenerated message) 2016-08-04 17:42:48 +00:00
Renzo Lucioni
b540968457 Updates to facilitate program category casing changes 
The LMS continues to expect lowercased category slugs, while the Studio program creator now uses correctly cased slugs. Programs should be updated before this is released. Part of ECOM-5018.
 2016-07-26 16:28:41 -04:00
Ned Batchelder
eaece533a9 Update translations (autogenerated message) 2016-07-22 09:28:15 -04:00
Christina Roberts
467bc55d27 Merge pull request #12950 from edx/christina/studio-support-levels 
Studio support level of components/xblocks
 2016-07-21 17:13:58 -04:00
Simon Chen
d27bec6111 ECOM-4906 Add the program editor fix to allow creation of Micromasters programs (#13064) 2016-07-21 16:51:07 -04:00
cahrens
d4cc7b8ffd Support level support for Studio xblock creation. 
TNL-4670
 2016-07-21 15:44:59 -04:00
Eric Fischer
35ae67b530 New CMS visibility settings (#12940) 
TNL-4906 Subsections now use radio buttons, to allow for "hide after due" as a
visibility option. Also, all tabs have been consolidated to "Basic" and
"Advanced", and visibility options have moved there.

Documentation links are updated to assist course authors with the new
visibility options. Tests have also been updated, and the changes suggested
in TNL-4951 are included.
 2016-07-20 19:58:51 -04:00
Andy Armstrong
51bb4d4e00 Merge pull request #12795 from eduNEXT/fmo/coffee_to_js_cms_main 
Convert cms/coffee/src/main to js
 2016-07-20 15:16:48 -04:00
Simon Chen
1d768cde7a ECOM-4904 Move the program editor backbone app to Studio (#12962) 2016-07-19 19:09:51 -04:00
Felipe Montoya
c32b30ba94 Relocating inside the cms namespace 
Addressing feedback
 2016-07-18 18:07:35 -05:00
Ned Batchelder
49f8f4d2e9 Update translations (autogenerated message) 2016-07-15 00:08:25 +00:00
Ned Batchelder
9132b7d555 Update translations (autogenerated message) 2016-07-07 21:02:43 -04:00
Ned Batchelder
1cb07a911c Update translations (autogenerated message) 2016-06-30 18:31:37 -04:00
Ned Batchelder
3b863de459 Update translations (autogenerated message) 2016-06-30 18:31:37 -04:00
Felipe Montoya
27d4e4bdc2 Compiling cms/coffee/src/main into a js file and fixing the references 
Linting
 2016-06-23 16:43:18 -05:00
Felipe Montoya
df1d4ea8fc Moving the files using git mv 2016-06-23 12:41:28 -05:00
Ned Batchelder
dd9139374f Update translations (autogenerated message) 2016-06-23 15:29:59 +00:00
Felipe Montoya
82db66d945 Converting the module_edit coffee file to a js file 
Converting to js and fixing references

Linting the generated code
 2016-06-22 15:49:48 -05:00
Andy Armstrong
d462c73fd8 Use the UI Toolkit's spec helpers. 2016-06-21 10:16:00 -04:00
Andy Armstrong
fff88151d2 Convert XBlock runtime code to JavaScript 2016-06-19 12:55:20 -04:00
Andy Armstrong
df399de186 Merge pull request #12781 from eduNEXT/fmo/coffee_to_js_tabs 
Converting views/tabs.coffee in the cms to js
 2016-06-17 12:56:49 -07:00
Felipe Montoya
43ea4e21bb Converting views/tabs.coffee in the cms to js 
Linting the compiled file
 2016-06-16 18:35:34 -07:00
Ned Batchelder
25c195d48a Update translations (autogenerated message) 2016-06-16 14:48:20 +00:00
Ned Batchelder
78f2d9e1eb Update translations (autogenerated message) 
Update translations (autogenerated message)
 2016-06-09 12:00:04 -04:00
ssemenova
c1f793172f change icon tags from i to span 
TNL-4692
 2016-06-07 10:52:00 -04:00
Ned Batchelder
64828c48c8 Update translations (autogenerated message) 2016-06-02 14:36:45 +00:00
Christina Roberts
98fcc4ff9e Merge pull request #12578 from edx/christina/tnl-4561 
Christina/tnl 4561
 2016-05-31 11:06:48 -04:00
cahrens
292cd93131 Focus seems to be flaky when running tests. 
TNL-4561
 2016-05-28 22:03:35 -04:00
Ehtesham
b31ba9d041 upgrade Pagingcollection to edx-ui-toolkit's PagingCollection 2016-05-27 04:35:44 +05:00
Ned Batchelder
10f7c9bb2f Update translations (autogenerated message) 2016-05-26 15:57:37 +00:00
Brian Jacobel
f4bede6c5b Fix library load paths (incl. jquery.scrollTo) 
Simplify paths in karma_cms_squire require paths
 2016-05-24 16:53:59 -04:00
Brian Jacobel
e433aa4e32 Remove this focus test, it's impossible to get it to pass in all envs without breaking something else 2016-05-24 16:53:58 -04:00
Brian Jacobel
4f0aee3f2d Fix unit and acceptance tests broken in upgrade (squashed) 
Fix syntax error in selectors

.attr() now returns a string (though it can still be passed an integer)

Fixes checkbox test failures

Remove remaining references to jquery.min (in wrong folder)

$.ajax now returns 422 if type is json and body is not JSON, e.g. ''

Substitute prop for attr

Remove references to jquery.min, add jquery.migrate (again)

"Fix" jquery karma config

This wasn't suppoed to survive the merge

This throws an error when called with an 'undefined' error

Fix Karma warning about [re|un]loading the window

Fix path for jquery in cms-squire tests

Move jasmine.clock.uninstall() to afterEach so it runs even on failure

Fix test failing due to timezone issues

Do the timeout before the window scrolling (so handler will not be _.throttled)

Fix an alert() triggered by window.onBeforeUnload while testing in Chrome
 2016-05-24 16:53:57 -04:00
cahrens
665f983c99 Tweak focus/blur functions for JQuery upgrade. 
Fix incorrectly scoped selector.
 2016-05-24 16:53:42 -04:00
cahrens
4ba07bf7a4 Assorted test and dependency fixes to cms-squire and cms 
isRejected is deprecated.

Actually serve the slick library in LMS jasmine tests

customwmd doesn't need to wait for DOM ready event

... In order to define a class and extend the Markdown class.
 2016-05-24 16:53:34 -04:00
Daniel Friedman
15f148141f Upgrade jQuery 1.7.2 to 2.2.0 
FEDX-25
 2016-05-24 16:52:50 -04:00
Ned Batchelder
6c60f73124 Update translations (autogenerated message) 2016-05-19 15:01:26 +00:00