Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,194 Commits 1 Branch 0 Tags
9da0aa2e8564401b9b72fc80c6898de98cac69e2
Commit Graph

1386 Commits

Author SHA1 Message Date
polesye
042b7d5f60 Merge pull request #428 from edx/valera/video_alpha2_refactor 
Valera/video alpha2 refactor
 2013-08-02 01:04:13 -07: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
Anton Stupak
6ba5d472b3 Fix with sequence switching and more. 
Studio: adds in new Sass file for Studio-specific
xmodule presentation and removes full screen control
from video alpha display UI.
Adds jasmine test for subtitles scroll.
Adds tests for caption change height functionality.
Uses gettext wrapper.
Fixes caption change height functionality.
Removes IS_CMS, isCms flags.
 2013-08-01 20:50:32 +03: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
Peter Fogg
8bd686d63c Show notification on component reorder. 2013-08-01 11:56:16 -04:00
Peter Fogg
4a77693f4a Show notification on course outline reorder. 2013-08-01 09:41:27 -04:00
chrisndodge
8573ac3909 Merge pull request #510 from edx/feature/cdodge/allow-course-run-in-course-create 
Feature/cdodge/allow course run in course create
 2013-07-31 14:44:50 -07:00
Frances Botsford
9ab21be98c fix for ie bug where drop down menus were still clickable when collapsed 2013-07-31 12:17:21 -04:00
Brian Talbot
16187462b3 Studio: syncs up visual and semantic standards b/t create course and user forms 2013-07-30 18:21:07 -04:00
Brian Talbot
ec9ea28e92 Studio: abstracting out shared creation form action properties 2013-07-30 17:29:02 -04:00
Chris Dodge
d321406cc3 fix indent 2013-07-30 17:25:47 -04:00
Chris Dodge
f50d304166 missed a local variable 2013-07-30 17:25:47 -04:00
Frances Botsford
2ce2f08664 fix for extra long error on course creation 2013-07-30 17:25:47 -04:00
Chris Dodge
279896e484 put new unique functions inside the primary function 2013-07-30 17:25:47 -04:00
Chris Dodge
6399eda118 be sure to mark javascript local variables with var 2013-07-30 17:25:47 -04:00
Frances Botsford
e6cf16011d sass fix for course creation 2013-07-30 17:24:44 -04:00
Chris Dodge
4b3f62eff0 add some client side validation to make sure org/course/run is URL sage 2013-07-30 17:24:44 -04:00
Chris Dodge
f29819ca4a add some field specific error messages regarding uniqueness 2013-07-30 17:24:44 -04:00
Frances Botsford
2c61ad45bd adjusted error message style on course creation 2013-07-30 17:24:44 -04:00
Chris Dodge
1cd70ee386 fix some error messages and also make localizable strings 2013-07-30 17:24:43 -04:00
Chris Dodge
60f03f5dcc fixing tests 2013-07-30 17:24:43 -04:00
Chris Dodge
184184066c wip: implement error feedback 2013-07-30 17:24:43 -04:00
Frances Botsford
9901212f93 overhaul of the studio course creation form html and sass 2013-07-30 17:24:43 -04:00
Chris Dodge
e23b693d90 put a 4th field in the create new course form where the user must specify a course_run. Also update unit tests to also provide this 4th parameter. Styling changes to better lay out the form fields are still TBD. 2013-07-30 17:20:09 -04:00
David Baumgold
7d7513b6fe Merge pull request #470 from edx/db/course-team-admin-grants 
Grant admin rights to members of the course team
 2013-07-30 13:36:56 -07:00
Brian Talbot
573445aa8c Studio: adds badge UI firefox fix 2013-07-30 14:01:17 -04:00
Brian Talbot
c82ad6cdaa Studio: revises badge and create call to action design 2013-07-30 13:19:39 -04:00
David Baumgold
4f5c2cce75 Re-added missing render() call 2013-07-30 11:22:13 -04:00
Brian Talbot
611dab077f Studio: places 'add team member' call to course team view 2013-07-29 17:29:15 -04:00
Brian Talbot
6980e9f175 Studio: bulletproofs actions on course team view 2013-07-29 16:36:45 -04:00
David Baumgold
372992244c Removed course_info_handouts AJAX load 2013-07-29 14:30:16 -04:00
David Baumgold
5b9e283552 Load course info update template on page instead of via AJAX 2013-07-29 14:29:04 -04:00
David Baumgold
eac14615cd Load advanced_entry template on page, rather than via AJAX 2013-07-29 14:28:40 -04:00
Brian Talbot
deced24b32 Studio: refactored form-based Sass and revised markup/copy for course team admin mgmt 2013-07-29 13:12:06 -04:00
Brian Talbot
4a2b5519ba Studio: styles new user role controls and revamps course team UI 2013-07-29 13:12:05 -04:00
Christina Roberts
166aea62bb Merge pull request #341 from edx/talbs/studio-authorship 
Studio: Authorship Rights Request UI + Dashboard Clean-up
 2013-07-26 03:59:07 -07:00
Brian Talbot
8a715c1a16 Studio: using defined red color variables for error-based system messages 2013-07-25 17:09:57 -04:00
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
chrisndodge
b76e7387aa Merge pull request #452 from edx/feature/cdodge/add-jump-to-substituions 
add a /jump_to_id/ shortcut for producing more durable links between cou...
 2013-07-23 12:15:31 -07:00
Brian Talbot
059450c0de Studio: revises HTML and styling around new unit ID on unit view 2013-07-23 12:10:49 -04:00
Peter Fogg
6eac259c08 Merge pull request #415 from edx/peter-fogg/notification-stories 
Peter fogg/notification stories
 2013-07-23 09:05:10 -07:00
Brian Talbot
1da5af53d9 Studio: revises styling/message copy for authorship rights request error 2013-07-23 10:37:07 -04:00
David Baumgold
89705f275d Merge pull request #461 from edx/db/change-asset-to-pdf 
Change "asset" to "PDF" in textbooks interface
 2013-07-23 06:49:39 -07:00
Brian Talbot
0833181ecc Studio: updates older extend references and solves Sass warnings/dupe display of accessibility-based text 2013-07-22 16:30:26 -04:00
Brian Talbot
4a3b680ee6 Merge pull request #447 from edx/talbs/studio-fix-title 
Studio: adds a space back to the phrase 'Welcome to edX Studio'
 2013-07-22 13:27:46 -07:00
David Baumgold
b51aa31231 PDF uploader dialog refers to "PDF" instead of "asset" 2013-07-22 12:54:16 -04:00
Peter Fogg
e3e6fd2002 Remove commented-out code and add test. 2013-07-22 12:33:01 -04:00
cahrens
6629d5d3a3 Merge branch 'master' into talbs/studio-authorship 
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html
 2013-07-22 12:15:42 -04:00
Peter Fogg
c4a21fc906 Merge pull request #403 from edx/peter-fogg/fix-stud-421 
Validate date/time settings when typed in directly.
 2013-07-22 08:41:04 -07:00
Peter Fogg
925f0a5ee8 Remove @xhr.restore() to fix tests. 2013-07-22 11:37:09 -04:00