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

3974 Commits

Author SHA1 Message Date
John Jarvis
7a24f2036c Merge pull request #1718 from edx/jarv/fix-static-url 
'ignore' shouldn't be use for ascii conversion
 2013-11-19 11:38:28 -08:00
John Jarvis
693cfdea50 'ignore' shouldn't be use for ascii conversion 
The input string is not expected to contain any unicode characters
 2013-11-19 14:34:06 -05:00
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
John Jarvis
71184220e6 convert STATIC_URL to ascii 2013-11-19 12:25:59 -05: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
John Jarvis
0e6b21ef71 adding slash 2013-11-19 11:40:31 -05:00
John Jarvis
54bb55fa52 fixes issue where STATIC_URL was overwritten without git.revision 
fixes this commit - 5ec77010e3
 2013-11-19 11:35:45 -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
Sarina Canelake
878097d06e Provide language codes for i18n testing 2013-11-19 09:15:53 -05:00
polesye
38163cf942 BLD-410: Add tests. 2013-11-19 14:37:14 +02:00
polesye
e9b1d2102d Merge pull request #1688 from edx/anton/add-template-checkboxes 
Add template for checkboxes to studio.
 2013-11-18 11:24:25 -08:00
John Jarvis
399df1141e resolving merge conflicts 2013-11-18 11:52:26 -05:00
John Jarvis
f5a772135d adding override for GITHUB_REPO_ROOT 
This is the base directory for course data
 2013-11-18 11:24:45 -05:00
John Jarvis
5ec77010e3 allow override for STATIC_URL 2013-11-18 10:54:12 -05:00
Gabe Mulley
9ad435a8b8 fix emission of enrollment events from the CMS 
I suspect there are very few circumstances that an enrollment event is emitted from the CMS, but if it ever were to happen, it would bomb out because the "crum" middleware is not used in that app.  We are hoping to replace this request caching hack in the near future, but for now it is the best option we could come up with.

I noticed the stack appear when I created a new course in my dev environment.  Presumably the course author is automatically enrolled in the course, which, causes the tracking code to bomb out.  Luckily we catch the error and just log it, but we really should be capturing this type of enrollment event.
 2013-11-18 08:48:46 -05: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
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
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