Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2939 Commits

Author SHA1 Message Date
Diana Huang
37f261f906 Move peer grading so that there are the individual problem pages 
and the problem list page
 2013-01-02 15:01:59 -05:00
Brian Talbot
e170afa927 test center registration - forgot to add/commit corresponding SASS file 2012-12-21 13:23:20 -05:00
Brian Talbot
3987120496 test center registration - further UI design and styling on form and dashboard tweaks 2012-12-21 13:04:22 -05:00
Carlos Andrés Rocha
22de7cbb4e Add logic to display courses by start date and show the new overlay 2012-12-20 20:05:11 -05:00
Brian Talbot
5119257f3e test center - fixed dashboard link font issue and started cleaning up markup in reg form - wip 2012-12-20 12:24:31 -05:00
Brian Talbot
37e0d98fec course listings - new html and css for ordering - wip 2012-12-20 09:32:15 -05:00
Brian Talbot
4d13744622 added new visual status to course listings on edx.org 2012-12-19 16:56:32 -05:00
Calen Pennington
6905f7dfd1 Merge pull request #1183 from MITx/bug/dhm/ie7 
Bug/dhm/ie7
 2012-12-19 12:58:07 -08:00
Carlos Andrés Rocha
6d85accad8 Add news announcement for spring 2013 courses 
[# 41258693]
 2012-12-19 11:49:55 -05:00
Don Mitchell
326d21d143 ie7 fixes: define indexOf, use charAt rather than [] to access string, 
put try/catch around fn that was throwing errors.
 2012-12-19 10:48:03 -05:00
Tom Giannattasio
f3067cd8c8 restyling of dashboard with pearson exam notifications 2012-12-14 16:17:03 -05:00
Tom Giannattasio
d1520792b8 removed extra width 2012-12-12 17:00:54 -05:00
Tom Giannattasio
b4321931a0 pearson ie7 bugs fixed (ish) 2012-12-12 16:59:38 -05:00
Don Mitchell
d1c0eb8fc2 Somehow linked file disappeared again. 2012-12-12 10:55:57 -05:00
Kevin Chugh
6e108c7531 fix conflict 2012-12-10 19:30:04 -05:00
Victor Shnayder
df578de11f Merge pull request #1119 from MITx/diana/open-ended-response-styling 
Updates to the styling of open ended problems
 2012-12-10 11:36:04 -08:00
Victor Shnayder
c5c4305f9e Merge pull request #1110 from MITx/diana/instructor-grading-styling 
Updates to the instructor grading pages
 2012-12-10 10:39:19 -08:00
Diana Huang
3156c2b393 Add icon to the grading message 2012-12-10 12:29:46 -05:00
Diana Huang
cc72870aac Make oepn-ended responses and self-assessment answers use 
the same CSS
 2012-12-10 11:00:28 -05:00
Carlos Andrés Rocha
faae6a36dc Merge pull request #1107 from MITx/content/btalbot/new-universities 
Add Georgetown news announcement, landing page and updated FAQ

[Finished cd#40805397 #40805401]
 2012-12-10 03:32:41 -08:00
Diana Huang
5030c9d35b Cleanup of the meta information styles and make 
the feedback box less important.
 2012-12-07 17:01:27 -05:00
Diana Huang
1026c64111 Fix up some more of the meta info container 2012-12-07 17:01:27 -05:00
Diana Huang
aee1e5e9a9 Updates to the list view and error container 2012-12-07 17:01:27 -05:00
Diana Huang
ffa42b6f11 Styles for the new instructor grading interface 2012-12-07 17:01:27 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
Brian Talbot
cc870f8ecd homepage - changed partner university listing layout to handle 6 partners 2012-12-06 14:37:09 -05:00
Kevin Chugh
28e86f9602 Merge branch 'master' into feature/kevin/flagging 2012-12-06 09:31:39 -05:00
marco
81dae33f1c added flag-label coloring css 2012-12-04 14:58:28 -05:00
marco
64663c34dd added flag resources 2012-12-04 14:04:31 -05:00
Your Name
ab262b4052 attempt to update front end with new assets 2012-11-30 17:12:06 -05:00
Victor Shnayder
d2cc8696ed Add some initial css. 2012-11-30 10:03:31 -05:00
Kevin Chugh
9a19518fa7 flagging set up in css and thread template 2012-11-29 19:15:47 -05:00
Your Name
a22dd5ebb7 flagging interface updates 2012-11-29 17:31:40 -05:00
Carlos Andrés Rocha
d4f5f17381 Remove unused askbot/discussion sass stylesheets 
The unused styles are referencing images that no longer exisit,
breaking collectstatic and therefore tests.
 2012-11-27 19:06:03 -05:00
David Ormsbee
658c92037c Revert "Make tests pass again without askbot" -- that commit removed 
scss files that were still being partially used by the current
discussion forum.

This reverts commit 010bccc8a5.
 2012-11-20 18:43:00 -05:00
Calen Pennington
010bccc8a5 Make tests pass again without askbot 2012-11-19 16:02:49 -05:00
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-11-19 16:00:27 -05:00
Carlos Andrés Rocha
1a2cee360a Update news releases images 
[Delivers #39472239]
 2012-11-19 13:06:37 -05:00
Carlos Andrés Rocha
b417002a23 Fix image size of news images on the student dashboard 
[#39472239]
 2012-11-19 13:06:36 -05:00
Tom Giannattasio
423de1868d added carousel to dashboard page 2012-11-19 12:45:46 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Victor Shnayder
92ab5af627 bigger error messages 2012-11-12 16:23:40 -05:00
Victor Shnayder
6a313fd562 more css tweaks 2012-11-12 13:17:26 -05:00
Victor Shnayder
0ad2154b86 merge in origin/master 2012-11-12 13:10:21 -05:00
Victor Shnayder
2b55c5906d css tweaks 2012-11-12 13:09:16 -05:00
Victor Shnayder
2846c61d15 Revert "remove (almost) all references to askbot." 
This reverts commit 793354a0dc.
 2012-11-09 18:18:37 -05:00
Brian Talbot
c6bfb67b1a revised no certificate state for dashboard messages and removed course message UI for future work on separate branch 2012-11-09 18:18:36 -05:00
Brian Talbot
d155869f16 added in course-wide completion message static states and styling 2012-11-09 18:18:36 -05:00
Brian Talbot
be13bc6026 added in completed course status to dashboard and certificate availability states 2012-11-09 18:18:36 -05:00