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

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kimth
269468ba6e CorrectMap.is_queued and .is_right_queuekey defaults to False if answer_id not found 2012-07-17 10:47:10 -04:00
kimth
0958485b46 update_score: edit existing CorrectMap rather than starting with empty CorrectMap 2012-07-17 10:31:21 -04:00
Calen Pennington
c85cf38a3f Merge pull request #187 from MITx/dormsbee/portal_display_tweaks 
Dormsbee/portal display tweaks
 2012-07-17 06:26:03 -07:00
Calen Pennington
f6cc97a9ce Minor formatting change in OSX docs for CMS import 2012-07-17 09:22:17 -04:00
Calen Pennington
17c3d068cf Add basic documentation of importing data into the CMS for development 2012-07-17 09:20:54 -04:00
David Ormsbee
c0e8dc1b69 Remove duplicate entries of courses. 2012-07-17 08:25:17 -04:00
David Ormsbee
373db8704d Add number property to CourseDescriptor and switch templates to use it. 2012-07-17 08:22:15 -04:00
David Ormsbee
27ec1b4dcf Change course listing to show course numbers + title 2012-07-17 08:22:15 -04:00
David Ormsbee
e8516c5a3e Shorten course about link 2012-07-17 08:22:15 -04:00
David Ormsbee
d20eb07722 Allow UTF-8 chars in about sections. 2012-07-17 08:22:15 -04:00
Bridger Maxwell
d38903ac35 Merge remote-tracking branch 'origin/master' into template_caching 
Conflicts:
	lms/static/sass/application.css
 2012-07-16 23:33:40 -04:00
Galen Frechette
767469381b renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling 2012-07-16 22:23:43 -04:00
Galen Frechette
600aff59a6 imporves course object header typography 2012-07-16 19:29:02 -04:00
Bridger Maxwell
36408a8d5a Removing lms/static/sass/application.css again. 2012-07-16 17:33:51 -04:00
Galen Frechette
96361c3fd5 adds icons to course about page, user nav and dashboard, adds styles to activation pages 2012-07-16 17:29:28 -04:00
Bridger Maxwell
e7fa42261d Ignoring +lms/static/sass/application.css 2012-07-16 17:11:27 -04:00
ichuang
ffb341f6b3 Merge pull request #186 from MITx/ccp0101/capa_pythonpath 
Ccp0101/capa pythonpath
 2012-07-16 14:06:28 -07:00
Bridger Maxwell
d690a0de24 Removing compiles application.css file. 2012-07-16 17:03:31 -04:00
Arjun Singh
8365c2fdad Merge branch 'master' into ccp0101/capa_pythonpath 2012-07-16 16:54:51 -04:00
Arjun Singh
0682401841 Allows for additional paths when executing code in a loncapa problem. Adds a default path of data/course/code. 2012-07-16 16:53:38 -04:00
kimth
093ac9d101 CorrectMap in LMS keeps track of problems as being queued 2012-07-16 16:19:35 -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
70e2f7c0d5 Merged with master. Moved a bunch of static template files to their own urls (without /t/template). 2012-07-16 15:32:22 -04:00
Victor Shnayder
c343734297 Merge pull request #183 from MITx/victor/cms_more_auth 
Add fixes to notes in #182
 2012-07-16 11:12:58 -07:00
Victor Shnayder
f8ce11a6b5 Add fixes to notes in #182 
* use 'location' instead of 'id' in views.
* still need to change names in the coffeescript--quick fix didn't work
 2012-07-16 14:08:03 -04:00
Calen Pennington
f887827917 Merge pull request #182 from MITx/victor/cms_more_auth 
Victor/cms more auth
 2012-07-16 10:45:06 -07:00
Bridger Maxwell
960c8619e5 Added a cache_if_anonymous decorator. 2012-07-16 13:40:17 -04:00
Galen Frechette
2d3bab4188 styles activation message 2012-07-16 13:34:12 -04:00
Victor Shnayder
97a2422662 simplify rakefile a bit in response to comments on #178 2012-07-16 13:34:05 -04:00
Victor Shnayder
caf163eb41 fix description of mitxmako 2012-07-16 13:34:05 -04:00
Victor Shnayder
49576f9ddb address comments in pull #178 2012-07-16 13:34:05 -04:00
Victor Shnayder
5609ca6e2b remove empty marketing template 2012-07-16 13:34:05 -04:00
Victor Shnayder
d10f49d74b add reg_complete template 2012-07-16 13:34:05 -04:00
Victor Shnayder
ddf84d807d add login and logout links to cms header 2012-07-16 13:34:04 -04:00
Victor Shnayder
acd57fb7c5 Save author info in commit messages. 
* add optional author_str param to export_to_github
* pass the django user info to that param
 2012-07-16 13:34:04 -04:00
Victor Shnayder
942ea2c7ba fix typo 2012-07-16 13:34:04 -04:00
Victor Shnayder
5a766c085d Fix signup form link 2012-07-16 13:34:04 -04:00
Victor Shnayder
264a5b5557 fix repo paths (to data/) 2012-07-16 13:34:04 -04:00
Victor Shnayder
3f356bfb1b Add basic framework for checking permissions 
* add dummy has_access(user, location) method
* re-organize views by type of access checking needed.
 2012-07-16 13:34:04 -04:00
Victor Shnayder
c176a7fe92 Add account creation and login to CMS 
* connect up views from student app
* Add initial @login_required decorators on the protected views
* Add tests for some of the basic functionality
 2012-07-16 13:34:04 -04:00
Galen Frechette
5033ec656c changes home page header design to accomodate new tagline, adds copy to about page and 1 blog post 2012-07-16 13:11:47 -04:00
Bridger Maxwell
ed624d0b72 Cleaned up check_course decorator a bit. 2012-07-16 12:54:24 -04:00
Bridger Maxwell
4f4e751321 Merge 2012-07-16 12:42:49 -04:00
Calen Pennington
f889c9a099 Actually exclude things outside of the mitx repo, rather than only including those things 2012-07-16 12:36:52 -04:00
Calen Pennington
04469a4e8e Strip out STATICFILES_DIRS that aren't in the mitx repo when running unit tests 2012-07-16 12:13:19 -04:00
Bridger Maxwell
0c41576e1e Some changes from code review. 2012-07-16 12:06:17 -04:00
Calen Pennington
8ef8162963 Fix courseware problem display 2012-07-16 11:41:51 -04:00
Calen Pennington
ab2995fc85 Remove compiled css files 2012-07-16 11:41:18 -04:00
kimth
838a8624c9 Add docstring to 'score_update' path 2012-07-16 11:28:26 -04:00
Bridger Maxwell
264e324c50 Changed format of start date parsing to ISO 8601 2012-07-16 11:27:13 -04:00