Victor Shnayder
|
f8dc85b6f8
|
oops. used wrong variable name.
|
2012-11-20 10:28:47 -05:00 |
|
Brian Talbot
|
a69d3cb064
|
settings - discussion UI revision
|
2012-11-20 09:32:13 -05:00 |
|
Brian Talbot
|
278c731aef
|
settings - made assignment types user-determined fields vs. pre-set types in UI
|
2012-11-20 09:26:40 -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 |
|
Brian Talbot
|
f29f605f62
|
settings - refactored radio/checkbox input formatting
|
2012-11-20 08:40:45 -05:00 |
|
Valera Rozuvan
|
a3db017580
|
Updated crystallography template to reflect changes made in the JS part.
|
2012-11-20 14:19:48 +02:00 |
|
Tom Giannattasio
|
af908104df
|
fixed html tab; started adding upload within widget
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
c233740057
|
cleaning up of asset widget; html tab is broken
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
8abf93cc36
|
search and upload button added to widget
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
9613f92fad
|
asset widget inserts into tiny
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
f16e7b2ede
|
added asset library widget template
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
d521c850de
|
started adding asset widget
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
ac20da3f30
|
removed plugins, adjusted visualEditor reference
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
c7dbdc1242
|
added asset button to visual editor
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
10a4d4ec25
|
tiny mce styling
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
b38072207e
|
primary tiny mce integration
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
9c3c72ad3c
|
discussion editor and preview added; string response glitch fixed
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
daea87ebb9
|
simple html editor added
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
e446ed8118
|
removed stupid console log
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
9c06a4fc07
|
updated cheatsheet to match simpler syntax
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
f8ee3efc7a
|
simplified syntax to match arjun's for string and numerical response
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
f2eb665626
|
cheatsheet and advanced settings added
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
44fb9561e8
|
added a ton of speed editor goodness
|
2012-11-20 07:19:33 -05:00 |
|
Brian Wilson
|
5953be7463
|
fix testing for forum admin privileges
|
2012-11-20 01:38:33 -05:00 |
|
Brian Wilson
|
7ac7f9ef22
|
start work on unit test.
|
2012-11-19 18:12:57 -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 |
|
Don Mitchell
|
7fecf1f212
|
Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
feature/dhm/cms-settings
Conflicts:
cms/static/sass/_settings.scss
cms/templates/settings.html
|
2012-11-19 16:20:12 -05: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 |
|
Don Mitchell
|
241c9bb1ac
|
Checkpoint to rebase
|
2012-11-19 16:02:30 -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 |
|
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 |
|
Calen Pennington
|
4e876b056e
|
Merge pull request #1062 from MITx/fix/cdodge/xmodule-script-load-bug
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript()...
|
2012-11-19 12:52:36 -08:00 |
|
Carlos Andrés Rocha
|
71db139045
|
Update Gates Foundation press release thumbnail
|
2012-11-19 15:50:17 -05:00 |
|
Brian Talbot
|
d370307917
|
settings - simplified course details fields per Mark's feedback and radio/checkbox UI
|
2012-11-19 15:48:57 -05:00 |
|
Chris Dodge
|
ec6b1a12e9
|
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This allows us a single point to define this dependency.
|
2012-11-19 15:46:57 -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 |
|
Brian Wilson
|
ee7a8494e6
|
finish basic implementation of forum admin on instructor dash
|
2012-11-19 14:59:34 -05:00 |
|
Brian Talbot
|
c7784e30fd
|
settings - radio/checkbox UI - wip
|
2012-11-19 14:59:25 -05:00 |
|
Brian Talbot
|
ab87ff6b20
|
settings - field alignment, radio/checkbox formatting
|
2012-11-19 14:55:32 -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 |
|