Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,386 Commits 1 Branch 0 Tags
07f246f3550b2af19cb8ab2c9376dfd68c491b4a
Commit Graph

60 Commits

Author SHA1 Message Date
David Ormsbee
3087ec6c91 Merge pull request #259 from MITx/feature/cpennington/minimize_js_requests 
Consolidate javascript at the bottom of the page and in a minimal number of django-pipeline groups
 2012-07-23 08:41:29 -07:00
Matthew Mongeau
ee72a725bb Sort by course number. Simplify university grouping. 2012-07-23 11:38:01 -04:00
Calen Pennington
5915532a57 Consolidate code used for disabling USE_DJANGO_PIPELINE feature 2012-07-23 11:27:22 -04:00
David Ormsbee
9d81a8becb Merge pull request #256 from MITx/dormsbee/change_reg_fields 
Dormsbee/change reg fields
 2012-07-22 16:13:52 -07:00
David Ormsbee
074fc24343 Fix up the signup modal for registration for the new fields. 2012-07-22 18:53:12 -04:00
David Ormsbee
44f5891fe2 Remove migration that conflicts with smooth_registration 2012-07-22 18:01:44 -04:00
David Ormsbee
7192c30985 Move migration for new reg fields so as not to conflict with smooth_registration 2012-07-22 17:52:55 -04:00
David Ormsbee
942183d765 Merge branch 'release/1.0' into dormsbee/change_reg_fields 2012-07-22 17:50:46 -04:00
Bridger Maxwell
6caee537a1 Accidentally disabled cache_if_anonymous earlier. Re-enabling. 2012-07-22 17:40:27 -04:00
Bridger Maxwell
9afb0f8b78 Disabled student migration 0011, which had not net effect and was causing InnoDB errors. 2012-07-22 16:32:15 -04:00
Bridger Maxwell
ef32adc1c9 Changed log level to exception. 2012-07-22 16:30:41 -04:00
David Ormsbee
7f3a443409 Change over to new reg fields (styling still broken) 2012-07-22 15:35:24 -04:00
Bridger Maxwell
61105134aa Cleaned up activation pages. Added "Log In" link to notice when anonymous user tries to enroll in course. 2012-07-22 14:52:49 -04:00
Bridger Maxwell
2f4aba8042 If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account. 2012-07-21 17:52:28 -04:00
Bridger Maxwell
60b547273d Registering now temporarily logs you in. A message is displayed on the dashboard, reminding you to activate your account. Logging in shows a reminder about activating. 2012-07-21 15:31:48 -04:00
Bridger Maxwell
660d11dc16 Merge remote-tracking branch 'origin/release/1.0' into unenroll 
Conflicts:
	lms/urls.py
 2012-07-21 12:49:27 -04:00
Bridger Maxwell
dcafbca106 Added an index to course enrollment created field. 2012-07-21 12:44:25 -04:00
David Ormsbee
d6a67ef94d Merge pull request #250 from MITx/pmitros/release-fixes 
Tracking issues, import/export scripts
 2012-07-20 15:14:41 -07:00
Bridger Maxwell
f337baedb0 Renamed enrollment date to created. 2012-07-20 16:48:04 -04:00
Piotr Mitros
b21ea5a8a4 Added import/export scripts 2012-07-20 16:39:19 -04:00
Piotr Mitros
0fb8a7b1c8 Middleware password fix. Needs Cale's cleanup 2012-07-20 16:38:45 -04:00
Bridger Maxwell
96b41e93d1 Removed old todo comment. 2012-07-20 14:33:30 -04:00
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
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