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

94 Commits

Author SHA1 Message Date
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
ichuang
5d9c600de8 3.091x static link 2012-06-26 19:04:51 -04:00
ichuang
a1b53c3cd6 add 3.091x to multicourse 2012-06-26 18:40:07 -04:00
ichuang
9aeaaa72a9 configuration running on content server: lms/envs/dev_edx4edx 2012-06-26 14:07:14 +00:00
ichuang
caa14922bb edx4edx configuration running on content server. Notes: 
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
  - email backend set
  - index page modified for edx4edx
 2012-06-26 14:04:56 +00:00
ichuang
b59b80871a add edit link to module pages with filenames (html & problem) 
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
 2012-06-24 14:46:02 -04:00
ichuang
84e59a54e6 improved symmath error handling for matrix shape mismatch 2012-06-23 17:05:09 -04:00
ichuang
62f1717972 add more loncapa check functions (choose, rad2deg, deg2rad) 2012-06-23 16:20:05 -04:00
ichuang
bccdeb2a90 fix quickedit.html for latest css 2012-06-23 16:19:41 -04:00
ichuang
bb5278c63b Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx 2012-06-22 18:28:27 -04:00
Kyle Fiedler
9e8f20104c added styles for ol in html units 2012-06-22 11:17:31 -04:00
ichuang
37539fdd4b revised 8.01x entry in dev_ike 2012-06-21 23:35:48 -04:00
ichuang
6566c45e6f use pipeline 2012-06-21 21:40:41 -04:00
ichuang
3cd02f6edc Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx 2012-06-21 21:31:36 -04:00
ichuang
31226f58b8 updated dogfood to match latest xmodule mods in master 2012-06-21 21:28:21 -04:00
ichuang
93b8ad3e4d Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-06-21 16:46:56 -04:00
Kyle Fiedler
82023f6bd3 Added styles for more basic html elements and reworked design of textinput 2012-06-21 15:41:36 -04:00
Kyle Fiedler
184d0ab038 added styles for lists and paragraphs in problems 2012-06-21 15:41:36 -04:00
ichuang
a892752b89 add 18.06x to dev_ike.py 2012-06-20 22:16:35 -04:00
Victor Shnayder
5e7535fbfb Progress tracking cleanup. 
* use clearer names for the two status strings passed to js
* add functions to do canonical conversion of progress to js string
* fix updating bug in sequence.coffee
* add some todo comments and other docs to make future expansion easier
 2012-06-20 16:04:03 -04:00
Victor Shnayder
85bee9b42b Initial UI for sequence progress. 
* change bottom border of links:
  red for not started
  yellow for in_progress
  green for done

* This should probably be designed at some point.
* Obvious problems: the yellow is not very visible, and lots of people are
  red/green color-blind.
 2012-06-20 16:04:03 -04:00
Calen Pennington
215085345c Fix other references to jquery after update to latest version 2012-06-20 15:06:49 -04:00
Victor Shnayder
b24c4d4626 Fix render of lms index with no chapter or section. 2012-06-20 11:31:21 -04:00
Calen Pennington
c317521468 Merge pull request #126 from MITx/victor/progress-tracking 
Victor/progress tracking
 2012-06-20 07:33:48 -07:00
Calen Pennington
7710e7a6a4 Merge pull request #125 from MITx/victor/fix_accordion 
Fix accordion rendering bug
 2012-06-20 05:36:41 -07:00
Calen Pennington
65d02819e8 Merge pull request #124 from MITx/cpennington/cms-pipeline 
Switch cms over to django pipeline
 2012-06-20 05:35:49 -07:00
Victor Shnayder
b963d8b534 Initial progress display. 
* add module_from_xml param to I4xSystem
* use it to implement xmodule.get_children()
* fix a few comments here and there
* Render-time progress display for seq and vertical modules.
  - Computes fraction of subproblems done.
* Pass problem state back to js during ajax calls.
* general cleanup in capa_module.py
* add progress_changed and progress fields to json returned from each ajax handler

* Coffeescript changes to hook up sequence tracking of problem progress

* net result: sequence 'a' tags now have a progress class
* properly set css class on initial load
* fire event when progress changes after ajax calls
* also save state in 'progress' property of problems-wrapper tag
* event handler finds those tags, computes updated progress
 2012-06-19 18:28:45 -04:00
Victor Shnayder
39c57af849 remove obsolete comment 2012-06-19 16:37:33 -04:00
Victor Shnayder
a6fc27acd6 Fix accordion rendering bug 
* needed to clean the chapter and section vars before rendering
 2012-06-19 16:19:45 -04:00
Prem Sichanugrist
afaed83158 Update jQuery and jQuery-UI to latest version 2012-06-19 14:31:00 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
ef6630d733 Merge pull request #120 from MITx/cpennington/cms 
CMS Beginnings
 2012-06-18 13:01:39 -07:00
Calen Pennington
34a696cdf6 Merge branch 'master' into cpennington/cms 
Conflicts:
	rakefile
	requirements.txt
 2012-06-18 13:46:33 -04:00
Calen Pennington
51cd7566a0 Merge pull request #119 from MITx/victor/render-path-cleanup 
put lambda function back in, as requested during code review
 2012-06-18 10:21:41 -07:00
Calen Pennington
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -04:00
Victor Shnayder
7e73f0ede0 put lambda function back in, as requested during code review 2012-06-18 13:12:47 -04:00
Calen Pennington
4ce08cc358 Merge pull request #118 from MITx/victor/render-path-cleanup 
Small cleanups in response to Calen + Piotr's comments
 2012-06-18 09:12:55 -07:00
Piotr Mitros
f391e9c51c Courseware can have same random seed in multiple problems for exam. Slight hack. 2012-06-18 12:10:44 -04:00
Victor Shnayder
96cbb3d33b Small cleanups in response to Calen + Piotr's comments 2012-06-18 12:04:10 -04:00
Calen Pennington
40a950f152 Merge pull request #105 from MITx/ps-video-volume 
Add video volume control to video player
 2012-06-18 09:02:02 -07:00
Calen Pennington
b344e51c0f Merge pull request #116 from MITx/victor/render-path-cleanup 
Victor/render path cleanup
 2012-06-18 08:59:10 -07:00
ichuang
748398fca1 for externalresponse - fallback to script code if <answer> code not provided 2012-06-17 22:36:39 -04:00
ichuang
0dbe63bc63 remove quickedit link from accordion (no need for manual gitreload anymore) 
now using github WebHook
 2012-06-15 21:44:19 -04:00
Victor Shnayder
e061e86424 Clean and refactor courseware/views.py and module_render.py 
* Refactor index() so that it makes sense to me and hopefully others :)
* Rename preloaded cache of student modules to student_module_cache
* Fix line length and whitespace throughout
* add docstrings and other comments
* a few behavior-preserving tweaks to the code to make it clearer.
* Separate codepaths for with-module and without-module in index view
* Remove default chapter + section, since they don't exist anyway in course.xml
 2012-06-15 18:29:04 -04:00