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

1221 Commits

Author SHA1 Message Date
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
Victor Shnayder
76f0cf4a86 remove (almost) all references to askbot. 2012-11-09 18:18:33 -05:00
Victor Shnayder
fb3b52b99f refactor + style self-assessment in progress 2012-11-08 18:01:09 -05:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -04:00
Carlos Andrés Rocha
e4daad4327 Update Job Page with new positions 2012-10-24 20:30:54 -04:00
Calen Pennington
cac8e3453c Remove more remnants of askbot 2012-10-23 13:40:50 -04:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
 2012-10-23 13:38:11 -04:00
Tom Giannattasio
a9ba3543d3 styled edge registration form 2012-10-12 11:18:55 -04:00
Calen Pennington
c41c084b39 Wire up login and register forms for edx landing page 2012-10-12 09:55:32 -04:00
Arjun Singh
71201a73b2 styles and tiny bit of logic for community tas 2012-10-12 04:54:56 -07:00
Tom Giannattasio
51a19b3d7e transferred edge styles from cms to lms 2012-10-11 14:02:13 -04:00
Victor Shnayder
36917b0036 Merge pull request #829 from MITx/feature/tomg/ie-banner 
added ie warning banner to courseware; displayed by ie conditional style...
 2012-10-05 13:53:15 -07:00
Tom Giannattasio
1804d5410c fixed ie banner showing outside of courseware bug 2012-10-04 15:50:02 -04:00
Tom Giannattasio
49bd3ac905 added ie warning banner to courseware; displayed by ie conditional stylesheet 2012-10-04 15:34:50 -04:00
Tom Giannattasio
69f8734893 changed vote button icon display mode to fight zoom bugs 2012-10-04 14:09:01 -04:00
Tom Giannattasio
a15ef161a9 ff bug fix 2012-10-03 10:59:24 -04:00
Victor Shnayder
2f30a717a5 only display site status inside the courseware 2012-10-02 16:54:03 -04:00
Tom Giannattasio
18a66a0b9c styled site status banner 2012-10-02 13:36:36 -04:00