Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,228 Commits 1 Branch 0 Tags
4e3e2ec707ff409ec8a2fb4a332cfc19a744a28e
Commit Graph

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
46870f4391 be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling 2012-11-29 15:09:28 -05:00
Calen Pennington
4646f36b58 Merge pull request #1078 from MITx/feature/jzoldak/jenkins-cleanup 
Add pip install of test requirements, remove askbot requirements.
 2012-11-29 11:26:20 -08:00
Chris Dodge
050cb89cf7 fix crash with working with custom tags with XML filestore 2012-11-29 13:24:41 -05:00
Chris Dodge
021ed3bca6 fix crash with working with custom tags with XML filestore 2012-11-29 13:24:07 -05:00
Victor Shnayder
82cf37b2b6 Merge pull request #1085 from MITx/feature/victor/fix-self-assessment 
Feature/victor/fix self assessment
 2012-11-29 10:20:41 -08:00
chrisndodge
89ad8cc564 Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup 
Static tabs cleanup
 2012-11-29 06:49:28 -08:00
jarv
68158b39ca Merge pull request #1083 from MITx/fix/rocha/create-dev-env 
Move APT dependencies and repos to their own files
 2012-11-29 05:48:44 -08:00
Carlos Andrés Rocha
6d97a535b3 Move APT dependencies and repos to their own files 2012-11-28 19:13:31 -05:00
Carlos Andrés Rocha
41142ab56a Add mongodb to create-dev-env.sh script 2012-11-28 19:13:11 -05:00
Carlos Andrés Rocha
796369c137 Fix installation of coffeescript and ruby on linux 2012-11-28 19:12:37 -05:00
Brian Wilson
9bfa800208 add non-ascii data to toy dataset 2012-11-28 18:28:40 -05:00
Brian Wilson
6a24ecebe7 decode utf-8 when reading html, and encode when writing. 2012-11-28 17:54:18 -05:00
Don Mitchell
c0da6e4249 Details done except for syllabus 2012-11-28 17:10:41 -05:00
Brian Talbot
a2f00c383f gradable sections - adding in assets and markup - wip 2012-11-28 16:12:34 -05:00
Tom Giannattasio
6cfabb76c1 finished styling for static tabs; required some rework of global styles 2012-11-28 15:39:43 -05:00
Tom Giannattasio
6ad8a9aced most of the styling and function changes made 2012-11-28 15:10:46 -05:00
Victor Shnayder
4b58cb9560 Fix attempt tracking, fix test 
- increments attempts on any transition to DONE state
 2012-11-28 15:04:07 -05:00
Victor Shnayder
0a1b731dbc properly reset answer area on module reset 2012-11-28 14:18:44 -05:00
Victor Shnayder
b41b459712 update docstring on x_module.get_score to match reality 2012-11-28 14:09:32 -05:00
Victor Shnayder
4fd1a2fa1a Fix state tracking for self-assessment. 
now keep each set of responses in a separate dictionary
 2012-11-28 14:09:09 -05:00
Victor Shnayder
e3b9238eef reorder imports 2012-11-28 14:08:18 -05:00
Victor Shnayder
f8e45e0a8e Add tests for old logic 2012-11-28 13:21:48 -05:00
Victor Shnayder
a0a5167207 Hook up testing for self assessment modules 2012-11-28 11:12:06 -05:00
Victor Shnayder
ba9280f3e0 Merge pull request #1010 from MITx/feature/alex/regions 
Feature/alex/regions
 2012-11-28 07:09:14 -08:00
Victor Shnayder
b63a787a26 Merge pull request #1081 from MITx/feature/alex/crystallography-update-mitx 
Feature/alex/crystallography update mitx
 2012-11-28 07:04:23 -08:00
Alexander Kryklia
74b30d8c20 removed no-longer relevant template params 2012-11-28 17:02:07 +02:00
Don Mitchell
a48a392eb2 Trying to get scss back 2012-11-28 10:02:01 -05:00
Alexander Kryklia
2865c7cad4 moved tests from miller to tests 2012-11-28 16:57:30 +02:00
David Ormsbee
41b73e3b3a Merge pull request #1084 from MITx/fix/rocha/remove-unused-discussion-styles 
Remove unused askbot/discussion sass stylesheets
 2012-11-27 16:09:20 -08:00
Carlos Andrés Rocha
d4f5f17381 Remove unused askbot/discussion sass stylesheets 
The unused styles are referencing images that no longer exisit,
breaking collectstatic and therefore tests.
 2012-11-27 19:06:03 -05:00
Don Mitchell
a68dee9743 Got rid of datepair as it was generating a jquery bug but also not 
doing what we wanted.
 2012-11-27 16:38:21 -05:00
Don Mitchell
54cc876075 Merge branch 'feature/btalbot/cms-settings' of 
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
 2012-11-27 15:20:30 -05:00
Don Mitchell
5331ae055f Got time change hooked up but gained a spurious call to change on date 
change.
 2012-11-27 15:15:28 -05:00
Brian Talbot
075bc75a7d settings - adjusted markup to leverage Timepicker's datepair functionality for validating start/end dates 2012-11-27 15:00:19 -05:00
Don Mitchell
d165da3f81 Merge branch 'feature/btalbot/cms-settings' of 
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
 2012-11-27 13:33:19 -05:00
Don Mitchell
5e2dba6bad Minor cache to pull talbott's changes 2012-11-27 13:22:44 -05:00
Brian Talbot
bffd425562 settings - revised date and time picker markup to use already set conventions with the .datepair class 2012-11-27 13:05:00 -05:00
Don Mitchell
8a27e1776b Merge branch 'feature/btalbot/cms-settings' of 
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
 2012-11-27 12:12:43 -05:00
Calen Pennington
24d9d4d1f3 Merge pull request #1082 from MITx/fix/apenney/signup 
You need to fill out your full name but it's not marked with a *
 2012-11-27 08:59:22 -08:00
Ashley Penney
c4377484d5 You need to fill out your full name but it's not marked with a * as 
required.
 2012-11-27 11:39:33 -05:00
Don Mitchell
2238019539 Details tab works except for file references 2012-11-27 11:32:03 -05:00
Brian Talbot
c3e11b4217 settings - added in additional time fields for course dates 2012-11-27 09:50:25 -05:00
Alexander Kryklia
dcd52801ef case when user sends less than 3 points, and tests for this case 2012-11-27 16:10:51 +02:00
Alexander Kryklia
b0a85fde54 fix line widths 2012-11-27 14:53:45 +02:00
Alexander Kryklia
95151ad33a tests updates for imageresponse 2012-11-27 14:53:45 +02:00
Alexander Kryklia
896e922858 cleaning and documeting 2012-11-27 14:53:45 +02:00
Alexander Kryklia
adef5d6f7e polygon is created from points via convex_hull 2012-11-27 14:53:45 +02:00
Alexander Kryklia
72f9358f64 tests for imageresponse regions 2012-11-27 14:53:44 +02:00
Alexander Kryklia
5723672e49 speed improvements 2012-11-27 14:53:44 +02:00
Alexander Kryklia
9ce51ec6cf support for single list syntax in regions 2012-11-27 14:53:44 +02:00