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

4005 Commits

Author SHA1 Message Date
Christina Roberts
e2926a94e0 Merge pull request #1621 from edx/christina/item-create 
Change save_item and create_item to be RESTful.
 2013-11-15 06:16:54 -08:00
cahrens
569c86de74 Code review feedback. 2013-11-14 17:09:24 -05:00
Brian Talbot
cb92b75343 Merge pull request #1647 from edx/talbs/fix-studio-notificationsie 
Studio: Resolves Notifications UI showing in IE9 + CSS Split
 2013-11-14 13:05:47 -08: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
e6f0203aab Silence noisy loggers in the devstack 2013-11-13 10:52:03 -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
Will Daly
b7dab70628 Added devstack settings 
Fixed pep8/pylint violations

Added email feature flags; use full names for pylint disables
 2013-11-12 13:48:29 -05:00
Brian Talbot
722ddb62d3 Studio: resolves IE notifications display issue and abstracts CSS to avoid IE selector/rule limit 
STUD-815
 2013-11-12 13:00:22 -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
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
Will Daly
4e9de855d1 Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline 
Acceptance tests use asset pipeline
 2013-11-08 09:39:19 -08:00
Feanil Patel
9dd182800b Set empty aws credentials to None. 2013-11-08 12:22:09 -05: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
David Baumgold
f02df33a54 Merge pull request #1571 from edx/db/js-main-setup 
Do JS setup immediately when possible
 2013-11-05 12:07:09 -08:00
David Baumgold
e1c94888e4 If the YouTube API JS fails to load, the rest of the JS should still run 
Fixes BLD-472
 2013-11-05 10:22:01 -05:00
Will Daly
85203e8134 Enabled course id clash command tests 2013-11-04 16:15:20 -05:00
Will Daly
7830bb203f Acceptance tests use asset pipeline 2013-11-04 14:04:04 -05:00
David Baumgold
b119a90996 Do JS setup immediately when possible 2013-11-04 12:40:14 -05:00
Adam
98b3d18edc Merge pull request #1492 from edx/adam/remove-@edx 
remove instances of @edx.org email addresses in our default settings (Bug: LMS-1363)
 2013-11-04 08:02:08 -08:00
Alexander Kryklia
b5bf4b7500 Enable latex problems via key in course.settings. 
BLD-426
 2013-11-04 12:13:23 +02:00
Frances Botsford
8ae7bfae4d updated course creation UI: placeholder text for Org is now more generic, run is now using current format, and tips are now below fields to allow more room for tip text 
Addresses bugs STUD-885 and STUD-916
 2013-11-01 16:55:59 -04: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