Commits · 9405fc7b9ee592c308858dc46bc93ab4b2c0bc3e · edx / edx-platform · GitLab

13 Aug, 2012 1 commit
- Added wiki create and create_root. Fixed some mitxmako bugs. · 9405fc7b
  Bridger Maxwell committed Aug 13, 2012
  
  9405fc7b Browse Files
10 Aug, 2012 3 commits
- Converted wiki edit page and breadcrumbs. · 51768ef8
  Bridger Maxwell committed Aug 10, 2012
  
  51768ef8 Browse Files
- Got most of the wiki article page working. It shows the article menu now. · b62869bf
  Bridger Maxwell committed Aug 10, 2012
  
  b62869bf Browse Files
- Added a django template loader that can return Mako templates. Started pulling in new wiki. · c236adf5
  Bridger Maxwell committed Aug 10, 2012
  
  c236adf5 Browse Files
08 Aug, 2012 9 commits
- Merge pull request #370 from MITx/feature/bridger/django1.4 · 5d9ffdd5
```
Feature/bridger/django1.4
```
  Calen Pennington committed Aug 08, 2012
  5d9ffdd5 Browse Files
- Updated sumbodule to compatible version of askbot. · 74c439e8
  Bridger Maxwell committed Aug 08, 2012
  
  74c439e8 Browse Files
- Merge pull request #369 from MITx/feature/halogenandtoast/table_of_contents · baa2cb50
```
Feature/halogenandtoast/table of contents
```
  David Ormsbee committed Aug 08, 2012
  baa2cb50 Browse Files
- include courseware js · ccea99dd
  Matthew Mongeau committed Aug 08, 2012
  
  ccea99dd Browse Files
- XML based table of contents for books. · 7f3252ed
  Matthew Mongeau committed Aug 08, 2012
  
  7f3252ed Browse Files
- Fixed CMS setting for 1.4 transition. · 8db60e2f
  Bridger Maxwell committed Aug 08, 2012
  
  8db60e2f Browse Files
- Upgrading to django 1.4. · efcb40b1
  Bridger Maxwell committed Aug 08, 2012
  
  efcb40b1 Browse Files
- Merge branch 'hotfix/1.0.4' · bc12e961
```
Conflicts:
	common/djangoapps/util/middleware.py
```
  Calen Pennington committed Aug 08, 2012
  bc12e961 Browse Files
- Merge pull request #363 from MITx/feature/ichuang/improved-staff-debug-jquery · 153bdf75
```
improve staff_problem_info jquery, so the histogram is also toggled
```
  Calen Pennington committed Aug 08, 2012
  153bdf75 Browse Files
07 Aug, 2012 27 commits
- improve staff_problem_info jquery, so the histogram is also toggled · fa2e3f8d
  ichuang committed Aug 07, 2012
  
  fa2e3f8d Browse Files
- Merge pull request #362 from MITx/ichuang/minor-disable-django-debug-dev-ike · 3d740bec
```
disable diajgo debug toolbar on mit server (dev_ike.py)
```
  ichuang committed Aug 07, 2012
  3d740bec Browse Files
- disable diajgo debug toolbar on mit server (dev_ike.py) · 8b5abc7e
  ichuang committed Aug 07, 2012
  
  8b5abc7e Browse Files
- Merge pull request #361 from MITx/feature/disable_staff_course_check_in_dev · f7d39546
```
Feature/disable staff course check in dev
```
  Calen Pennington committed Aug 07, 2012
  f7d39546 Browse Files
- re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use… · 907bf175
```
re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use ACCESS_REQUIRE_STAFF_FOR_COURSE
```
  David Ormsbee committed Aug 07, 2012
  907bf175 Browse Files
- disable ENABLE_LMS_MIGRATION in dev mode, so courses are always displayed · b279ccbd
  David Ormsbee committed Aug 07, 2012
  
  b279ccbd Browse Files
- Merge pull request #359 from MITx/ichuang/minor-fix-edit-link · 30a43216
```
change edit link showhide to use <a> instead of <input> type submit
```
  Calen Pennington committed Aug 07, 2012
  30a43216 Browse Files
- change edit link showhide to use <a> instead of <input> type submit · 7e8a9a07
```
(fixes issues with edit links in multipart problems and video)
```
  ichuang committed Aug 07, 2012
  7e8a9a07 Browse Files
- Run all tests all the way through before quitting on errors · ac3143df
  Calen Pennington committed Aug 07, 2012
  
  ac3143df Browse Files
- Merge pull request #349 from MITx/feature/kfiedler/courseware-style · 5ac4e499
```
A bunch of various fixes and de-styling
```
  thomasxiii committed Aug 07, 2012
  5ac4e499 Browse Files
- Merge pull request #358 from MITx/kimth/lms-coderesponse · 54fe4a1e
```
Kimth/lms coderesponse
```
  Calen Pennington committed Aug 07, 2012
  54fe4a1e Browse Files
- Make the modal window work in the courseware · 6b76dd1c
  Kyle Fiedler committed Aug 07, 2012
  
  6b76dd1c Browse Files
- Provide default xqueue in ModuleSystem · 354fa64a
  kimth committed Aug 07, 2012
  
  354fa64a Browse Files
- Merge master · ef5dda2a
  kimth committed Aug 07, 2012
  
  ef5dda2a Browse Files
- add documentation on rake + unit tests · 071a2788
  ichuang committed Aug 07, 2012
  
  071a2788 Browse Files
- Remove temporary datetime · 79e4e15f
  kimth committed Aug 07, 2012
  
  79e4e15f Browse Files
- StudentModule lookups in queue callback use target user, rather than request.user · bba98515
  kimth committed Aug 07, 2012
  
  bba98515 Browse Files
- CodeResponse uses 'is_file' helper function · f396fd6e
  kimth committed Aug 07, 2012
  
  f396fd6e Browse Files
- Tests provide xqueue params, rather than ModuleSystem.__init__ · 21a8ecf5
  kimth committed Aug 07, 2012
  
  21a8ecf5 Browse Files
- Merge pull request #344 from MITx/feature/victor/file-per-descriptor · 6dd3ccd3
```
Feature/victor/file per descriptor
```
  Calen Pennington committed Aug 07, 2012
  6dd3ccd3 Browse Files
- Make tests pass again again · 2adfb9bb
```
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
```
  Victor Shnayder committed Aug 07, 2012
  2adfb9bb Browse Files
- Make tests pass again · 3b35cf15
```
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
```
  Victor Shnayder committed Aug 07, 2012
  3b35cf15 Browse Files
- always export metadata in alphabetical order · 15a14b35
  Victor Shnayder committed Aug 07, 2012
  
  15a14b35 Browse Files
- a few pep8 cleanups · 9b03521a
  Victor Shnayder committed Aug 07, 2012
  
  9b03521a Browse Files
- Generate error module url_names using sha1 · b27aed21
```
* means we get the same url_name on each import of the same data.
```
  Victor Shnayder committed Aug 07, 2012
  b27aed21 Browse Files
- Make the simple course pass roundtrip test: · 6d7d6512
```
- add 'type' and 'points' to capa_module metadata
- replace old 'title' tag with display_name
```
  Victor Shnayder committed Aug 07, 2012
  6d7d6512 Browse Files
- Make url_names on error descriptors unique · 1876e31c
  Victor Shnayder committed Aug 07, 2012
  
  1876e31c Browse Files