Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

89 Commits

Author SHA1 Message Date
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Calen Pennington
2854d7d066 Point course_image.jpg at the correct place in the /static url space 2013-01-30 09:12:50 -05:00
Victor Shnayder
9e84ae14d4 Started integration work with Kevin's cohort changes 
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.

Next: testing :)
 2013-01-24 15:14:33 -05:00
Kevin Chugh
def2d8adf2 fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable 2013-01-24 14:20:18 -05:00
Kevin Chugh
1bd9366e40 Merge remote-tracking branch 'origin/master' into feature/kevin/groups 2013-01-23 16:26:06 -05:00
Kevin Chugh
59b3dc61a2 lms producing grouped content 2013-01-23 16:25:26 -05:00
Kevin Chugh
b26c59bda0 fix syntax error 2013-01-20 01:53:25 -05:00
Chris Dodge
550e805b74 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
 2013-01-18 15:44:41 -05:00
Your Name
b8e3cfcf96 added get_cohort_ids 2013-01-18 13:50:05 -05:00
Your Name
dba39e2431 add group support to lms 2013-01-18 12:50:25 -05:00
Carlos Andrés Rocha
ef69b738c9 Sort courses announcement date 
If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.

If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.
 2013-01-17 21:46:58 -05:00
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
 2013-01-11 14:04:46 -05:00
Carlos Andrés Rocha
8f21d7a738 Add property to course module to check if a course is new 
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.

Also adds a property to check how many days are left until the course starts.
 2013-01-10 15:57:29 -05:00
Calen Pennington
89a0b82e5c Decrease the number of queries needed for LMS courseware 
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
 2013-01-10 13:55:46 -05:00
Chris Dodge
99750a6812 make sure we turn off module wrappers for the 'ancillary' course content 2013-01-08 11:18:41 -05:00
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Carlos Andrés Rocha
1ac41787a7 Fix broken display of courses in university profile 2012-12-21 16:38:17 -05:00
Carlos Andrés Rocha
8ac89c39a7 Use course metadata instead of setting attributes to display new course overlay 2012-12-21 11:12:21 -05:00
Carlos Andrés Rocha
22de7cbb4e Add logic to display courses by start date and show the new overlay 2012-12-20 20:05:11 -05:00
Chris Dodge
95c6719447 initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from 2012-12-12 10:57:06 -05:00
Chris Dodge
2aceb2e44a make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter 2012-11-29 15:56:03 -05:00
Chris Dodge
46870f4391 be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling 2012-11-29 15:09:28 -05:00
Chris Dodge
b788b9d659 add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc. 2012-11-01 15:08:26 -04:00
Chris Dodge
34c442a1dc removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering 2012-10-30 16:04:51 -04:00
Chris Dodge
f0b4371c90 addressed Cale's feedback 2012-10-30 16:01:28 -04:00
Chris Dodge
ee1098c032 remove unused line 2012-10-30 15:37:40 -04:00
Chris Dodge
743f2b56dd make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting 2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00
Chris Dodge
ba15735214 implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff 2012-10-25 14:27:26 -04:00
Chris Dodge
fec6c42adc implement importing of course info sections as modules in the course 2012-10-24 20:55:04 -04:00
Arjun Singh
08464725c3 Try and find a run-specific syllabus before loading a course-specific syllabus 2012-09-15 05:02:28 -07:00
Victor Shnayder
66343884dc pull ocw links from about/ocw_links.html 
format should be
<ul>
<li>link</li>
<li>other link</li>
</ul>
 2012-09-13 10:22:02 -04:00
Victor Shnayder
f44898677a Allow course info and course about pages to vary per-run 
* looks in about/{course.url_name}/ first, then in about/
* same for info/
 2012-09-06 11:17:55 -04:00
kimth
115eebdb76 Use reverse for course_info url replacement 2012-08-24 16:47:50 -04:00
kimth
31216ccd9f Do URL replacement in course info page 2012-08-24 16:16:26 -04:00
Calen Pennington
82bab71ccf First pass at branding the header logo on subdomains 2012-08-22 14:05:19 -04:00
Victor Shnayder
2c19d01441 Merge pull request #479 from MITx/feature/arjun/syllabus 
Adding a syllabus page (accessible via course navigation)
 2012-08-21 14:33:07 -07:00
Arjun Singh
b86fbdbd10 Adding comments about removing the syllabus tab ASAP. 2012-08-21 13:23:00 -07:00
Victor Shnayder
b97a2af2a2 Show policy, grading policy, and top-level errors 
* Save errors for courses that failed to load in modulestore
* global staff can see course errors on their dashboard
* put policy loading errors into the error trackers
* add has_access(user, 'global', 'staff'), which is equiv to user.is_staff for now
 2012-08-21 15:00:21 -04:00
Arjun Singh
1cfed46d06 Adding a syllabus page (accessible via course navigation) 2012-08-21 05:47:26 -07:00
Victor Shnayder
c6c95c63ac Keep each course's descriptors separate 
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
  change the same module in different ways, it works.  Such edits will need to
  merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
  Update all the call sites
* tests, including a 2nd toy course with same course and org.
 2012-08-20 09:26:16 -04:00
David Ormsbee
1c2b6e8088 Remove stuff that I should have deleted during the rebase 2012-08-15 14:39:56 -04:00
David Ormsbee
7d90617c5e Merge with master 2012-08-15 12:21:59 -04:00
David Ormsbee
7f8f702971 Fix silly error that was pulling the wrong info from COURSE_LISTINGS 2012-08-15 11:53:21 -04:00
David Ormsbee
d0f2641890 Account for the fact that sometimes we don't get HTTP_HOST (like for tests) 2012-08-15 11:53:21 -04:00
David Ormsbee
346d5b91a1 implement subdomain-based course displays 2012-08-15 11:53:20 -04:00