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

7051 Commits

Author SHA1 Message Date
David Ormsbee
fbd813ae3b disable ENABLE_LMS_MIGRATION in dev mode, so courses are always displayed 2012-08-07 14:55:59 -04:00
Brittany Cheng
39dc6a63da cleanup css 2012-08-07 14:41:28 -04:00
Tom Giannattasio
6295bc3bc5 label font changes 2012-08-07 14:41:20 -04:00
Bridger Maxwell
735488fa51 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 2012-08-07 14:40:37 -04:00
Calen Pennington
a237322b70 Merge pull request #359 from MITx/ichuang/minor-fix-edit-link 
change edit link showhide to use <a> instead of <input> type submit
 2012-08-07 11:40:31 -07:00
ichuang
9d2b821c26 change edit link showhide to use <a> instead of <input> type submit 
(fixes issues with edit links in multipart problems and video)
 2012-08-07 14:34:28 -04:00
Bridger Maxwell
638a5059da Added stores_state attribute for xmoduledescriptors as a way to declare if the module stores state in the database. 2012-08-07 14:34:05 -04:00
Brittany Cheng
ed8595ad95 error styles 2012-08-07 14:31:04 -04:00
Tom Giannattasio
8c366e2d59 tweaking the text editor 2012-08-07 14:25:05 -04:00
Brittany Cheng
7962813014 info styles 2012-08-07 13:53:57 -04:00
Brittany Cheng
49840933c0 error handling 2012-08-07 13:48:43 -04:00
Arjun Singh
26f31324c4 Moving a few static files out of lms into common 2012-08-07 13:39:59 -04:00
thomasxiii
258b9eb530 Merge pull request #349 from MITx/feature/kfiedler/courseware-style 
A bunch of various fixes and de-styling
 2012-08-07 10:20:10 -07:00
Rocky Duan
dbb467365b fixed error field for new post 2012-08-07 12:08:38 -04:00
Rocky Duan
aeb2d73cba Merge branch 'discussion3' of github.com:dementrock/mitx 2012-08-07 12:05:52 -04:00
Rocky Duan
a9b171c81f Merge branch 'discussion3' of github.com:dementrock/mitx 
Conflicts:
	lms/static/coffee/src/discussion/templates.coffee
 2012-08-07 12:05:46 -04:00
Brittany Cheng
391d173018 similar posts styles 2012-08-07 12:05:01 -04:00
Rocky Duan
0560bb7eb7 add hide similar post button 2012-08-07 12:03:41 -04:00
Tom Giannattasio
d5302a0bd0 thread updates: follow/unfollow, grid tweaks 2012-08-07 12:00:17 -04:00
Kyle Fiedler
dd6ec19e80 Make the modal window work in the courseware 2012-08-07 11:59:49 -04:00
Brittany Cheng
4b9358fb72 similar posts styles 2012-08-07 11:55:31 -04:00
kimth
a9a19f40c3 Merge master 2012-08-07 11:51:44 -04:00
kimth
b6dc622e42 Remove temporary datetime 2012-08-07 11:43:00 -04:00
Rocky Duan
0863e34619 display actual username 2012-08-07 11:40:58 -04:00
kimth
c39edb650b StudentModule lookups in queue callback use target user, rather than request.user 2012-08-07 11:38:04 -04:00
Brittany Cheng
5bec964606 Merge branch 'master' of github.com:dementrock/mitx into discussion3 2012-08-07 11:36:34 -04:00
Rocky Duan
547114a823 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-07 11:31:26 -04:00
Rocky Duan
6c2f53a495 to make it appear at least normal.. 2012-08-07 11:28:52 -04:00
Tom Giannattasio
00a72cf86a updated thread styles: voting, actions, comments, sort 2012-08-07 11:27:13 -04:00
Rocky Duan
25c05e702e Merge branch 'brittany' of github.com:dementrock/mitx 2012-08-07 11:23:19 -04:00
Rocky Duan
0c311b8f13 search for similar posts without any styling.. 2012-08-07 11:22:41 -04:00
Brittany Cheng
1fb0e352b4 blank slate 2012-08-07 11:10:24 -04:00
Victor Shnayder
932a9be747 Make tests pass again 
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
 2012-08-07 11:06:47 -04:00
Tom Giannattasio
2135ed5015 added vote arrows 2012-08-07 10:16:08 -04:00
ichuang
462d75936a Merge pull request #357 from MITx/hotfix-registration 
fix typo in registration button jquery
 2012-08-07 07:11:53 -07:00
ichuang
4b2091b173 fix typo in registration button jquery 2012-08-07 10:09:55 -04:00
Brittany Cheng
87019c4bcb Merge branch 'master' of github.com:dementrock/mitx into discussion3 2012-08-07 10:07:30 -04:00
Calen Pennington
c5fa6bac89 Merge pull request #353 from MITx/ichuang/showhide-staff-debug 
make the staff debug information appear in a show/hide span
 2012-08-07 05:43:14 -07:00
Bridger Maxwell
3dffcaca1c Fixed capitalization in gradebook css. 2012-08-07 08:42:08 -04:00
Bridger Maxwell
3a52e86a87 Fixed weighting of individual problems. Unmodified problems have weight None, not 1. 2012-08-07 08:00:06 -04:00
Arjun Singh
fb6dbb120e Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory. 2012-08-07 03:28:35 -04:00
Rocky Duan
77900bd761 simple blank slate 2012-08-06 23:17:38 -04:00
Rocky Duan
42cab65903 make behavior consistent with normal mathjax 2012-08-06 23:05:05 -04:00
Rocky Duan
26a80f2d9b fixed escape recovering bug 2012-08-06 23:00:38 -04:00
Rocky Duan
0ae68e7324 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-06 22:38:31 -04:00
Rocky Duan
5679b0da5d sort by activity 2012-08-06 22:25:15 -04:00
Rocky Duan
c2e2cd40a4 fixed display mode single character bug 2012-08-06 22:21:10 -04:00
Rocky Duan
d33ddec470 fixed multiple renderer bug 2012-08-06 22:20:56 -04:00
ichuang
fa8bf7f371 make the staff debug information appear in a show/hide span 2012-08-06 21:54:29 -04:00
Rocky Duan
fe02d04f07 use raw title 2012-08-06 21:46:33 -04:00