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

22621 Commits

Author SHA1 Message Date
Calen Pennington
23195e9d76 Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken 2012-06-29 12:45:17 -04:00
Calen Pennington
7d16dbbcb4 Clean up module_render.py 2012-06-29 12:42:48 -04:00
Calen Pennington
c140fe8766 Get problem execution working with problems read from keystore 2012-06-29 12:42:48 -04:00
Calen Pennington
2011861444 Get capa problems to display from a keystore 2012-06-29 12:42:48 -04:00
Calen Pennington
de07b8b345 Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js 2012-06-29 12:40:50 -04:00
Bridger Maxwell
0c4b6f3065 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-06-29 12:18:30 -04:00
Bridger Maxwell
7cfb8ddb8e Merge 2012-06-29 12:08:27 -04:00
Bridger Maxwell
b69deb698d Got the view page of the wiki rendering. Most of it is a styling mess. 2012-06-29 12:05:55 -04:00
Matthew Mongeau
e9d006e324 Signing in brings you to your dashboard instead of the courses page with a find courses button when not enrolled. 2012-06-29 11:57:48 -04:00
Matthew Mongeau
3a54916b2d Help link 2012-06-29 11:52:48 -04:00
Matthew Mongeau
0028324161 Change username in navigation from static copy. 2012-06-29 11:44:34 -04:00
Matthew Mongeau
31efd1f72e Dashboard coarses link to the info page. 2012-06-29 11:42:43 -04:00
Matthew Mongeau
bd4a9471bf Display enrollments on dashboard. Add reverse to navigation and footer links. 2012-06-29 11:25:16 -04:00
John Jarvis
6df2226777 updating URL for activation email to edx4edx 2012-06-29 09:37:14 -04:00
Bridger Maxwell
8002644436 Added migrations for simplewiki. It is a tricky one to apply. Don't attempt at home. 2012-06-28 15:58:11 -04:00
Matthew Mongeau
8715187a31 Successfull signup works. 2012-06-28 15:38:40 -04:00
Matthew Mongeau
219a9b5aa3 Fixed form for signup 2012-06-28 15:38:40 -04:00
Matthew Mongeau
95008dfde3 Changing form variables. 2012-06-28 15:38:40 -04:00
Matthew Mongeau
3068afccc0 Add error div. 2012-06-28 15:38:39 -04:00
Matthew Mongeau
cddf4cf6cf Wip on sign up form. 2012-06-28 15:38:39 -04:00
Matthew Mongeau
0750ee0531 Registrations and signup form 2012-06-28 15:38:36 -04:00
Bridger Maxwell
2a9a15ad66 Beginning to port wiki to multicourse. (Unstable) 2012-06-28 15:11:00 -04:00
ichuang
8a6dd2f756 add 6.00x to dev_ike.py 2012-06-28 14:20:22 -04:00
Bridger Maxwell
cbe5c612b4 Used dictionary update for cleaner course settings code. 2012-06-28 14:04:50 -04:00
Bridger Maxwell
ef3afda283 Slash at the end of courses/ is now optionally there. 2012-06-28 14:01:19 -04:00
Bridger Maxwell
3386031fea Moved more pieces of the about page to live in the course data directory. 2012-06-28 12:58:04 -04:00
John Jarvis
db614b2c16 removing symlinks 2012-06-28 12:51:50 -04:00
Bridger Maxwell
201f093981 Removed old import. 2012-06-28 12:34:45 -04:00
Bridger Maxwell
621680e340 Removed old global course settings file. 2012-06-28 12:31:29 -04:00
Bridger Maxwell
51d6b3f096 Changed course settings to be a json file. Moved it to its own file. 2012-06-28 12:04:03 -04:00
Bridger Maxwell
fc1eeb08e3 Still working on making sections of the course about page dynamic. 2012-06-28 11:24:39 -04:00
John Jarvis
5c398b25da updating edx4edx_aws config 2012-06-28 11:15:03 -04:00
ichuang
5688e89fab change MITx -> edX in many lms templates 2012-06-28 10:26:59 -04:00
Calen Pennington
fedf2c8d00 Merge pull request #150 from MITx/stable-edx4edx-aws 
Stable edx4edx aws
 2012-06-28 05:39:42 -07:00
Calen Pennington
2fde7f4c6d Minor fixes from pull request 131 2012-06-28 08:39:12 -04:00
ichuang
6f5e54b9de Merge pull request #147 from MITx/ps-fix-problem 
Queue up MathML conversion to be after render
 2012-06-27 16:21:17 -07:00
ichuang
3f60c76fad Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx 2012-06-27 19:14:32 -04:00
Bridger Maxwell
dfc2a35442 First pass at putting dyanamic content from data on course about page. 2012-06-27 18:31:39 -04:00
John Jarvis
03b6bd044e setting quickedit to true 2012-06-27 18:06:29 -04:00
Galen Frechette
38425e9b9c adds styles back to courseware 2012-06-27 15:55:22 -04:00
Bridger Maxwell
bf4f946f0d Put in a fix for the Profile page (a bug was showing up for new users). A basecamp discussion will be started on the issue. 2012-06-27 14:47:16 -04:00
Matthew Mongeau
56d5e54150 Hook up about and jobs pages. Use named route for root. 2012-06-27 13:52:49 -04:00
Galen Frechette
4715c69c36 redesigns course item on home page and find courses page, refactors its implimentation and makes vrious other design improvements 2012-06-26 23:26:12 -04:00
ichuang
c5630e6d9f MITx -> edX in activation email 2012-06-26 23:09:52 -04:00
ichuang
c0581f8c86 fix subject in activation email - now uses course_title 2012-06-26 23:07:24 -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
pmitros
fee4ecf742 Merge pull request #149 from MITx/stable-edx4edx-aws 
Stable edx4edx aws
We may need to switch quickedit, based on feedback from Ike.
 2012-06-26 16:52:46 -07:00
John Jarvis
7b86caafad adding edx4edx_aws for edx4edx aws instance 2012-06-26 19:34:53 -04:00
ichuang
a3b38f2f3f Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx 2012-06-26 23:08:24 +00: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