Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,667 Commits 1 Branch 0 Tags
90a9c386eb67d4201d769544628eff3e28362d2d
Commit Graph

13667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
brianhw
c341975b2a Merge pull request #1072 from MITx/feature/brian/dashboard-manage-mods 
Feature/brian/dashboard manage mods
 2012-11-26 12:52:09 -08:00
Brian Wilson
8d0eb7f1a1 Respond to feedback (esp. use of .format()) 2012-11-26 15:43:18 -05:00
chrisndodge
9723bea5c0 Merge pull request #1079 from MITx/feature/cdodge/tabs-show-only-name-on-preview 
made a special 'module preview' view for Static Tabs in the CMS. Per Tom...
 2012-11-26 11:23:24 -08:00
Chris Dodge
b3dcc140b7 made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button 2012-11-26 14:22:13 -05:00
Brian Talbot
be848023a2 settings - added in example of anon discussions disabled state 2012-11-26 14:21:01 -05:00
Jay Zoldak
7da7bf7481 Add pip install of test requirements, remove askbot requirements. 2012-11-26 14:16:01 -05:00
Brian Talbot
4027576e15 settings - resolved date and time picker UI bugs 2012-11-26 14:01:11 -05:00
Chris Dodge
62fa734c68 added factory_boy to requirements.txt 2012-11-26 13:36:35 -05:00
Brian Talbot
4097bc1022 settings - revised grading slider UI cosmetics 2012-11-26 13:33:57 -05:00
Brian Talbot
ef95e1d95f settings - added in controls for sorting discussion categories 2012-11-26 11:48:56 -05:00
Calen Pennington
8e68573243 Merge pull request #1041 from MITx/fix/cdodge/video-captions 
wire through course asset path information to the video playback module ...
 2012-11-26 08:29:05 -08:00
David Ormsbee
706a825332 Merge pull request #1076 from MITx/feature/cale/rake-improvements 
Provide more info when django has issues when running from rake, and don...
 2012-11-26 08:28:37 -08:00
Calen Pennington
2145ff6d1f Provide more info when django has issues when running from rake, and don't install dependencies of common/lib/libraries before every run of a django command 2012-11-26 11:25:46 -05:00
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