Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2460 Commits

Author SHA1 Message Date
Julian Arni
0f81bdcefd Properly handle error responses 2013-09-17 09:46:10 -04:00
Julian Arni
cdf0eef5ca Consider redirect code as succcesful 2013-09-16 15:06:51 -04:00
Julian Arni
0acaaa8859 Fix element name conflict 2013-09-09 18:32:01 -04:00
jkarni
b53d55543d Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload 
Add support for multiple file uploads
 2013-09-09 06:47:58 -07:00
chrisndodge
9c6987d010 Merge pull request #873 from edx/fix/cdodge/enable-course-image-setting 
also even when we have a marketing site, we still need a course image fo...
 2013-09-06 16:58:54 -07:00
David Baumgold
3b627e8c80 Merge pull request #879 from edx/db/remove-template-loader 
Remove Studio JS template loader
 2013-09-06 12:26:50 -07:00
David Baumgold
d984311b2e Remove references to template loader JS library 2013-09-06 09:59:56 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Chris Dodge
0a6565b882 also even when we have a marketing site, we still need a course image for the dashboard 2013-09-05 21:07:22 -04:00
cahrens
4e67783644 Don't show course about page link when we have the marketing site. 
STUD-733
 2013-09-05 14:26:08 -04:00
Chris Dodge
4a12cb60c9 due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio 2013-09-05 12:43:24 -04:00
Julian Arni
07014e8eb2 Reset modal when closed by clicking outside of it 2013-09-04 16:25:23 -04:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Julian Arni
b797118811 review fixes 2013-08-29 17:22:07 -04:00
cahrens
a061c7ece7 Rewriting of links for Course Updates and Course Handouts. 
STUD-669.
 2013-08-29 14:35:16 -04:00
Julian Arni
e0ab75fb84 Add support for multiple file uploads 2013-08-29 09:55:40 -04:00
Julian Arni
6cb2e0b206 Check extension rather than mimetype 2013-08-28 11:13:20 -04:00
Julian Arni
fcd11d93d5 Handle nginx 499s and double requests 2013-08-25 22:40:11 -04:00
Julian Arni
8a8bcf289f remove repeated warnings 2013-08-25 22:40:10 -04:00
Julian Arni
ef0828fc66 Behave properly on non-tar-gz files 2013-08-25 22:40:10 -04:00
Julian Arni
513b6cab3e Small review fixes. 
Comments, httpresponse -> jsonresponse; make sure errors get relayed.
 2013-08-25 22:40:09 -04:00
Julian Arni
798d07a8d9 Fix confusing message 2013-08-25 22:40:09 -04:00
Julian Arni
50934d4d45 Make client-side use jquery-file-upload 2013-08-25 22:40:09 -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
32de5aa09f Fix up some SASS issues. 2013-08-21 11:03:40 -04:00
Peter Fogg
b539a4cb94 Update copy to include PNGs, add tests, remove default MIME type. 2013-08-21 09:42:01 -04:00
Brian Talbot
c626c773d8 Studio: revises styling/copy around course image management in settings 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
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 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
James Tauber
97083d0f69 fixed typo in faculty member settings 
This was confusing translators as didn't make sense in English
 2013-08-16 11:49:20 -04:00
Peter Fogg
9ea2be5377 Merge pull request #643 from edx/peter-fogg/course-creation-validation 
Change course create form to asynchronous validation.
 2013-08-13 08:11:40 -07:00
Peter Fogg
c611470e97 Correct non-unique course validation; code cleanup; better error style. 2013-08-12 16:28:41 -04:00
Peter Fogg
8fa4b4dbd1 Change course create form to synchronous validation. 2013-08-12 12:41:41 -04:00
Anton Stupak
dad9f26a99 Make VideoAlpha out of Alpha. 2013-08-12 14:31:48 +03:00
Brian Talbot
5b4c15a57d Studio: revises export prompt control copy 2013-08-09 10:01:23 -04:00
Chris Dodge
487ae964e4 implement PR feedback 2013-08-08 21:01:38 -04:00
Chris Dodge
69c34a65b1 switch the notification to be a prompt and allow for the user to go to the edit unit page which contains the module in error. Otherwise, present the raw exception message and allow user to go to the course outline page. 2013-08-08 21:01:38 -04:00
Chris Dodge
fcaf3e6329 give some debug message regarding why export might fail 2013-08-08 21:01:38 -04:00
frances botsford
581a8a6217 Merge pull request #586 from edx/fix/frances/studio-pdf-text-clarification 
adjustment to sidebar help text on PDF textbook page in studio
 2013-08-08 13:41:20 -07:00
chrisndodge
ece4ec3f57 Merge pull request #533 from edx/fix/cdodge/use-static-shorthand-for-asset-urls 
To increase portability of courses, have the Asset Index page display the classic /static/... URL shorthand.
 2013-08-08 06:32:35 -07:00
Christina Roberts
2191a11151 Merge pull request #598 from edx/christina/email-studio-request 
Send e-mail to STUDIO_REQUEST_EMAIL when user requests course creator privileges
 2013-08-07 09:51:14 -07: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
cahrens
bbd8d84a28 Include the URL to the course creator admin table. 2013-08-07 11:34:51 -04:00
cahrens
e6f15bf611 Send notification to admin when a user enters 'pending' state. 
Also fixes a bug where message was not sent to user when entering 'denied'
state unless the user was previously in 'granted'.

Send notification to admin when a user enters 'pending' state.

Pylint cleanup.
 2013-08-06 16:26:33 -04:00
Peter Fogg
ae517fee01 Merge pull request #455 from edx/peter-fogg/remove-videoalpha-xml 
Peter fogg/remove videoalpha xml
 2013-08-06 11:06:46 -07:00
chrisndodge
b24fdd9e22 Merge pull request #576 from edx/feature/cdodge/display-location-information-in-course-listings 
Feature/cdodge/display location information in course listings
 2013-08-06 10:27:38 -07:00
Peter Fogg
9c84440501 PR comment cleanup. 2013-08-06 13:23:33 -04:00
Brian Talbot
99458e7223 Studio: revises visual layout/presentation of multi-value metadata fields 2013-08-06 13:23:33 -04:00