Peter Fogg
e177270d0d
Merge pull request #700 from edx/peter-fogg/course-image-upload
...
WIP: Peter fogg/course image upload
2013-08-21 11:17:12 -07:00
Diana Huang
deb55380d5
Merge pull request #760 from edx/diana/move-course-modes-to-common
...
Move course modes to common and enable in Studio admin
2013-08-21 10:12:26 -07:00
Kevin Chugh
2f4665375f
Merge pull request #745 from edx/dave/block_forums_for_unenrolled
...
Make it so that students who are not enrolled cannot see the forum
2013-08-21 09:13:10 -07:00
Your Name
25d98778cc
Merge branch 'master' into dave/block_forums_for_unenrolled
2013-08-21 12:00:06 -04:00
Your Name
541aa08471
update forum access to include check for valid date range
2013-08-21 11:59:39 -04:00
Your Name
a36e3b1957
CourseEnrollment no longer needed in forum/views
2013-08-21 11:06:30 -04:00
Diana Huang
70e1c70e4f
Move course modes to common and enable in Studio
2013-08-21 09:59:15 -04:00
Your Name
b317d45ffb
add missing imports
2013-08-21 09:49:09 -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
Kevin Chugh
08aafc58ea
refactor to add access control to already_existing access control routines in access.py
2013-08-20 19:43:46 -04:00
Kevin Chugh
a2bbb65dcf
refactor to add access control to already_existing access control routines in access.py
2013-08-20 19:42:03 -04:00
Miles Steele
cb7a3ad8eb
switch from log_event to Logger.log
...
keep log_event for compatibility
2013-08-20 16:52:18 -04:00
Christina Roberts
1a8b2fa0eb
Merge pull request #735 from edx/fix/cdodge/pylint-violations
...
address some pylint violations in the mixedmodulestore build report
2013-08-20 05:42:55 -07:00
chrisndodge
c33571ff98
Merge pull request #732 from edx/fix/cdodge/get_items_needs_courseid
...
Fix/cdodge/get items needs courseid
2013-08-19 21:26:12 -07:00
Chris Dodge
6a3dafeed6
update hint manager to pass in a course_id when dereferencing a module
2013-08-19 23:42:27 -04:00
Chris Dodge
bc5e27fe17
update some more call sites in LMS to always pass in a course_id
2013-08-19 23:42:26 -04:00
Chris Dodge
a16aee340a
get_items should take a course_id
2013-08-19 23:42:26 -04:00
Chris Dodge
2e1eb1dce5
add escaping
2013-08-19 23:41:49 -04:00
Chris Dodge
f599d4b508
don't put the substitutions in quotes
2013-08-19 23:41:49 -04:00
Chris Dodge
352e56eb4e
address some pylint violations in the mixedmodulestore build report
2013-08-19 23:40:46 -04:00
David Ormsbee
013009ea24
Let staff have access to a forum even if they're not enrolled in the course.
2013-08-19 17:27:23 -04:00
David Ormsbee
c2d1791de4
Make it so that students who are not enrolled cannot see the forum
2013-08-19 17:09:47 -04:00
Jonah Stanley
73ad057eff
Merge pull request #710 from edx/jonahstanley/help-acceptance-test
...
Jonahstanley/help acceptance test
2013-08-19 14:02:29 -07:00
Adam Palay
cb3429570c
set first FAQ link to mktg webiste too
2013-08-19 16:34:17 -04:00
Adam
bd45103fe9
Merge pull request #728 from edx/fix/adam/dash-delete
...
fixes delete state on dashboard
2013-08-19 07:45:59 -07:00
Diana Huang
9469991f52
Merge pull request #713 from edx/diana/button-updates
...
Drupal side Register button updates
2013-08-19 07:28:45 -07:00
Brian Talbot
fc4eb3786a
mktg - revised sass/css for iframed button to match styles/consistency
2013-08-19 10:25:29 -04:00
Adam Palay
2e47d61cef
fixes delete state on dashboard
2013-08-19 10:22:42 -04:00
JonahStanley
ce5d9b93b1
Added the full range of help modal options
...
Fixed pylint violations
2013-08-19 09:56:57 -04:00
chrisndodge
7aa4418934
Merge pull request #723 from edx/fix/cdodge/bad-links-can-cause-exception-on-rewrite
...
Fix/cdodge/bad links can cause exception on rewrite
2013-08-19 06:33:55 -07:00
Anton Stupak
7a68516d12
Fix formatting.
2013-08-19 10:39:52 +03:00
Anton Stupak
a921e44aa3
Fix steps.
2013-08-19 10:39:52 +03:00
Anton Stupak
d848477596
Remove unecessary assert.
2013-08-19 09:10:50 +03:00
Chris Dodge
033f922ec0
add a try catch around the staticstorage lookup, which can throw an exception
2013-08-17 10:33:59 -04:00
chrisndodge
594a73d437
Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore
...
Feature/cdodge/add a mixed modulestore
2013-08-17 07:32:51 -07:00
chrisndodge
8ba3214cd4
Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore
...
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
2013-08-16 13:02:31 -07:00
JonahStanley
fc899ab116
Stylistic change and factored out method to common
2013-08-16 15:30:35 -04:00
Diana Huang
af76997ccd
Add in a uniqueness constraint on mode, course, and currency.
2013-08-16 15:26:57 -04:00
Carlos Andrés Rocha
4e0f3d0791
Merge pull request #706 from rocha/enable-django-nose-for-all
...
Enable the django_nose app by default
2013-08-16 11:29:43 -07:00
Frances Botsford
d4ea8388a6
updated styling for marketing side register button to accommodate second line of text - and IE-specific styling
2013-08-16 11:28:07 -04:00
JonahStanley
43bee86074
Tightened up wording
2013-08-16 11:08:05 -04:00
JonahStanley
967fdee6bc
Made filling field a bit safer
2013-08-16 10:55:14 -04:00
JonahStanley
97f70e8598
Fixed wording to better reflect BDD specs
2013-08-16 10:52:20 -04:00
Frances Botsford
445cf39f8b
updated styling for marketing side register button to accommodate second line of text
2013-08-16 10:39:45 -04:00
JonahStanley
fc67c2ee6b
Wrote preliminary help modal acceptance tests
2013-08-16 10:36:12 -04:00
Adam Palay
8aee225136
in grading, if problem cannot be created, return score as none
2013-08-16 10:25:38 -04:00
Chris Dodge
cf715cb727
fix pylint violations
2013-08-15 22:58:04 -04:00
Chris Dodge
61219169d4
change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration
2013-08-15 22:58:04 -04:00
Chris Dodge
5ee5beafbe
fix bad merge conflict resolution
2013-08-15 22:58:03 -04:00
Chris Dodge
aa8b054590
fix missed conflict resolution
2013-08-15 22:58:03 -04:00
