Commit Graph

1154 Commits

Author SHA1 Message Date
Kevin Chugh
c4be2b514a update coffee 2012-12-05 13:25:22 -05:00
Your Name
70d0fd11b7 Merge branch 'feature/kevin/flagging' of github.com:MITx/mitx into feature/kevin/flagging 2012-12-05 11:21:16 -05:00
Your Name
3a7624d384 modify verbiage of flagging 2012-12-05 11:20:31 -05:00
marco
13581bcfcb updated flag icons to have proper transparency 2012-12-04 15:47:58 -05:00
Your Name
8ad01c7340 fix comments and replies 2012-12-04 15:47:42 -05:00
marco
81dae33f1c added flag-label coloring css 2012-12-04 14:58:28 -05:00
Your Name
a5a38c0116 fix conflict 2012-12-04 14:09:46 -05:00
Your Name
6a19f4e02a changes to underscore template 2012-12-04 14:08:39 -05:00
marco
64663c34dd added flag resources 2012-12-04 14:04:31 -05:00
Kevin Chugh
af04f5a31b got flagging to work 2012-12-03 00:09:57 -05:00
Your Name
033ed6ce92 flagging done except returning abuse flaggers 2012-12-02 15:05:03 -05:00
Kevin Chugh
4dee832f35 convert flagging to one flag 2012-12-02 13:04:27 -05:00
Your Name
ab262b4052 attempt to update front end with new assets 2012-11-30 17:12:06 -05:00
Kevin Chugh
c2b13e0a3c added temporary flagging assets 2012-11-29 23:43:56 -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
Your Name
57b70092e8 update front end to handle flagging 2012-11-20 13:39:33 -05:00
Your Name
fb6a07c812 allow flagging for abuse and spoilers 2012-11-16 18:39:54 -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
David Ormsbee
1ab7019607 Merge pull request #1044 from MITx/feature/brian/press-updates
Feature/brian/press updates
2012-11-14 10:01:16 -08:00
Brian Wilson
515d2f4b1e add press mentions for October, update missing logos, and add sorting. 2012-11-14 11:55:08 -05:00
Brian Wilson
f9f5850a55 update press page mentions through September, and home page pointers for early November. 2012-11-12 23:14:20 -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
Vik Paruchuri
8734e492de added back in ie css file that was accidentally removed 2012-11-02 09:23:36 -04:00
Vik Paruchuri
8557007195 removed some extra files, undid changes to html module 2012-11-02 09:22:23 -04:00
Vik Paruchuri
99b0795e59 replaced removed file from master 2012-11-01 15:10:05 -04:00
Vik Paruchuri
62d1f1fe3e update gitignore for pycharm 2012-10-30 20:14:55 -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
Carlos Andrés Rocha
2f7733ede0 Add Cengage book press release 2012-10-18 14:45:42 -04:00
Carlos Andrés Rocha
b121e620f8 Make small corrections to UT pages and announcement 2012-10-15 11:54:23 -04:00
Carlos Andrés Rocha
b13412d3b2 Make corrections of UT announcement 2012-10-15 11:12:35 -04:00
Carlos Andrés Rocha
c5a148639d Add announcement of UT joining edx and related changes 2012-10-15 06:57:50 -04:00
Arjun Singh
d7b237ce0a more removal of data("id") in favor of attr("data-id") 2012-10-12 14:47:44 -07:00
David Ormsbee
f5f1e858d5 Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids
Hotfix/arjun/fix integer disc ids
2012-10-12 11:38:28 -07:00
Arjun Singh
71201a73b2 styles and tiny bit of logic for community tas 2012-10-12 04:54:56 -07:00
Arjun Singh
6fbf2f9720 revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved 2012-10-12 04:22:27 -07: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