Victor Shnayder
|
6e98255cd5
|
remove reference to course from signup email subject
|
2012-07-13 11:51:32 -04:00 |
|
Victor Shnayder
|
39a1502e1a
|
Move student app from lms to common
|
2012-07-13 11:51:32 -04:00 |
|
David Ormsbee
|
214d03c1fa
|
Merge pull request #177 from MITx/feature/lms-static-files
Allow module html to link to global static files as well as course static files
|
2012-07-12 14:51:03 -07:00 |
|
Bridger Maxwell
|
d1f8f4bef0
|
Forgot to add this file in the last commit.
|
2012-07-12 17:10:12 -04:00 |
|
Bridger Maxwell
|
d5a5fcec4d
|
Fixed the errors that were breaking tests from unused simplewiki files and a half-migrated certificates module.
|
2012-07-12 16:43:48 -04:00 |
|
Calen Pennington
|
c3ba8817e9
|
Correctly add course_dirs to static files
|
2012-07-12 16:06:05 -04:00 |
|
Calen Pennington
|
305cd30da9
|
The path user by url is based on the output css file, which ends up in static/sass, so only use ../, rather than ../../, to reference images
|
2012-07-12 16:03:12 -04:00 |
|
John Jarvis
|
1a3549903c
|
updating activation mail, adding Gemfile.lock to gitignore
|
2012-07-12 13:41:51 -04:00 |
|
bridger
|
28007b280c
|
Merge pull request #168 from MITx/multicourse_wiki
Multicourse wiki
|
2012-07-12 07:35:17 -07:00 |
|
bridger
|
bc21cdfaa5
|
Merge pull request #167 from MITx/utf8_migration_merge
Utf8 migration merge
|
2012-07-12 07:34:45 -07:00 |
|
Bridger Maxwell
|
2c2e296034
|
Forgot to actually add migration file...
|
2012-07-12 10:32:53 -04:00 |
|
Bridger Maxwell
|
64888f1c1b
|
Re-added the migration to expand the meta field.
|
2012-07-12 10:29:15 -04:00 |
|
Calen Pennington
|
c468d47aa2
|
Minor change in comment about module type/category
|
2012-07-11 22:19:34 -04:00 |
|
Calen Pennington
|
e39e454ff2
|
Correct comments for get_module
|
2012-07-11 22:19:34 -04:00 |
|
Calen Pennington
|
920c397292
|
Be more specific about what the random number generator seed is
|
2012-07-11 22:19:34 -04:00 |
|
Calen Pennington
|
1263d82d06
|
Add comments on StudentModuleCache arguments
|
2012-07-11 22:19:34 -04:00 |
|
Calen Pennington
|
e7d44a2606
|
Remove explain attribute in favor of solution stanza as exemplified in edx4edx
|
2012-07-11 22:18:40 -04:00 |
|
Arjun Singh
|
8fa9f19b65
|
Oops, committed a bad version.
|
2012-07-11 17:04:37 -04:00 |
|
Arjun Singh
|
d0630c44be
|
Temporary fix to allow pages that inherited the marketing template to display (though poorly)
|
2012-07-11 17:00:46 -04:00 |
|
Bridger Maxwell
|
d739e61ebd
|
Added check to make sure utf8 migration only runs on mysql. Had to add in certificates module.
|
2012-07-11 16:33:46 -04:00 |
|
John Jarvis
|
c6bf160002
|
removing {marketing,marketing-ie,print}.scss from PIPELINE_CSS
|
2012-07-11 15:53:56 -04:00 |
|
Bridger Maxwell
|
5bf6c73259
|
Merge with master.
|
2012-07-11 15:26:26 -04:00 |
|
John Jarvis
|
a21d37e23b
|
adding html5shiv.js to static/js
|
2012-07-11 15:26:18 -04:00 |
|
Bridger Maxwell
|
c6f9f3ebe1
|
Renamed migrations since branch, making dev machine databases un-migratable.
|
2012-07-11 15:17:44 -04:00 |
|
Bridger Maxwell
|
c31fb7684d
|
Added utf8 conversion from stable branch.
|
2012-07-11 15:08:10 -04:00 |
|
Matthew Mongeau
|
b96f626425
|
Update UserProfile demographic fields:
* Updated student.models.UserProfile
* Added migration to add: gender, date_of_birth, mailing_address, country, telephone_number, occupation
|
2012-07-11 14:58:39 -04:00 |
|
Calen Pennington
|
100422a7f3
|
Make collectstatic run to completion
|
2012-07-11 10:14:51 -04:00 |
|
Calen Pennington
|
bbe589ddc3
|
Make dashboard require login
|
2012-07-11 09:05:39 -04:00 |
|
Calen Pennington
|
5d8fd7d53c
|
Don't error out trying to retrieve remember parameter in login request
|
2012-07-11 08:53:57 -04:00 |
|
Calen Pennington
|
2d56a21f92
|
Removing old js files that used to be used by the LMS
|
2012-07-11 08:53:57 -04:00 |
|
Calen Pennington
|
f0a049a29e
|
Don't depend on the mitx directory being named that, so that tests will run in jenkins where mitx is checked out as workspace
|
2012-07-11 08:53:56 -04:00 |
|
ichuang
|
84838cf222
|
add CourseEnrollment and UserTestGroup to django admin view
|
2012-07-10 22:31:28 -04:00 |
|
Galen Frechette
|
7a5d645b9f
|
removes user avatar, imporves dashboard design
|
2012-07-10 19:59:51 -04:00 |
|
Galen Frechette
|
7f4de5df30
|
simplifies jobs page
|
2012-07-10 19:59:51 -04:00 |
|
Galen Frechette
|
597c1db585
|
updates basic html structure and base color
|
2012-07-10 19:59:51 -04:00 |
|
Galen Frechette
|
d8d3eb144c
|
type tweeks in modals
|
2012-07-10 19:59:51 -04:00 |
|
Galen Frechette
|
8faa539a1a
|
makes some tweeks to global nav style, home page header and font styles
|
2012-07-10 19:59:51 -04:00 |
|
Galen Frechette
|
f7a1873aee
|
adds banner images to and refines header on find courses pages, various visual tweeks and imporvements
|
2012-07-10 19:59:50 -04:00 |
|
Galen Frechette
|
5484cfd08e
|
adds links to university profile page
|
2012-07-10 19:59:50 -04:00 |
|
Galen Frechette
|
6afb8f7d94
|
fixes university attributes in course.html
|
2012-07-10 19:59:50 -04:00 |
|
Galen Frechette
|
1be9196d3c
|
wip header, wip header refactoring, improves course object visual design, improves footer
|
2012-07-10 19:59:50 -04:00 |
|
David Ormsbee
|
897a89c5ca
|
remove out of repo symlinks from static
|
2012-07-10 18:39:06 -04:00 |
|
David Ormsbee
|
3dd923d9b9
|
typo fix (it was just really bugging me)
|
2012-07-10 17:50:42 -04:00 |
|
Matthew Mongeau
|
347483203a
|
Unscope URLCONF from mitx
|
2012-07-10 17:37:42 -04:00 |
|
Calen Pennington
|
1ac6e0a083
|
Add extra_filters_jinja needed for compressed_css filter
|
2012-07-10 16:22:05 -04:00 |
|
Calen Pennington
|
6dd141247d
|
Fixing github_sync to work with multiple course data directories
|
2012-07-10 14:58:27 -04:00 |
|
David Ormsbee
|
2f90b27707
|
Only load DATA_DIR subdirs if DATA_DIR exists (so not during tests)
|
2012-07-10 13:56:51 -04:00 |
|
Calen Pennington
|
fdd9663699
|
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/modulestore/xml.py
lms/djangoapps/courseware/views.py
lms/templates/index.html
lms/templates/info.html
lms/templates/main.html
lms/templates/navigation.html
requirements.txt
|
2012-07-10 13:39:19 -04:00 |
|
Calen Pennington
|
da360b1d56
|
Allow for a user to enroll in multiple courses
|
2012-07-10 13:11:57 -04:00 |
|
Calen Pennington
|
c4ebfe1bd4
|
Actually add the schematic.js file used in the main.html template
|
2012-07-10 12:58:25 -04:00 |
|