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

3071 Commits

Author SHA1 Message Date
Don Mitchell
6a7fa41e03 Merge pull request #526 from edx/dhm/yacibug 
Yet another Course Info bug
 2013-07-30 09:54:16 -07:00
Don Mitchell
1fb4354a12 Wrap malformed course_update rather than silently failing update 2013-07-30 12:08:57 -04:00
Don Mitchell
27d32f1932 Test reproducing the error: malformed course_update silently failing update 2013-07-30 12:01:15 -04:00
David Baumgold
71bb527022 Merge pull request #515 from edx/db/template-improvements 
Studio: Improvements for loading JS templates on Advanced Settings and Course Updates pages
 2013-07-30 08:24:54 -07:00
David Baumgold
4f5c2cce75 Re-added missing render() call 2013-07-30 11:22:13 -04:00
Diana Huang
0d10a872c8 Merge pull request #499 from edx/diana/login-redirect 
Only redirect when redirect url is an internal page.
 2013-07-30 05:29:39 -07:00
Christina Roberts
f2a9d6fb8e Merge pull request #519 from edx/christina/course_creators 
Change in signature for add_user_with_status_unrequested.
 2013-07-29 14:14:35 -07:00
cahrens
f347bd446b Change in signature for add_user_with_status_unrequested. 2013-07-29 16:48:59 -04:00
Peter Fogg
0c9732024a Add (currently failing) test case around saving metadata. 2013-07-29 15:39:18 -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
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
cahrens
b5506cf20b Copy changes. 2013-07-29 09:51:10 -04:00
cahrens
15665bbe5a Formatting updates. 2013-07-29 09:49:37 -04:00
cahrens
23894d20f8 E-mail notifications to users when course creator status changes. 2013-07-29 09:49:37 -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
Sarina Canelake
50d35b30b1 Fix failing acceptance test 2013-07-25 14:56:22 -04:00
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
cahrens
628994daf1 i18n "Create a New Course". 2013-07-25 12:25:06 -04:00
cahrens
60d60de2c4 Use format for strings instead of %. 2013-07-25 12:21:17 -04:00
ihoover
aad6dc4345 Merge pull request #417 from edx/ihoover/feature_flag_auto_auth 
Ihoover/feature flag auto auth
 2013-07-25 08:11:22 -07:00
Adam Palay
2efcb0cdca Change default names for various LMS components 
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
 2013-07-25 10:38:47 -04:00
ihoover
56883d65a1 csrf test fix 
remove test that csrf middleware is disabled (since we can't seem to reload middleware between tests)

move definitions from setuo into test method
 2013-07-24 17:08:18 -04:00
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -04:00
ihoover
c6c3e4b9d3 working under cms too 2013-07-23 16:23:54 -04:00
Chris Dodge
0b6932f4b8 add new test to assert that course creation will populate default tabs as expected. Also update factory to not override defaults on tabs array. Also simplfy self.tab test condition. 2013-07-23 16:15: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
jkarni
3a5e1c7021 Merge pull request #463 from edx/fix/jkarni/linkoutline 
Link section to course outline
 2013-07-23 10:59:11 -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
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 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
Peter Fogg
69e8d4d32f Merge pull request #469 from edx/peter-fogg/fix-stud-486 
Trim whitespace when adding course authors.
 2013-07-23 09:01:25 -07:00
Brian Talbot
1da5af53d9 Studio: revises styling/message copy for authorship rights request error 2013-07-23 10:37:07 -04:00
cahrens
3d49a46197 Add error handler. 2013-07-23 10:16:45 -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
Peter Fogg
060b2e17e5 Trim whitespace when adding course authors. 2013-07-22 15:58:22 -04:00
Peter Fogg
d87dba9e04 Correctly persist checklist settings. 
Incidentally, fixes an acceptance test (which would have caught this
bug) not running. Its step regex was "They are correctly selected
after I reload the page$", which happens to be matched by "I reload
the page$", another step definition. Lettuce seems to arbitrarily pick
between definitions if they both match a step, so it's good to ensure
that each step isn't a sub-regexes of another.
 2013-07-22 15:10:59 -04:00
cahrens
5168a080ff Don't add users marked with is_staff to course creation table. 2013-07-22 14:45:22 -04:00
Julian Arni
4f9a290a32 Link section to course outline 2013-07-22 14:26:47 -04:00
David Baumgold
ca2bb0e850 PDF Upload button now refers to "PDF" rather than "asset" 2013-07-22 12:54:31 -04: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
Brian Talbot
ec02a4f39f Studio: changed the copy and prompt type for unit + outline deletions 2013-07-22 11:37:09 -04:00