cahrens
07d6bee5a7
storing work
2013-01-16 09:53:28 -05:00
cahrens
9818664bb1
storing work
2013-01-15 16:04:34 -05:00
Chris Dodge
08adf9c0d5
Merge branch 'master' into feature/cdodge/cms-master-merge3
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/search.py
common/lib/xmodule/xmodule/modulestore/xml.py
doc/development.md
lms/envs/common.py
2013-01-11 14:04:46 -05:00
Carlos Andrés Rocha
8f21d7a738
Add property to course module to check if a course is new
...
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.
Also adds a property to check how many days are left until the course starts.
2013-01-10 15:57:29 -05:00
Chris Dodge
3b5e17ef55
Merge branch 'master' into feature/cdodge/cms-master-merge2
...
Conflicts:
.gitmodules
common/djangoapps/__init__.py
common/djangoapps/track/migrations/__init__.py
common/lib/capa/capa/inputtypes.py
common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/openendedinput.html
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/video_module.py
common/static/sass/bourbon/css3/_box-sizing.scss
doc/development.md
lms/djangoapps/instructor/tests.py
lms/envs/aws.py
lms/envs/common.py
lms/templates/video.html
requirements.txt
test-requirements.txt
2013-01-07 12:34:48 -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
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
ichuang
320f1b4141
update schema for tracking sql logs - larger fields; add hostname
2012-12-21 08:44:40 -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
Carlos Andrés Rocha
3a4b626e62
Remove unused code from accounts login page
2012-12-20 14:19:06 -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
Don Mitchell
0a91a98dd0
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
...
feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/course_info.js
cms/static/js/template_loader.js
cms/static/js/views/course_info_edit.js
cms/templates/base.html
cms/templates/course_info.html
cms/urls.py
2012-12-11 10:55:10 -05:00
Don Mitchell
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05:00
chrisndodge
e1c452bc08
Merge pull request #1113 from MITx/feature/dhm/course-info
...
move the underscore tempaltes to /static/client-templates and update the...
2012-12-10 07:17:19 -08:00
Chris Dodge
79e48dde97
move the underscore tempaltes to /static/client-templates and update the references
2012-12-10 10:01:08 -05:00
David Ormsbee
7596deb40a
Merge pull request #1094 from MITx/feature/victor/instructor-grading
...
Feature/victor/instructor grading
2012-12-07 08:44:58 -08:00
Calen Pennington
c917725ff0
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/static/sass/course.scss
requirements.txt
2012-12-07 11:17:41 -05:00
Brian Wilson
cde20758f8
cosmetic cleanup
2012-12-04 13:25:04 -05:00
Brian Wilson
dfb9913100
clean up lms tests, and fix export/import
2012-12-04 11:52:35 -05:00
Brian Wilson
4ebd70dcc4
add support for utf8 in sequences, verticals and custom modules.
2012-12-04 03:54:36 -05:00
Brian Wilson
1d44ebb10c
Add more non-ascii characters to full dataset, and make fixes in xmodule code.
2012-12-03 16:22:25 -05:00
Don Mitchell
50d7e6160e
Move models from common to cms.
...
Add unit tests.
2012-12-03 12:20:15 -05:00
Victor Shnayder
052807d7f6
Change the unique student id calculation to match the id we send to xqueue
...
- can't change the xqueue one because there's data that uses it
- we checked, and no one has sent out survey links that use the old sha1() format
doing this because we'll need the LMS to be able to send the anon student id to backend services e.g. for peer grading, and passing two different anon student ids to xmodule (one for xqueue, one for other uses) is just asking for confusion.
2012-11-30 11:30:02 -05:00
Don Mitchell
8379e3038d
Moved settings models from common to cms
2012-11-30 10:42:23 -05:00
Victor Shnayder
9d8d6655c6
add docstring for expect_json decorator
2012-11-30 09:51:35 -05:00
Chris Dodge
2aceb2e44a
make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter
2012-11-29 15:56:03 -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
Don Mitchell
a48a392eb2
Trying to get scss back
2012-11-28 10:02:01 -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
Don Mitchell
2238019539
Details tab works except for file references
2012-11-27 11:32:03 -05: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
Don Mitchell
f0c94a2c7e
Beginning test of details tab.
2012-11-21 15:17:18 -05:00
Don Mitchell
339949f934
Another checkpoint before pull/merge
2012-11-20 11:37:14 -05:00
Victor Shnayder
f8dc85b6f8
oops. used wrong variable name.
2012-11-20 10:28:47 -05:00
Victor Shnayder
5a03b53a2f
cert bugfix: handle students who don't have a grade
2012-11-20 09:20:03 -05:00
Don Mitchell
241c9bb1ac
Checkpoint to rebase
2012-11-19 16:02:30 -05:00
Carlos Andrés Rocha
8df425e5e8
Add backend for displaying news on the student dashboard
...
[#39472239 ]
2012-11-19 13:06:36 -05:00
Victor Shnayder
d723bb7103
simpify process_survey_link
2012-11-19 11:39:43 -05:00
Victor Shnayder
d1eec9bcf4
add a salt. using user.id since that's handy.
2012-11-19 11:34:31 -05:00
David Ormsbee
336caa0feb
Batch together alter statements to minimize how long we lock the auth_users table
2012-11-19 10:30:22 -05:00
Victor Shnayder
956b704786
add migration to remove askbot columns
2012-11-19 10:19:31 -05:00
Calen Pennington
8525b898d7
Add migration to make columns added by askbot nullable, in preparation for eventually deleting them
2012-11-19 09:48:51 -05:00
Victor Shnayder
71b585bb61
move unique_id_for_user into student/models.py
2012-11-17 16:33:00 -05:00
Victor Shnayder
003dc7ef51
Get rid of check for non-existent CERTIFICATES_ENABLED flag...
2012-11-17 16:19:52 -05:00
Victor Shnayder
3a44f043d2
Add tests, make them pass.
2012-11-17 15:58:49 -05:00
