Victor Shnayder
e3c213dd38
Refactor html and js.
...
Next:
- more clear states (logic in python, view in js)
- style
2012-11-07 18:18:35 -05:00
Chris Dodge
87ff18dc56
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
2012-11-07 09:35:21 -05:00
Calen Pennington
bca0134a35
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-06 16:13:31 -05:00
Chris Dodge
55c69a1e13
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
...
Conflicts:
lms/djangoapps/courseware/module_render.py
2012-11-06 14:20:59 -05:00
Calen Pennington
6212507b55
Merge pull request #1008 from MITx/ie8patch
...
merge to master
2012-11-06 06:18:01 -08:00
Vik Paruchuri
88491f7bb1
moved everything to templates, added hint prompt
2012-11-05 19:13:48 -05:00
Vik Paruchuri
dfbfc7905f
Work on templating, bugfix
2012-11-05 18:48:41 -05:00
Vik Paruchuri
e94a78c6bb
Refactor code to make it simpler, pull out templates
2012-11-05 18:42:55 -05:00
Don Mitchell
7f4bb63dff
Final ie8 fixes hopefully. Now renders correctly for staff. Moved the
...
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
2012-11-05 13:55:09 -05:00
Carlos Andrés Rocha
31d3144532
Remove openings from job page
2012-11-05 10:23:58 -05:00
Don Mitchell
afabb4ab16
Don't call fn before defined. [ie8 is only browser which seems to care.]
2012-11-02 14:25:25 -04:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Carlos Andrés Rocha
32498f3468
Remove learning designer and producer openings from job page
2012-11-01 13:21:40 -04:00
David Ormsbee
8a453e99ca
Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.
2012-11-01 04:37:16 -04:00
David Ormsbee
5223e9d3ca
Merge pull request #995 from MITx/features/rocha/google-analytics-for-course-pages
...
Add google analytics to course info pages
2012-10-30 13:48:36 -07:00
Carlos Andrés Rocha
8ec2c34ea5
Add google analytics to course info pages
2012-10-30 16:05:06 -04:00
Carlos Andrés Rocha
376dcb7982
Correct job description item
2012-10-30 15:44:28 -04:00
Calen Pennington
684b98505d
Make rake commands to run jasmine tests in browser and via phantomjs
2012-10-30 10:41:02 -04:00
Chris Dodge
206b1e26d3
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
2012-10-26 10:02:45 -04:00
Chris Dodge
ba15735214
implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff
2012-10-25 14:27:26 -04:00
Carlos Andrés Rocha
2db84a757e
Update to learning designer job description
2012-10-25 12:43:57 -04:00
Calen Pennington
f19ec64659
Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment
2012-10-25 10:47:41 -04:00
Carlos Andrés Rocha
4a0e5f66d6
Fix link in jobs page
2012-10-25 10:06:47 -04:00
Carlos Andrés Rocha
e4daad4327
Update Job Page with new positions
2012-10-24 20:30:54 -04:00
Louis Sobel
b1cfee4592
Add support for subtitle download link
...
Add a download link to the video player. The link is defined
in the content xml using the following structure:
<video youtube="youtubestring">
<track kind="subtitle" src="subtitle_link" />
</video>
2012-10-23 14:50:17 -04:00
Calen Pennington
b52ed48221
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
2012-10-23 13:38:11 -04:00
David Ormsbee
2e03a4846c
Merge pull request #935 from MITx/feature/rocha/cengage-press-release
...
Add Cengage book press release
2012-10-18 11:55:02 -07:00
Carlos Andrés Rocha
2f7733ede0
Add Cengage book press release
2012-10-18 14:45:42 -04:00
David Ormsbee
ea8b9577ce
Email wording changes based on Sarina's review
2012-10-18 14:28:15 -04:00
David Ormsbee
491f10d1bf
Merge branch 'master' into feature/dave/email_bugfixes
2012-10-18 12:23:09 -04:00
David Ormsbee
dbfa7bf03a
Change email change success notice to say email instead of name
2012-10-18 12:20:52 -04:00
Chris Dodge
554f179957
tie in 'forgot password' workflow in CAS LMS
2012-10-16 16:18:21 -04:00
Carlos Andrés Rocha
4cadbcc556
Merge pull request #920 from MITx/feature/rocha/ut-press-release
...
Removed obsolete information from site faq
2012-10-16 10:03:05 -07:00
Carlos Andrés Rocha
b479c85310
Change order of X Universities in the front page
2012-10-16 13:02:13 -04:00
Carlos Andrés Rocha
516c41f342
Added html view of serial numbers. Refactored code.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
1efb9711c3
Removed obsolete information from site faq
2012-10-15 14:51:16 -04:00
Carlos Andrés Rocha
b121e620f8
Make small corrections to UT pages and announcement
2012-10-15 11:54:23 -04:00
Carlos Andrés Rocha
b13412d3b2
Make corrections of UT announcement
2012-10-15 11:12:35 -04:00
Carlos Andrés Rocha
40dd6fa105
Add missing text to FAQ
2012-10-15 07:16:13 -04:00
Carlos Andrés Rocha
516daa4710
Converted FAQ template to unix line endings
2012-10-15 06:58:39 -04:00
Carlos Andrés Rocha
c5a148639d
Add announcement of UT joining edx and related changes
2012-10-15 06:57:50 -04:00
David Ormsbee
01ac01b62c
Re-enable change name, and fix up change email styles
2012-10-12 14:31:20 -04:00
Calen Pennington
c41c084b39
Wire up login and register forms for edx landing page
2012-10-12 09:55:32 -04:00
David Ormsbee
96bdd03406
re-enable email change functionality
2012-10-12 09:54:47 -04:00
Arjun Singh
c28c3f9916
Merge branch 'master' into hotfix/arjun/fix_integer_disc_ids
2012-10-12 04:23:29 -07:00
Arjun Singh
6fbf2f9720
revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved
2012-10-12 04:22:27 -07:00
Tom Giannattasio
51a19b3d7e
transferred edge styles from cms to lms
2012-10-11 14:02:13 -04:00
Calen Pennington
9e9825cb88
Enable the edge virtual university landing page in the lms
2012-10-11 13:18:01 -04:00
Tom Giannattasio
86f32bb3d4
added edge template to university folder
2012-10-11 12:29:40 -04:00
David Ormsbee
488d001e85
Merge pull request #854 from MITx/feature/bridger/course_grading
...
Added an indicator on Progress page when there are no problem scores in a section.
2012-10-11 08:06:05 -07:00
