Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Александр
647d1514aa support both regions and rectangles 2012-11-27 14:53:44 +02:00
Александр
b4fb0cc463 fixed line length 2012-11-27 14:53:44 +02:00
Александр
03c338d6e3 added geos library for linux 2012-11-27 14:53:44 +02:00
Александр
406e7e29c0 added geos to requirements 2012-11-27 14:51:30 +02:00
Александр
88c98b9a56 added multiple regions support 2012-11-27 14:37:57 +02:00
Александр
7fcf04eaf5 add shapely 2012-11-27 14:37:57 +02:00
Victor Shnayder
b47fdd5220 Merge pull request #1080 from MITx/feature/jarv/dashboard-grades 
Feature/jarv/dashboard grades
 2012-11-26 15:25:08 -08:00
JM Van Thong
d1fe2c3361 Added analytics tab in instructor dashbaord, and call to the analytics back-end to display sample data. 2012-11-26 18:18:18 -05:00
John Jarvis
2db0efa2b4 Only show certificate criteria for notpassing students 2012-11-26 17:57:38 -05:00
John Jarvis
792ddb4d86 Show grade when certificate is generating 2012-11-26 17:51:59 -05:00
John Jarvis
d13509e6f3 Adding percentage formatting for final grade reporting 2012-11-26 17:42:55 -05:00
John Jarvis
4e4a29e030 Removing unnecessary test for 'generating' 2012-11-26 17:40:55 -05:00
John Jarvis
9148d49ac7 lowest_passing_grade fix 2012-11-26 16:57:00 -05:00
John Jarvis
631580ccaf Changing grade info on the dashboard 2012-11-26 16:30:23 -05:00
John Jarvis
474f810b38 Adding lowest_passing_grade() to CourseDescriptor 2012-11-26 16:29:45 -05:00
Tom Giannattasio
153285c3ea reset default tab 2012-11-26 16:28:52 -05:00
JM Van Thong
278ed85c10 Merge branch 'master' into jmpm-analytics 2012-11-26 16:20:22 -05:00
Tom Giannattasio
bb2e78ce30 reworked slider logic 2012-11-26 15:54:46 -05:00
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