Chris Dodge
|
6d45445aef
|
assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility
|
2012-11-26 11:19:51 -05:00 |
|
Chris Dodge
|
2d7f1b73d7
|
consolidate logic to compute caption path to server-side, we don't need to do this client-side
|
2012-11-26 11:19:51 -05:00 |
|
Chris Dodge
|
71f16d40e1
|
wire through course asset path information to the video playback module and corresponding .coffee files
|
2012-11-26 11:19:51 -05:00 |
|
Calen Pennington
|
4e3da342d7
|
Merge pull request #1048 from MITx/feature/cdodge/xlint
Feature/cdodge/xlint
|
2012-11-26 08:11:34 -08:00 |
|
Chris Dodge
|
fff3782884
|
cleave xlint entry point in xml_importer.py to be separate from the import method
|
2012-11-26 11:05:57 -05:00 |
|
Tom Giannattasio
|
f2fec99efa
|
fixed header float bug
|
2012-11-26 10:46:02 -05:00 |
|
Calen Pennington
|
ee618d4223
|
Merge pull request #1069 from MITx/feature/cas/tom/lms-styles
added basic lms styles
|
2012-11-26 06:57:57 -08:00 |
|
Tom Giannattasio
|
86ebba3f0e
|
removed askbot
|
2012-11-26 09:55:37 -05:00 |
|
Calen Pennington
|
c6a9f722cc
|
Merge pull request #1049 from MITx/feature/jzoldak/cms-unit-testing
Add Studio integration with factory boy for creating XModule objects in the data store
|
2012-11-26 06:54:50 -08:00 |
|
Calen Pennington
|
2b6e2b5143
|
Merge pull request #1056 from MITx/bugfix/ichuang/xml_importer
xml_importer bugfix - when importing without policy override use course_location
|
2012-11-26 06:54:22 -08:00 |
|
chrisndodge
|
b250cad6ee
|
Merge pull request #1075 from MITx/fix/cdodge/env-bad-checkin
fix edit conflict
|
2012-11-26 06:44:59 -08:00 |
|
Chris Dodge
|
2524cd614a
|
fix edit conflict
|
2012-11-26 09:36:59 -05:00 |
|
Brian Wilson
|
3b29ab373d
|
check for staff access before creating forum admin
|
2012-11-26 01:27:16 -05:00 |
|
Александр
|
01b5992372
|
comment outputs
|
2012-11-22 18:53:35 +02:00 |
|
Александр
|
4b4b2c9927
|
added documentation, tests, and rounding to closes 0.05 value
|
2012-11-22 18:44:31 +02:00 |
|
Александр
|
77c831eb10
|
documenation for chem.miller
|
2012-11-22 18:43:41 +02:00 |
|
Valera Rozuvan
|
3e8e576e28
|
Slight change in caption for lattice select.
|
2012-11-22 16:52:59 +02:00 |
|
Valera Rozuvan
|
37714d45ac
|
Merge branch 'feature/alex/crystallography-update-mitx' of github.com:MITx/mitx into feature/alex/crystallography-update-mitx
|
2012-11-22 13:56:00 +02:00 |
|
Valera Rozuvan
|
19c463b739
|
Removed radio buttons for selecting the intersection type from crystallography template.
|
2012-11-22 13:55:50 +02:00 |
|
Александр
|
166ff823a7
|
removed hidden parameter to template, style='hidden' is set by default for input
|
2012-11-22 12:53:21 +02:00 |
|
Don Mitchell
|
0ebdbb92ca
|
Merge branch 'feature/btalbot/cms-settings' of
git@github.com:MITx/mitx.git into feature/dhm/cms-settings
Conflicts:
cms/static/sass/bourbon
lms/static/sass/bourbon
|
2012-11-21 15:29:35 -05:00 |
|
Don Mitchell
|
f0c94a2c7e
|
Beginning test of details tab.
|
2012-11-21 15:17:18 -05:00 |
|
Brian Talbot
|
baf8b481c8
|
settings - added in drag and drop anchors - wip
|
2012-11-21 13:58:56 -05:00 |
|
Александр
|
111667defd
|
UI delta and tests:
|
2012-11-21 19:02:40 +02:00 |
|
Александр
|
33159824a5
|
added test for lattices
|
2012-11-21 18:02:48 +02:00 |
|
Александр
|
d5dd725537
|
miller indices calculation
|
2012-11-21 17:53:51 +02:00 |
|
Valera Rozuvan
|
aaeffa5316
|
Updated template for crystallography so that it corresponds to the cnahges made in the JS part.
|
2012-11-21 16:52:17 +02:00 |
|
David Ormsbee
|
471ae42d1d
|
Merge pull request #1071 from MITx/bugfix/dave/fix_inline_discuss_css
Fix inline discuss CSS
|
2012-11-20 16:04:49 -08:00 |
|
David Ormsbee
|
0a66ef1acc
|
Redo the part of 010bccc8a5 that address the test failure
|
2012-11-20 18:45:17 -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 |
|
Your Name
|
4b017e711d
|
updated models and vies f for flagging
|
2012-11-20 17:00:16 -05:00 |
|
Brian Wilson
|
57cb8c1e21
|
Add unit tests
|
2012-11-20 15:56:18 -05:00 |
|
Brian Wilson
|
619ac10069
|
Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods
|
2012-11-20 15:46:49 -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 |
|
Tom Giannattasio
|
a98cead8ee
|
added basic lms styles
|
2012-11-20 13:02:08 -05:00 |
|
Don Mitchell
|
f8ee5c2614
|
Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
feature/dhm/cms-settings
Conflicts:
cms/templates/settings.html
|
2012-11-20 11:55:19 -05:00 |
|
Don Mitchell
|
339949f934
|
Another checkpoint before pull/merge
|
2012-11-20 11:37:14 -05:00 |
|
Brian Talbot
|
6c3c377619
|
settings - general class/ID naming convention cleaning
|
2012-11-20 11:34:16 -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 |
|
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 |
|