Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

65817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Mongeau
ba959152b6 Login errors should display on first failure. 2012-07-17 13:09:14 -04:00
Galen Frechette
c5ce0bdfea updates copy on about contact and faq, tweeks home page header 2012-07-17 13:02:46 -04:00
Matthew Mongeau
171e16f177 Use local feed as default 2012-07-17 12:56:30 -04:00
Galen Frechette
d55cd78c73 updates and imporves design of the home page header 2012-07-17 12:56:29 -04:00
Matthew Mongeau
2bfe0cb92d Add parsed rss entries to home page with caching 2012-07-17 12:56:28 -04:00
bridger
04b8dbe0d5 Merge pull request #179 from MITx/course_start 
Course start
 2012-07-17 09:54:17 -07: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
b4eb9ffd37 Merge pull request #191 from MITx/template_caching 
Template caching
 2012-07-17 09:50:50 -07:00
bridger
08ddd03b5d Merge pull request #184 from MITx/template_caching 
edX caching
 2012-07-17 09:49:21 -07:00
Bridger Maxwell
615f11e27b Merge remote-tracking branch 'origin/master' into template_caching 2012-07-17 12:47:53 -04:00
Calen Pennington
02a30ef05a Merge pull request #188 from MITx/dormsbee/portal_display_tweaks 
Dormsbee/portal display tweaks
 2012-07-17 08:42:42 -07: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
kimth
934b37c195 Remove json import from capa_problem -- needed for debug 2012-07-17 11:12:23 -04:00
David Ormsbee
b4a8417e70 Use Course.number, remove final exam and content length from the course sidebar (do we have that data yet?) 2012-07-17 11:03:49 -04:00
kimth
803b0c4fd0 Callback uses userid rather than username 2012-07-17 10:59:27 -04:00
David Ormsbee
28fc3ec18a Add overview.html, a simple one page place where course staff can control a course about page. 2012-07-17 10:54:21 -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
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