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

1737 Commits

Author SHA1 Message Date
Christina Roberts
d4082859f8 Merge pull request #1714 from edx/christina/fix-children 
The forcing of IDs to non-draft must happen in base.py instead of draft....
 2013-11-19 11:18:54 -08:00
cahrens
ed9a61e2d9 The forcing of IDs to non-draft must happen in base.py instead of draft.py. 
The draft.py solution only worked when the parent was also in the draft store.
 2013-11-19 12:08:29 -05:00
Mark Hoeber
4efafe4186 Merge pull request #1701 from edx/documentation/hoeber/stud-924 
Review all panel help text in Studio UI for Studio-924
 2013-11-19 08:22:36 -08:00
Mark Hoeber
f5ae957a91 Studio: Review all panel help copy 
Reviewed and updated all on-page panel help text in Studio for clarity,
consistency, and brevity.  Updated template HTML files to change text

STUD-924
 2013-11-19 10:35:17 -05:00
Will Daly
a2057273ca Fix for advanced settings failure 2013-11-19 10:34:22 -05:00
Sarina Canelake
bd8fce5a8a Change dummy locale to Esperanto 2013-11-19 10:28:02 -05:00
polesye
38163cf942 BLD-410: Add tests. 2013-11-19 14:37:14 +02:00
polesye
4b87237825 BLD-193: Add template for checkboxes to studio. 2013-11-18 09:50:53 +02:00
polesye
153bc25d8c BLD-502: Add improvements to Video player. 2013-11-15 18:12:51 +02:00
cahrens
569c86de74 Code review feedback. 2013-11-14 17:09:24 -05:00
cahrens
53a4016619 Utility method for converting string to bool. 2013-11-14 13:47:46 -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
Will Daly
dffbb8a37d Merge pull request #1667 from edx/will/really-fix-nav-test-issues 
Fix for advanced settings failure
 2013-11-14 07:22:48 -08:00
jsa
070ed1984c Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
 2013-11-14 09:24:52 -05:00
Will Daly
44dd3603eb Fix for advanced settings failure 2013-11-13 18:41:03 -05:00
Will Daly
a8f686ec6f Disabled test making external calls to YouTube 2013-11-13 16:30:05 -05:00
David Baumgold
e80da13934 Fix misspelled word in test name 2013-11-13 16:13:26 -05:00
polesye
281d9c80cc Revert: Allow any part of protocol name to be lowercase or uppercase. 2013-11-13 21:19:29 +02: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
Will Daly
2a6754b8a6 Disabled LaTeX acceptance test 2013-11-13 08:05:21 -05:00
Will Daly
12bae4b7a3 Fixed intermittent issue with course date acceptance test 2013-11-12 16:45:08 -05: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
Nick Parlante
58dccec570 Merge pull request #1603 from edx/nick/tab-edit 
Expand the edit_course_tabs help text
 2013-11-08 10:23:04 -08:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules 
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
 2013-11-08 11:08:48 -05:00
Calen Pennington
da26ae2529 Remove lms/lib from sys.path in favore of using it as the module lms.lib 2013-11-08 11:08:48 -05:00
Oleg Marshev
b19c982f8c Allow any part of protocol name to be lowercase or uppercase (BLD-496). 2013-11-07 15:25:20 +02:00
Nick Parlante
6122357191 Expand the edit_course_tabs help text 2013-11-06 16:39:44 -08:00
Christina Roberts
cd868efc22 Merge pull request #1580 from edx/christina/item 
Change delete_item to RESTful URL.
 2013-11-06 10:50:56 -08:00
cahrens
16766a5ee9 Change delete_item to RESTful URL. 
Part of STUD-847.
 2013-11-06 13:49:24 -05:00
Will Daly
85203e8134 Enabled course id clash command tests 2013-11-04 16:15:20 -05:00
Alexander Kryklia
b5bf4b7500 Enable latex problems via key in course.settings. 
BLD-426
 2013-11-04 12:13:23 +02:00
Brian Talbot
6541b45566 Merge pull request #1572 from edx/talbs/fix-studio-forgotpassword 
Studio: Fix - Forgot Password Modal
 2013-11-01 13:40:40 -07:00
Brian Talbot
8048a4b25b Studio: changes URL for password reset to direct to LMS login view 
STUD-689
 2013-11-01 16:37:08 -04:00
Christina Roberts
5de54dc5ca Merge pull request #1546 from edx/christina/export 
Make export URL restful.
 2013-11-01 13:24:40 -07:00
Brian Talbot
e41214b1ed Studio: revises the styling for the export view to sync with the import view's UI 2013-11-01 16:01:11 -04:00
Don Mitchell
32a6df0f9c Skipping new test until Jenkins mongo updated to >= 2.2 2013-11-01 14:24:01 -04:00
Don Mitchell
9cf318cec6 Course id clash command 2013-11-01 14:20:41 -04: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
cahrens
763ff9c818 Make export URL restful. 
STUD-846
 2013-10-30 15:24:42 -04: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
80c83f0b88 Merge pull request #1508 from edx/dhm/expect_json 
Change expect_json to put parsed json in new attr
 2013-10-29 14:02:32 -07:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
cahrens
a9d1d4eefc Convert import to new URL pattern. 2013-10-29 15:33:22 -04:00
Will Daly
d0f659d67d Merge pull request #1525 from edx/will/textbook-js-wait 
Added wait for JavaScript when navigating to textbook page
 2013-10-29 12:21:23 -07:00
Olivier Marquez
453e8f50fc Update tabs.py 2013-10-29 10:01:02 -04:00
Jay Zoldak
2d30c8b0ab Fix a couple pylint violations 2013-10-28 17:23:31 -04:00
Jay Zoldak
35d58b98e2 Merge pull request #1516 from edx/zoldak/fix-component-test 
Break out Advanced Problem tests into a Scenario Outline
 2013-10-28 13:51:43 -07:00