Kevin Chugh
|
deb3888a84
|
thread response flagging
|
2012-12-06 14:13:54 -05:00 |
|
Kevin Chugh
|
70b0b5beb8
|
update models
|
2012-12-06 10:43:51 -05:00 |
|
Kevin Chugh
|
4139f702ff
|
debugging thread
|
2012-12-06 10:30:06 -05:00 |
|
Kevin Chugh
|
28e86f9602
|
Merge branch 'master' into feature/kevin/flagging
|
2012-12-06 09:31:39 -05:00 |
|
Kevin Chugh
|
50db11a647
|
urls and views for comment flagging
|
2012-12-05 17:08:29 -05:00 |
|
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 |
|
Your Name
|
a0104f6526
|
add flagging interface to replies and comments
|
2012-12-04 11:35:20 -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
|
229a48db85
|
update location of flag abuse, and hook up firing
|
2012-12-01 13:43: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
|
df6c053cc4
|
remove redcar
|
2012-11-29 19:16:23 -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
|
4b017e711d
|
updated models and vies f for flagging
|
2012-11-20 17:00:16 -05:00 |
|
Victor Shnayder
|
62ffc246f7
|
Merge pull request #1070 from MITx/feature/jarv/cert-status-fix
Feature/jarv/cert status fix
|
2012-11-20 12:22:45 -08:00 |
|
John Jarvis
|
6d28be0439
|
Adding management command to grade students who were not previously
graded
|
2012-11-20 15:18:25 -05:00 |
|
John Jarvis
|
b8cfe80145
|
Saving grade for non-passing students
|
2012-11-20 15:18:09 -05:00 |
|
Your Name
|
57b70092e8
|
update front end to handle flagging
|
2012-11-20 13:39:33 -05:00 |
|
David Ormsbee
|
000042e2dd
|
Merge pull request #1068 from MITx/bugfix/victor/dashboard
oops. used wrong variable name.
|
2012-11-20 07:30:35 -08:00 |
|
Victor Shnayder
|
f8dc85b6f8
|
oops. used wrong variable name.
|
2012-11-20 10:28:47 -05:00 |
|
David Ormsbee
|
5a225cade4
|
Merge pull request #1067 from MITx/bugfix/victor/dashboard
cert bugfix: handle students who don't have a grade
|
2012-11-20 06:25:06 -08:00 |
|
Victor Shnayder
|
5a03b53a2f
|
cert bugfix: handle students who don't have a grade
|
2012-11-20 09:20:03 -05:00 |
|
David Ormsbee
|
3648630283
|
Merge pull request #1065 from MITx/content/rocha/gates-foundation-announcement
Update caption of photo on Gates Foundation announcement
|
2012-11-19 13:51:05 -08:00 |
|
Carlos Andrés Rocha
|
3ca4de303b
|
Update caption of photo on Gates Foundation announcement
|
2012-11-19 16:45:38 -05:00 |
|
David Ormsbee
|
a482a41b6c
|
Merge pull request #1064 from MITx/content/rocha/gates-foundation-announcement
Add photo credit to gates foundation press release
|
2012-11-19 13:21:06 -08:00 |
|
Carlos Andrés Rocha
|
4b5e545045
|
Add photo credit to gates foundation press release
|
2012-11-19 16:19:11 -05:00 |
|
David Ormsbee
|
44258c1f09
|
Merge pull request #1063 from MITx/feature/cale/fix-tests-no-askbot
Make tests pass again without askbot
|
2012-11-19 13:06:10 -08:00 |
|
Calen Pennington
|
010bccc8a5
|
Make tests pass again without askbot
|
2012-11-19 16:02:49 -05:00 |
|
David Ormsbee
|
c2ef44443b
|
Merge pull request #1060 from MITx/content/rocha/gates-foundation-announcement
Add photo to the Gate Foundation announcement press release
|
2012-11-19 12:52:43 -08:00 |
|
Carlos Andrés Rocha
|
71db139045
|
Update Gates Foundation press release thumbnail
|
2012-11-19 15:50:17 -05:00 |
|
Victor Shnayder
|
35528d9c22
|
Merge pull request #1061 from MITx/feature/jarv/cert-status-fix
Missing course_id filter for certificate summary
|
2012-11-19 12:44:25 -08:00 |
|
John Jarvis
|
9c9dd05666
|
Missing course_id filter for certificate summary
|
2012-11-19 15:41:00 -05:00 |
|
Carlos Andrés Rocha
|
82262b4ded
|
Fix bug in news carousel on student dashboard
Clicking on the "bullet" selectors was not working correctly.
|
2012-11-19 14:35:04 -05:00 |
|
Carlos Andrés Rocha
|
03c8c54e4a
|
Add photo to the gates foundation announcement
|
2012-11-19 14:32:57 -05:00 |
|
David Ormsbee
|
a9e2b77d6b
|
Merge pull request #1059 from MITx/feature/tom/dashboard-carousel
Add a carousel to display news on the student dashboard
|
2012-11-19 11:09:49 -08:00 |
|
Carlos Andrés Rocha
|
815da69d34
|
Cleanup a bit javascript of news carousel on student dashboard
|
2012-11-19 14:08:00 -05:00 |
|
Carlos Andrés Rocha
|
1afb982e8d
|
Update Gates Foundation news release feed image
|
2012-11-19 13:42:16 -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
|
fd3c5566b8
|
Move press release images to their own folder
|
2012-11-19 13:06:37 -05:00 |
|