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

36 Commits

Author SHA1 Message Date
Matthew Mongeau
67221b0725 Added countries and other demographics to be stored in db. 2012-07-18 13:02:07 -04:00
Victor Shnayder
39a1502e1a Move student app from lms to common 2012-07-13 11:51:32 -04:00
Bridger Maxwell
2c2e296034 Forgot to actually add migration file... 2012-07-12 10:32:53 -04:00
Bridger Maxwell
64888f1c1b Re-added the migration to expand the meta field. 2012-07-12 10:29:15 -04:00
Bridger Maxwell
d739e61ebd Added check to make sure utf8 migration only runs on mysql. Had to add in certificates module. 2012-07-11 16:33:46 -04:00
Bridger Maxwell
c6f9f3ebe1 Renamed migrations since branch, making dev machine databases un-migratable. 2012-07-11 15:17:44 -04:00
Bridger Maxwell
c31fb7684d Added utf8 conversion from stable branch. 2012-07-11 15:08:10 -04:00
Matthew Mongeau
b96f626425 Update UserProfile demographic fields: 
* Updated student.models.UserProfile
* Added migration to add: gender, date_of_birth, mailing_address, country, telephone_number, occupation
 2012-07-11 14:58:39 -04:00
Calen Pennington
bbe589ddc3 Make dashboard require login 2012-07-11 09:05:39 -04:00
Calen Pennington
5d8fd7d53c Don't error out trying to retrieve remember parameter in login request 2012-07-11 08:53:57 -04:00
ichuang
84838cf222 add CourseEnrollment and UserTestGroup to django admin view 2012-07-10 22:31:28 -04:00
Galen Frechette
5484cfd08e adds links to university profile page 2012-07-10 19:59:50 -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
da360b1d56 Allow for a user to enroll in multiple courses 2012-07-10 13:11:57 -04:00
Calen Pennington
239c5ef172 Require login for enrollment 2012-07-10 10:19:15 -04:00
Matthew Mongeau
5109253378 Revert "workarounds for get_about_section" 
This reverts commit 05e1bcf4f1.
 2012-07-06 17:23:56 -04:00
Matthew Mongeau
05e1bcf4f1 workarounds for get_about_section 2012-07-06 17:13:53 -04:00
Calen Pennington
a1f98e76cd WIP: Merging multicourse and xmodule descriptor changes 
The basic form has been fleshed out. Things still to do:
1) Extend get_course interface to the rest of modulestore
2) Make courses actually load
3) Make org/course/maybe others metadata attributes for course_module (see xml_module), so
that they are loaded/saved on import/export to xml
 2012-07-05 21:56:52 -04:00
Matthew Mongeau
e729cc321a Fix url confusion for course/info and course/about 2012-07-05 17:10:52 -04:00
ichuang
10a10c7938 clean up email settings check in lms.djangoapps.student.views 2012-07-02 11:21:00 -04:00
Matthew Mongeau
9d4043e40e Redirect to dashboard when visiting the hoem page while signed in. 2012-06-29 13:38:28 -04:00
Matthew Mongeau
3a54916b2d Help link 2012-06-29 11:52:48 -04:00
Matthew Mongeau
bd4a9471bf Display enrollments on dashboard. Add reverse to navigation and footer links. 2012-06-29 11:25:16 -04:00
Matthew Mongeau
0750ee0531 Registrations and signup form 2012-06-28 15:38:36 -04:00
Matthew Mongeau
56d5e54150 Hook up about and jobs pages. Use named route for root. 2012-06-27 13:52:49 -04:00
ichuang
200e188c09 add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation 
- issue is that content machine isn't whitelisted for email
 - this also provides secondary filtering for user registration
 2012-06-26 23:00:25 -04:00
ichuang
bda75b4fbd add admin model for student (need to be able to see activation keys in db) 2012-06-26 23:07:45 +00:00
Matthew Mongeau
7b4389d173 Redirect to /courses instead of /info 2012-06-21 11:02:50 -04:00
David Ormsbee
e4a6ccc5b2 add courses to front page 2012-06-21 10:59:48 -04:00
David Ormsbee
3859c2be19 Add scanning of data directory for courses. 
These are then displayed at /courses.
 2012-06-21 10:59:48 -04:00
Victor Shnayder
5f2c029477 fix typo in comment in student view 2012-06-21 10:59:42 -04:00
Victor Shnayder
5ad2824c59 fix typo in comment in student view 2012-06-15 18:28:54 -04:00
Matthew Mongeau
e048b3251d Get dropdown working 2012-06-14 14:19:47 -04:00
Matthew Mongeau
7337275303 Adding dashboard 2012-06-14 13:50:16 -04:00
Matthew Mongeau
86826f8688 Integrate more pages. 2012-06-14 11:27:47 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00