Calen Pennington
a3b144045c
Merge pull request #427 from MITx/feature/bridger/new_wiki
...
New wiki installed from pip
2012-08-16 08:01:39 -07:00
Bridger Maxwell
c4b362ca71
Removed old path include for django-wiki.
2012-08-16 10:56:33 -04:00
Calen Pennington
3efea9cbb0
Merge pull request #425 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-16 07:31:56 -07:00
Bridger Maxwell
8fb83ee33c
Added django-wiki as a submodule.
2012-08-15 23:01:06 -04:00
David Ormsbee
346d5b91a1
implement subdomain-based course displays
2012-08-15 11:53:20 -04:00
Bridger Maxwell
4bc4e87a4e
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-15 11:15:21 -04:00
Victor Shnayder
2df3a6ef11
Big access control refactor
...
* All access control logic is now in access.py
* It exports a single method for general use: has_access(user, object, action)
- possible actions depend on object type (e.g. 'see_exists', 'enroll', 'staff')
* Removed DARK_LAUNCH feature flag--it is now the default behavior
* Replaced check_course with three separate more focused functions that use has_access
Minor things:
* note on using pdb in testing
* moved time parsing helper into timeparse.py
* x_modules now have a .start attribute (None if not in metadata)
2012-08-14 23:30:37 -04:00
Bridger Maxwell
ceaa6a4ff2
You can now click around in the wiki without losing your course nav bar.
2012-08-14 18:44:23 -04:00
Bridger Maxwell
85f1899cb6
Wiki pages can now be viewed from the course URL and the course nav is shown. It doesn't follow the user yet.
2012-08-14 17:15:44 -04:00
Calen Pennington
d7fc2d6654
Merge pull request #408 from MITx/feature/fix_askbot_urls
...
Fix askbot URLs in the theme
2012-08-14 12:54:17 -07:00
David Ormsbee
137d4856cc
We're loading static assets from the askbot theme directory in the lms proj now.
2012-08-14 11:54:02 -04:00
Bridger Maxwell
3dce1c2884
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-14 11:40:00 -04:00
Bridger Maxwell
a2841af834
Added views for automatic course article creation.
2012-08-14 08:39:41 -04:00
kimth
1c2d034283
LMS-side MAX_FILESIZE set in settings.py
2012-08-13 21:17:47 -04:00
Bridger Maxwell
ff1a0ba274
Added wiki create and create_root. Fixed some mitxmako bugs.
2012-08-13 14:25:11 -04:00
Calen Pennington
801df37872
Merge remote-tracking branch 'origin/master' into arjun/javascript_response
...
Conflicts:
common/lib/xmodule/xmodule/js/src/capa/display.coffee
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/module_render.py
2012-08-13 10:13:21 -04:00
Calen Pennington
bd95c03d9b
Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches
...
Provide content QA (quality assessment) interface
2012-08-13 06:55:05 -07:00
Victor Shnayder
d7f94a05b7
Add DARK_LAUNCH functionality
...
* pass user to check_course
* if dark launch feature enabled, users with staff access to course
can see courseware before start date. Students still can't.
* tests.
* Remaining: enrollment view has custom access control. Need to check it.
2012-08-12 16:23:31 -04:00
ichuang
b159eb4825
add feature flag to disable login button (for systems which autologin)
2012-08-10 15:57:41 -04:00
Bridger Maxwell
45baccae85
Added a django template loader that can return Mako templates. Started pulling in new wiki.
2012-08-10 11:31:29 -04:00
Calen Pennington
6abc2d733f
Merge pull request #370 from MITx/feature/bridger/django1.4
...
Feature/bridger/django1.4
2012-08-08 12:52:33 -07:00
Bridger Maxwell
14a35b9605
Upgrading to django 1.4.
2012-08-08 11:57:15 -04:00
Calen Pennington
80b8529f2f
Merge branch 'hotfix/1.0.4'
...
Conflicts:
common/djangoapps/util/middleware.py
2012-08-08 11:05:26 -04:00
Arjun Singh
b9f2d4bc13
Remove coffee libraries (use the system coffee); don't set the OS NODE_PATH but rather just read it in once and then modify the temporary environments used when executing node.
2012-08-07 15:52:39 -04:00
Arjun Singh
26f31324c4
Moving a few static files out of lms into common
2012-08-07 13:39:59 -04:00
Victor Shnayder
932a9be747
Make tests pass again
...
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
2012-08-07 11:06:47 -04:00
Arjun Singh
fb6dbb120e
Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory.
2012-08-07 03:28:35 -04:00
Arjun Singh
869e638e07
Removing compiled js files in data directories before recompiling them; this causes compilation errors to fail loudly.
2012-08-06 18:08:07 -04:00
Calen Pennington
8059008bde
Switch from exception logging middleware to a django signal handler, so that we no longer swallow Http404 exceptions and turn them into 500 errors
2012-08-06 10:13:12 -04:00
ichuang
0347eb498c
add MITX_FEATURES flags to enable textbook and discussion,
...
and modify course_navigation correspondingly
2012-08-05 20:24:00 -04:00
Kyle Fiedler
9d14033f6b
Added some styles for the top navigation and for the sidebar navigation
2012-07-31 16:29:01 -04:00
Kyle Fiedler
d30ae5389e
Added fix for videos start to zero out colors and mit styles
2012-07-31 14:18:42 -04:00
Kyle Fiedler
2bbb19790d
Fixed jquery ui image problem and added a base style sheet for lms to override fonts
2012-07-31 11:06:39 -04:00
Kyle Fiedler
257ce0430f
Moved vendor sass files to css folder and included them in
2012-07-30 17:39:19 -04:00
Calen Pennington
1fce1dbe34
Make sure that django-pipelined css and js don't collide between the cms and lms
2012-07-30 14:04:39 -04:00
Victor Shnayder
59defd33b6
Formatting and little bugfixes
...
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
2012-07-27 16:09:25 -04:00
Victor Shnayder
cb30850759
Config for integration tests
...
* move askbot repo into mitx as a submodule
* set settings as in 85865f7221
* remove test_mongo env.
* Refactor tests to use new config structure.
* Add real integration tests--not working due to bugs in course xml. Turned off.
2012-07-27 16:09:25 -04:00
Calen Pennington
6afe1709e7
Merge pull request #306 from MITx/arjun/compile_coffee
...
Compiling coffee files in course data directories on startup.
2012-07-26 13:31:46 -07:00
Arjun Singh
73261719ce
Added TODO near temporary code.
2012-07-26 13:14:00 -04:00
Calen Pennington
73d6565fac
Merge remote-tracking branch 'origin/hotfix/1.0.1'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-26 09:05:57 -04:00
Arjun Singh
3002260de5
Compiling coffee files in course data directories on startup.
2012-07-25 21:45:01 -04:00
Matthew Mongeau
bd9da89fe9
Move press articles to json.
2012-07-25 17:31:34 -04:00
Kyle Fiedler
00596d2f20
Added courseware css back into the main template
2012-07-25 14:57:44 -04:00
Calen Pennington
8a0270ea2b
Allow for modular css from XModules, and split capa module css out as a test
2012-07-24 16:14:04 -04:00
Calen Pennington
50f27bcfb7
Eagerly load all modules when reading the course from xml, so that users who are already on a problem page can check their answers
2012-07-24 16:14:04 -04:00
Calen Pennington
8481937f59
Move Logger and *withPrefix javascript into a common location
2012-07-24 16:14:03 -04:00
Calen Pennington
87ce82570d
Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware
2012-07-24 16:14:03 -04:00
Calen Pennington
987fe17358
Load js fragments in order, so that Subview is loaded before the classes that use it
2012-07-24 16:14:00 -04:00
Calen Pennington
5026d6e9fb
Give all XModuleDescriptors a module_class, and make it inheritance of js_module_names work
2012-07-24 16:14:00 -04:00
Calen Pennington
3cdceab16c
Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms
2012-07-24 16:13:59 -04:00
