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

302 Commits

Author SHA1 Message Date
Christina Roberts
c484dc6cbb Merge pull request #1255 from edx/db/requirejs-load-jquery 
load jquery in requirejs deps
 2013-10-08 09:28:50 -07:00
David Baumgold
eb07e0bd58 Remove unused setup_require.coffee file 2013-10-08 12:06:18 -04:00
David Baumgold
f1a104754e load jquery in requirejs deps 2013-10-08 11:40:42 -04:00
cahrens
9d31924793 Re-enable tests that were failing on Jenkins. 2013-10-08 10:23:47 -04:00
Christina Roberts
009deb7da8 Merge pull request #1236 from edx/christina/course-updates-bug 
Don't remove course update when clicking outside modal.
 2013-10-08 07:20:10 -07:00
cahrens
1de194aaa4 Use RequireJS for test dependencies, and use domReady. 2013-10-08 09:55:15 -04:00
cahrens
328640452f Comment out tests that fail in Jenkins. 2013-10-07 17:18:40 -04:00
cahrens
61cfb91218 Cleanup to drag and drop implementation. 
Also includes RequireJS changes.

Fixes bugs:
STUD-755, STUD-152, STUD-700, STUD-699
 2013-10-07 17:18:40 -04:00
Brian Talbot
14b4b6a24e Adds in minimally revised drag and drop styling. 
Add CSS classes and fix drop destination bug.
 2013-10-07 17:17:46 -04:00
Peter Fogg
85be9b4265 Jasmine tests for drag/drop. 2013-10-07 17:17:46 -04:00
Peter Fogg
cbd066da04 Address PR comments. 
Remove unused variables; some changes to match existing BDD spec for
drag/drop (expand-on-hover timeout and dropping with mouse outside of
element); bugfix for section expand; some code cleanup; update and
re-enable acceptance test.
 2013-10-07 17:17:46 -04:00
cahrens
aa6022d505 Don't remove course update when clicking outside modal. 
Fixes bug STUD-822.
 2013-10-07 15:25:16 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
cahrens
2cbdaaee7d Updates based on switching to checkbox for locking. 2013-09-25 17:29:47 -04:00
cahrens
c64e04d8c2 Add the ability to lock assets. 2013-09-25 17:29:27 -04:00
cahrens
d11c92d799 Set the URL on the collection instead of the model. 2013-09-20 10:44:55 -04:00
cahrens
01d7d48f8f Create backbone models/views for assets. 
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
 2013-09-20 10:44:54 -04:00
cahrens
e65e9b53a3 Minor cleanup. 2013-09-17 14:40:15 -04:00
David Baumgold
543438816d Merge pull request #875 from edx/db/translate-hellip 
Translate …
 2013-09-10 06:58:47 -07:00
Don Mitchell
fc131fa841 Add InheritanceKVS and standardize inherited attr patterns 2013-09-06 12:19:50 -04:00
David Baumgold
fd8b375f3a Translated … 2013-09-06 09:17:19 -04:00
cahrens
a061c7ece7 Rewriting of links for Course Updates and Course Handouts. 
STUD-669.
 2013-08-29 14:35:16 -04:00
Will Daly
23805ca52f Studio JS fixture files no longer need individual symlinks 2013-08-29 07:50:28 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Peter Fogg
75b76b37ef Add delete confirmation to static pages. 
We used to use a regular JS `confirm`; this makes the UI consistent
with the rest of Studio.
 2013-08-22 16:41:07 -04:00
Peter Fogg
7fc8fcde7b Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod 
Allow grace periods of > 24 hours.
 2013-08-21 13:00:15 -07:00
Peter Fogg
eb5b6cc6ea Allow grace periods of > 24 hours. 2013-08-21 14:37:12 -04:00
Peter Fogg
b539a4cb94 Update copy to include PNGs, add tests, remove default MIME type. 2013-08-21 09:42:01 -04:00
Peter Fogg
f9aecb2778 Add support for PNGs as course images. 
Also change the file uploader to accept multiple file types.
 2013-08-21 09:42:00 -04:00
Peter Fogg
9632f4fed8 Address PR comments: 
- Internationalize upload errors.
- Move upload tests into their own files.
- Refactor upload dialog acceptance tests.
 2013-08-21 09:42:00 -04:00
Peter Fogg
ce1a13f32c Generalize file uploader. 
Previously the file upload dialog was PDF- and textbook-specific. The
changes are adding parameters to the FileUpload model for the file
type, and adding an onSuccess callback to the UploadDialog view. Also
moved upload-specific SASS into its own file.
 2013-08-21 09:42:00 -04:00
Will Daly
d1e0005f30 Merge pull request #622 from edx/will/fix-js-tests-using-number-input 
Failing JavaScript tests in Firefox
 2013-08-12 08:12:12 -07:00
Will Daly
4b738d4cc3 Refactored into helper method 2013-08-12 08:55:30 -04:00
Peter Fogg
cde8ee50d7 Fix jumping to the top of the page on unit delete. 2013-08-09 15:18:08 -04:00
Will Daly
9769f364e1 Updated tests to weaken "number" input field requirement, which 
isn't supported in Firefox.
 2013-08-09 12:10:53 -04:00
David Baumgold
6e784d606f Merge pull request #596 from edx/db/ff-subsection-datetime-bug 
Fix Firefox subsection datetime bug
 2013-08-07 09:25:17 -07:00
David Baumgold
a0123d3a27 Fixed Jasmine tests 2013-08-06 14:30:19 -04:00
Peter Fogg
9c84440501 PR comment cleanup. 2013-08-06 13:23:33 -04:00
Peter Fogg
08c5f955aa Unstyled prototype for new list editor design. 2013-08-06 13:23:33 -04:00
Peter Fogg
74b815274f Add a list view for metadata editor. 
This is to be used with VideoAlpha's functionality allowing a choice
of multiple HTML5 video sources.
 2013-08-06 13:23:33 -04:00
Alexander Kryklia
da4f295d00 Add TabsEditingDescriptor for VideoAlpha 
Updates comment
Make Model descriptor class property.
Fix tests
 2013-08-05 13:38:32 +03:00
David Baumgold
2ad78d949a Merge pull request #538 from edx/db/course-team-admin-grants 
Add error messaging to course team page
 2013-08-01 11:58:52 -07:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model 
Initialize on every page that has a context_course set
 2013-08-01 13:39:47 -04:00
Peter Fogg
8bd686d63c Show notification on component reorder. 2013-08-01 11:56:16 -04:00
Peter Fogg
e3e6fd2002 Remove commented-out code and add test. 2013-07-22 12:33:01 -04:00
Peter Fogg
925f0a5ee8 Remove @xhr.restore() to fix tests. 2013-07-22 11:37:09 -04:00
Brian Talbot
ec02a4f39f Studio: changed the copy and prompt type for unit + outline deletions 2013-07-22 11:37:09 -04:00
Peter Fogg
5029f460ec Use Backbone notifications for component delete. 2013-07-22 11:37:08 -04:00
Peter Fogg
9fe4cb734c Use Backbone notifications for course section delete. 2013-07-22 11:37:08 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00