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

657 Commits

Author SHA1 Message Date
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -05:00
Don Mitchell
17864353a5 Restful course settings 
STUD-946
STUD-947
 2013-11-22 10:55:35 -05:00
Christina Roberts
3f44ff2f4b Merge pull request #1675 from edx/christina/tab-new 
Convert tabs to use RESTful API
 2013-11-21 07:39:31 -08:00
cahrens
1b2be30c45 Convert tabs to RESTful URL. 
STUD-850
 2013-11-21 10:19:43 -05:00
zubair-arbi
df97df6fde Merge pull request #1606 from zubair-arbi/zub/bugfix/std293-coursehandout 
Show error on invalid html in course handout edit
 2013-11-21 01:53:08 -08:00
cahrens
f01b36b5d4 Test for i4x on returned pages. 
STUD-941
 2013-11-20 12:48:24 -05:00
Zubair Afzal
783e4b223f Show error on invalid html in course handout edit + Added tests 
STUD-293
 2013-11-20 17:33:07 +05:00
cahrens
a170c6f4e7 Change save_item and create_item to RESTful URL. 
Part of STUD-847.
 2013-11-14 11:03:31 -05:00
Don Mitchell
c20f3dbc8c Merge pull request #1569 from edx/dhm/restful_course 
restful course_info access
 2013-11-13 10:46:16 -08:00
Don Mitchell
99e7daf796 RESTful refactoring for course_info updates and handouts. 
html page and update access use 2 different urls
GET update can get an individual update
STUD-944
 2013-11-13 13:16:41 -05:00
Valera Rozuvan
bf9e525ef4 BLD-489: Fix JavaScript tests. 2013-11-12 17:39:29 +02:00
Gabe Mulley
c9b0568acc Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
 2013-11-12 08:41:42 -05:00
Valera Rozuvan
0ad53f608a Revert "BLD-408: Don't allow users to enter video url's in http." 
This reverts commit 6cb5c3900f.
 2013-11-08 20:32:22 +02:00
cahrens
16766a5ee9 Change delete_item to RESTful URL. 
Part of STUD-847.
 2013-11-06 13:49:24 -05:00
polesye
2628e4f182 Merge pull request #1512 from edx/anton/video-disallow-to-use-http-protocol 
Video Player: Disallow users to enter video url's in http.
 2013-10-30 23:17:39 -07:00
Don Mitchell
f41816637e RESTful refactoring of /course access continued 
Move index access into the url
Move course creation into the url
Add helper methods for testing to serialize json data and set accept header.
 2013-10-30 13:28:22 -04:00
polesye
6cb5c3900f BLD-408: Don't allow users to enter video url's in http. 2013-10-30 14:58:17 +02:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
Christina Roberts
b00d59edf1 Merge pull request #1354 from edx/christina/overview-modal 
Pull modal cover and date utils into their own files.
 2013-10-24 11:32:35 -07:00
cahrens
12488db015 Get rid of course_index shim. 2013-10-24 11:35:02 -04:00
cahrens
52f4f6afbc Pull modal cover and date utils into their own files. 
Move overview-specific functions into overview.js.
 2013-10-23 15:44:58 -04:00
Alexander Kryklia
2c90fd18f4 Rename IsoTime to RelativeTime. 2013-10-23 13:06:12 +03:00
polesye
28f229b7c9 Add comment. 2013-10-23 13:03:35 +03:00
polesye
8e86d7b589 Refactor js. 2013-10-23 13:01:23 +03:00
polesye
9dd6c56f9f Add isoTime js view. 2013-10-23 13:00:36 +03:00
Valera Rozuvan
ba5f337fdb Fix bug. Add validation to HTML5 sources field. 2013-10-23 11:52:22 +03:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
cahrens
00ebcf7fe7 Move index code into index.js. 2013-10-15 14:14:55 -04:00
Christina Roberts
8e45668a83 Merge pull request #1329 from edx/christina/import-cleanup 
Remove dead code and move import code into import.js.
 2013-10-15 11:11:30 -07:00
Christina Roberts
54498e15ae Merge pull request #1328 from edx/christina/toggle-sock 
Move sock JS code into its own file.
 2013-10-15 10:55:44 -07:00
cahrens
75071b6b8b Typo. 2013-10-15 13:26:47 -04:00
cahrens
5dd8e49179 Move import code into import.js. 2013-10-15 13:26:47 -04:00
cahrens
c53d86d684 Remove unreferenced code. 2013-10-15 13:26:47 -04:00
cahrens
6a7b88df4d Move sock JS code into its own file. 2013-10-15 12:59:22 -04:00
cahrens
32239bb743 Gid rid of toast message. 2013-10-15 12:52:58 -04:00
Christina Roberts
11142c7cbb Merge pull request #1300 from edx/christina/fix-rounding-error 
Grading rounding error.
 2013-10-11 07:33:26 -07:00
David Baumgold
3e9c09e097 Ensure that jQuery loads before any other JS dependency 2013-10-10 14:27:29 -04:00
cahrens
8c080b6fb6 Acceptance test for fixing rounding error on weight. 2013-10-10 12:02:21 -04:00
cahrens
3ed2fcbb31 Parse floats to ints in CourseGrader model. 
Fixes STUD-826.
 2013-10-10 12:02:21 -04:00
David Baumgold
6c2dbce434 grading.js depends on jquery.ui 2013-10-09 15:59:27 -04:00
cahrens
28dd142758 Only change the collapse/expand state on the first child. 
There are possibly children nested below that.
 2013-10-09 13:25:36 -04:00
Brian Talbot
bbe906f77f Studio: changes drag and drop container to new .wrapper-dnd on outline/subsection views 2013-10-08 17:24:00 -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
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
7640ade481 Fix not being able to expand an empty subsection. 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
Peter Fogg
1c9fbec94b CSS classes for drop targets. 2013-10-07 17:17:46 -04:00