David Ormsbee
53c5170dbc
Simple PEP8 issues.
2012-11-06 18:14:57 -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
6cdc41505e
Fixed incorrect dev.py commit
2012-11-06 08:50:06 -05: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
Arjun Singh
d9b553b378
Adding a better command for assigning roles.
2012-11-05 15:29:49 -08: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
David Ormsbee
d1aa0a254e
Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides.
2012-11-02 17:21:00 -04:00
Chris Dodge
918de8b4a9
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/mongo-perf-instrumenting
...
Conflicts:
requirements.txt
2012-11-02 15:09:54 -04:00
Chris Dodge
b75a814f7a
add django performance metering
2012-11-02 15:08:45 -04: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
Vik Paruchuri
8734e492de
added back in ie css file that was accidentally removed
2012-11-02 09:23:36 -04:00
Vik Paruchuri
8557007195
removed some extra files, undid changes to html module
2012-11-02 09:22:23 -04:00
Vik Paruchuri
99b0795e59
replaced removed file from master
2012-11-01 15:10:05 -04:00
Chris Dodge
b788b9d659
add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.
2012-11-01 15:08:26 -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
Victor Shnayder
e4c49f3a1e
Merge pull request #1001 from MITx/feature/victor/inputtypes-refactor
...
Feature/victor/inputtypes refactor
2012-10-31 15:18:28 -07:00
Chris Dodge
87dadd40c4
address some of Cale's feedback
2012-10-31 14:11:24 -04:00
Calen Pennington
255720abd7
Clean old javascript tests from CAS
2012-10-31 13:21:36 -04:00
Victor Shnayder
11fc6e4c51
put back file upload config--needed for new discussion forums
2012-10-30 21:36:15 -04:00
Victor Shnayder
8c27e3a249
Revert overly aggressive killing.
...
(don't worry--askbot is still dead)
2012-10-30 20:49:10 -04:00
Vik Paruchuri
62d1f1fe3e
update gitignore for pycharm
2012-10-30 20:14:55 -04:00
Victor Shnayder
793354a0dc
remove (almost) all references to askbot.
2012-10-30 18:23:07 -04:00
Calen Pennington
d4a6b589f1
Add comment about the target of change log entries
2012-10-30 16:48:47 -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
Chris Dodge
34c442a1dc
removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering
2012-10-30 16:04:51 -04:00
Chris Dodge
f0b4371c90
addressed Cale's feedback
2012-10-30 16:01:28 -04:00
Calen Pennington
6221baf3e5
Use TEST_ROOT log directory when running jasmine tests
2012-10-30 15:58:59 -04:00
Chris Dodge
ba9a03410b
remove unneeded debugging traces
2012-10-30 15:56:02 -04:00
Calen Pennington
cd9fbaeb02
Add timeout so that jasmine tests eventually fail if the server doesn't start
2012-10-30 15:51:21 -04:00
Carlos Andrés Rocha
376dcb7982
Correct job description item
2012-10-30 15:44:28 -04:00
Chris Dodge
ee1098c032
remove unused line
2012-10-30 15:37:40 -04:00
Chris Dodge
743f2b56dd
make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting
2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de
lots of tweeks to better support importing of existing courseware
2012-10-30 11:52:31 -04:00
Calen Pennington
e8be6b3111
Get jasmine tests running on cms
2012-10-30 11:33:21 -04:00
Calen Pennington
6d5a1264b9
Move jasmine tests to their own environment
2012-10-30 10:58:38 -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
Victor Shnayder
a155265409
minor whitespace + comment fixes
2012-10-29 23:44:38 -04:00
Calen Pennington
e422716045
Add changelogs for the CMS and LMS
2012-10-29 09:07:49 -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
