Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
Bridger Maxwell
cdc2ff04f8 Added a datetime stamp to course enrollments. 2012-07-20 13:14:59 -04:00
David Ormsbee
17263dcd1b Keep courses and front page from erroring when we're missing an org in the data. 2012-07-19 16:19:16 -04:00
Matthew Mongeau
a64ddc771a Display courses in university related columns. 2012-07-18 17:36:12 -04:00
Matthew Mongeau
73df314159 wip 2012-07-18 13:40:16 -04:00
Matthew Mongeau
dd0cd57ead Add date_of_birth 2012-07-18 13:02:56 -04:00
Matthew Mongeau
456054a261 Cleanup. 2012-07-18 13:02:31 -04:00
Matthew Mongeau
67221b0725 Added countries and other demographics to be stored in db. 2012-07-18 13:02:07 -04:00
Matthew Mongeau
7e25f39f62 Change stored gender value for students.models.UserProfile 
* Changed from 'male', 'female', and 'other' to 'm', 'f', and 'o'
 2012-07-18 13:00:40 -04:00
David Ormsbee
7acfdcd16d Ignore registrations for Courses that can't be found 2012-07-18 10:49:45 -04:00
Bridger Maxwell
c24c88022b Changed wording in emails to remove any 6.002x or MITx reference. 2012-07-18 10:36:55 -04:00
Rocky Duan
7c480dd5b5 only enroll a given course once 2012-07-17 20:19:34 -04:00
Bridger Maxwell
e4a3b261d4 Moved enroll and course_about to courseware, because they depend on lms. 2012-07-17 17:09:20 -04:00
David Ormsbee
8bd0f0183b Merge pull request #193 from MITx/mm-rss-parser-fixes 
Store rss instead of parser in memcache.
 2012-07-17 11:27:58 -07:00
Matthew Mongeau
384f24064e Store rss instead of parser in memcache. 2012-07-17 14:26:20 -04:00
Bridger Maxwell
996fec4b63 Added a check that course enrolmments don't already exist before creating them. 2012-07-17 14:01:26 -04:00
Bridger Maxwell
9f84d9b6fd Merge remote-tracking branch 'origin/master' into release/1.0 2012-07-17 13:56:44 -04:00
Bridger Maxwell
1a8d999663 Added a migration with indexes on course enrollment and a unique constraint. This involves a migration that first drops the table, because there may be non-unique data there already. 2012-07-17 13:54:54 -04:00
Matthew Mongeau
171e16f177 Use local feed as default 2012-07-17 12:56:30 -04:00
Matthew Mongeau
2bfe0cb92d Add parsed rss entries to home page with caching 2012-07-17 12:56:28 -04:00
Bridger Maxwell
2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-17 12:53:27 -04:00
Bridger Maxwell
938f0d1995 Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now. 2012-07-17 11:12:42 -04:00
Bridger Maxwell
8ebaf8a761 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/urls.py
 2012-07-17 10:52:39 -04:00
Bridger Maxwell
bde93aea99 Merge remote-tracking branch 'origin/master' into template_caching 
Conflicts:
	lms/templates/footer.html
	lms/templates/signup_modal.html
 2012-07-16 16:19:26 -04:00
Bridger Maxwell
960c8619e5 Added a cache_if_anonymous decorator. 2012-07-16 13:40:17 -04:00
Victor Shnayder
49576f9ddb address comments in pull #178 2012-07-16 13:34:05 -04:00
Bridger Maxwell
4f4e751321 Merge 2012-07-16 12:42:49 -04:00
Bridger Maxwell
eb7ae3540c Added a simple, specific cache for the static_template_pages. 2012-07-16 09:12:50 -04:00
Bridger Maxwell
cd2eacc675 Moved static template views to one folder. Removed the stub view functions from student and used static_template_views instead. 2012-07-13 17:42:23 -04:00
Victor Shnayder
ff59c9bfa9 Initial connection of student module with cms. 
* Enable account creation
* Some code cleanups
* Fix access to nonexistent fields in the account creation view
* Formatting fixes
 2012-07-13 11:51:32 -04:00
Victor Shnayder
39a1502e1a Move student app from lms to common 2012-07-13 11:51:32 -04:00
Calen Pennington
fefda5db62 Only munge /static/ urls in module html to point to course static files if they don't exist in the global static locations 2012-07-12 16:09:34 -04:00
ichuang
4f830eb316 fix static_replace use of re.subs flags to be python2.6 compatible 2012-07-10 22:32:46 -04:00
Calen Pennington
fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
 2012-07-10 13:39:19 -04:00
Calen Pennington
5406b9bb40 Make /static/ urls work in the courseware 2012-07-10 12:54:47 -04:00
Prem Sichanugrist
0f60459709 Add @expect_json to help with parsing JSON request 2012-07-05 09:38:51 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
f8434b3a6d Move libraries that can only be imported in the context of django into common/djangoapps 2012-06-18 13:48:26 -04:00
Calen Pennington
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00