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

1137 Commits

Author SHA1 Message Date
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
Peter Fogg
08c5f955aa Unstyled prototype for new list editor design. 2013-08-06 13:23:33 -04:00
Peter Fogg
f317244ac4 Convert Video Alpha to metadata-only. 2013-08-06 13:23:33 -04:00
Peter Fogg
74b815274f Add a list view for metadata editor. 
This is to be used with VideoAlpha's functionality allowing a choice
of multiple HTML5 video sources.
 2013-08-06 13:23:33 -04:00
David Baumgold
55b68168e7 Cleanup/reformatting 2013-08-06 11:29:45 -04:00
Brian Talbot
d64894de02 Studio: revises markup and visual styling for course listings metadata 2013-08-05 16:20:03 -04:00
Chris Dodge
da9a4b5d4f alter the HTML editor so that it can do the /static/ <--> /c4x/ substitutions when toggling back and forth between the visual and advanced editors 2013-08-05 16:15:03 -04:00
Chris Dodge
6200b2903f have the Files and Upload pages surface a 'portable_url' which uses the /static/ shorthand which is more portable across course runs 2013-08-05 16:15:03 -04:00
Frances Botsford
2c75caca20 adjustment to sidebar help text on PDF textbook page in studio 2013-08-05 16:10:08 -04:00
Chris Dodge
ef53e8df6c one field had wrong label nesting 2013-08-05 12:56:06 -04:00
Chris Dodge
09a3bc01be show the organization, course number, course run in the course listing page in CMS 2013-08-05 12:51:42 -04:00
Alexander Kryklia
da4f295d00 Add TabsEditingDescriptor for VideoAlpha 
Updates comment
Make Model descriptor class property.
Fix tests
 2013-08-05 13:38:32 +03:00
Chris Dodge
3a2bb7ba01 add escaping 2013-08-02 09:51:41 -04:00
Chris Dodge
93df9c4c30 resolve merge conflicts 2013-08-02 09:41:02 -04:00
David Baumgold
2ad78d949a Merge pull request #538 from edx/db/course-team-admin-grants 
Add error messaging to course team page
 2013-08-01 11:58:52 -07:00
David Baumgold
1b83cfc409 Merge pull request #546 from edx/db/dev-views 
Create urls/views/templates for dev-only views
 2013-08-01 11:47:39 -07:00
David Baumgold
53ae177178 Curly quotes around course name 2013-08-01 13:46:40 -04:00
David Baumgold
16e2ee8011 Abstract out the unknown error message and i18n 2013-08-01 13:43:40 -04:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model 
Initialize on every page that has a context_course set
 2013-08-01 13:39:47 -04:00
Brian Talbot
a1f43fa6fd Studio: revises prompt messages for team roles UI 2013-08-01 09:58:32 -04:00
David Baumgold
21318d142d Add confirmation prompt when deleting a user from a course team 2013-08-01 09:58:32 -04:00
David Baumgold
2617b478c0 Add error messaging to course team page 
Hitting "Add User" with no email address, or trying to add a user to the course
team multiple times
 2013-08-01 09:58:32 -04:00
David Baumgold
64ad5567f3 Create urls/views/templates for dev-only views 
Our designers find it helpful to be able to stub out simple views that aren't ready
to be seen for production yet, and check them into version control so that other
people can see them and provide feedback. This commit introduces a few new files
and directories for this purpose, as well as a sample view that will only be seen
in dev mode, and never in production.
 2013-07-31 17:20:26 -04:00
Frances Botsford
b6777118c6 removing animate class from course creation for now 2013-07-31 15:25:38 -04:00