Vik Paruchuri
b71233fd50
Add in message passing pipeline
2013-01-03 11:40:41 -05:00
Vik Paruchuri
ce3b84d0e5
Message passing in lms
2013-01-03 11:40:41 -05:00
Vik Paruchuri
b782f712b9
Add in more js to handle student feedback
2013-01-03 11:40:41 -05:00
Vik Paruchuri
634b586085
Integrate new ajax action
2013-01-03 11:40:41 -05:00
Vik Paruchuri
d663d23257
Work on adding in a new ajax post type
2013-01-03 11:40:41 -05:00
Don Mitchell
4e9d5c8a6a
Placeholders for markdown editor js and reference to pull it in from
...
CapaDescriptor. Overrode XMLEditorDescription
2013-01-03 11:15:06 -05:00
Don Mitchell
31141299e8
Cache to pull CR's cleanup of branch
2013-01-03 11:00:41 -05:00
Chris Dodge
e70db062b2
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
...
Conflicts:
requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Brian Wilson
c76f37050a
introduce form to template
2013-01-03 03:22:37 -05:00
valera-rozuvan
62271fe5c6
Added namespaced RequireJS.
2013-01-03 10:14:06 +02:00
Brian Wilson
4abd9cd3d4
get closer to working again
2013-01-02 18:56:25 -05:00
David Ormsbee
8bf393fbba
Merge pull request #1182 from MITx/bridger/feature/ungraded_course
...
Visual changes for ungraded courses
2013-01-02 07:19:34 -08:00
Chris Dodge
725805f1cf
add forgotten new file
2012-12-28 13:52:49 -05:00
Chris Dodge
c0f12e69f7
fixes on the export. There's some attributes not being handled correctly
2012-12-27 16:15:52 -05:00
Chris Dodge
625237601f
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export
...
Conflicts:
common/lib/xmodule/xmodule/contentstore/content.py
common/lib/xmodule/xmodule/contentstore/mongo.py
2012-12-27 14:16:40 -05:00
Don Mitchell
53b73ca3da
Merge pull request #1208 from MITx/feature/cdodge/clone-course
...
fix up some thumbnail issues. Also we need to manage the user permission...
2012-12-27 09:26:51 -08:00
Diana Huang
f8a528f327
Merge branch 'master' into feature/diana/rubric-input
2012-12-27 10:47:15 -05:00
Chris Dodge
28d9827468
fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course
2012-12-27 10:20:28 -05:00
Don Mitchell
83bc9d7bf8
Grader unit tests (partial)
2012-12-26 15:48:37 -05:00
Don Mitchell
58abb10c2d
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
2012-12-26 10:31:10 -05:00
Don Mitchell
ff490599fa
Debugging unit tests
2012-12-26 10:29:35 -05:00
Carlos Andrés Rocha
1ac41787a7
Fix broken display of courses in university profile
2012-12-21 16:38:17 -05:00
David Ormsbee
8532d79ea5
Merge pull request #1198 from MITx/feature/ichuang/update-tracking-log-sql-schema
...
update schema for tracking sql logs - larger fields; add hostname
2012-12-21 12:23:45 -08:00
David Ormsbee
241b4eb0fe
Merge pull request #1196 from MITx/feature/rocha/change-courses-layout
...
New Layout for course listings with new course graphical overlay
2012-12-21 12:18:05 -08:00
Diana Huang
8bb9156389
Merge branch 'master' into feature/diana/rubric-input
2012-12-21 13:08:41 -05:00
ichuang
320f1b4141
update schema for tracking sql logs - larger fields; add hostname
2012-12-21 08:44:40 -05:00
Brian Wilson
2788ad8629
switch back to returning json to test_center_register template, and enable jquery handling in template.
2012-12-21 01:39:18 -05:00
Carlos Andrés Rocha
22de7cbb4e
Add logic to display courses by start date and show the new overlay
2012-12-20 20:05:11 -05:00
Don Mitchell
b65775c300
Merge pull request #1195 from MITx/feature/christina/misc
...
Fix typo in Formula Response name (Studio #101 ).
2012-12-20 14:15:01 -08:00
cahrens
37b83c1ecf
Fix typo in Formula Response name (Studio #101 ).
2012-12-20 17:06:12 -05:00
Carlos Andrés Rocha
3a4b626e62
Remove unused code from accounts login page
2012-12-20 14:19:06 -05:00
Chris Dodge
b40a8a3e9e
implement course clone and delete functionality from the command line
2012-12-20 13:55:15 -05:00
Brian Wilson
d5bd2313c1
fix migrations, removing one field and making another nullable. Update registration page to allow for editing only demographics.
2012-12-20 04:16:00 -05:00
Carlos Andrés Rocha
5d85fab283
Fix django auth login redirection
...
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.
We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.
[#41499213 ]
2012-12-19 18:48:30 -05:00
Brian Wilson
ee99080687
add additional fields to testcenter user and update test center registration.
2012-12-19 16:53:13 -05:00
Diana Huang
fa97a6a528
Fix the font size
2012-12-19 16:04:47 -05:00
Diana Huang
ce9229fac6
Merge branch 'master' into feature/diana/rubric-input
2012-12-19 13:17:10 -05:00
Diana Huang
728103056d
Move rubric into a subset of problem in CSS.
2012-12-19 13:16:35 -05:00
Diana Huang
11d5eea2b9
Add in CSS updates and fixes to the template so that it will work.
2012-12-19 11:52:37 -05:00
Bridger Maxwell
f23bf85199
Added config to grader to hide averages of pset scores.
2012-12-19 11:44:32 -05:00
David Ormsbee
8373ee4bf6
Basic support for freeform advertised_start dates like 'Spring'
2012-12-19 04:01:37 -05:00
Brian Wilson
f472ac60f5
minor tweaks to test center registration
2012-12-19 00:21:49 -05:00
Brian Wilson
f912ffe8a2
add persistence of testcenter_user registration
2012-12-18 18:31:41 -05:00
Brian Wilson
bc40a7f127
make test-reg dialog non-modal, and pass course_id in URL. Add to course info.
2012-12-18 16:16:55 -05:00
Diana Huang
8a0dae01f0
Add in some sorting and validation of the options list
2012-12-18 14:32:10 -05:00
Diana Huang
dfe438dc73
Initial work on the rubric input type including the most basic parsing
...
without error handling
2012-12-18 13:02:17 -05:00
Brian Wilson
c7d379beb6
add first pass at wiring test registration dialog
2012-12-18 03:20:02 -05:00
David Ormsbee
0ddea6d0ae
Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx
...
Feature/alex/video timeframe mitx
2012-12-17 13:20:47 -08:00
Jay Zoldak
cc54c37359
Exclude settings.py files from coverage reports and configure titles for the reports.
2012-12-17 15:00:11 -05:00
