Commits · c8fc7bed3ebd4eca341858f55ff7b05ce8d4a023 · edx / edx-platform · GitLab

14 Aug, 2012 1 commit
- Small template change. · c8fc7bed
  Bridger Maxwell committed Aug 14, 2012
  
  c8fc7bed Browse Files
13 Aug, 2012 3 commits
- Created copy of main.html that is django template. Using this for wiki instead… · 66d1259d
```
Created copy of main.html that is django template. Using this for wiki instead of converting every view.
```
  Bridger Maxwell committed Aug 13, 2012
  66d1259d Browse Files
- Added settings template. · 0a9ad1a5
  Bridger Maxwell committed Aug 13, 2012
  
  0a9ad1a5 Browse Files
- Added wiki create and create_root. Fixed some mitxmako bugs. · ff1a0ba2
  Bridger Maxwell committed Aug 13, 2012
  
  ff1a0ba2 Browse Files
10 Aug, 2012 3 commits
- Converted wiki edit page and breadcrumbs. · e462fad3
  Bridger Maxwell committed Aug 10, 2012
  
  e462fad3 Browse Files
- Got most of the wiki article page working. It shows the article menu now. · 3f4c4d74
  Bridger Maxwell committed Aug 10, 2012
  
  3f4c4d74 Browse Files
- Added a django template loader that can return Mako templates. Started pulling in new wiki. · 45baccae
  Bridger Maxwell committed Aug 10, 2012
  
  45baccae Browse Files
08 Aug, 2012 9 commits
- Merge pull request #370 from MITx/feature/bridger/django1.4 · 6abc2d73
```
Feature/bridger/django1.4
```
  Calen Pennington committed Aug 08, 2012
  6abc2d73 Browse Files
- Updated sumbodule to compatible version of askbot. · 9df10c58
  Bridger Maxwell committed Aug 08, 2012
  
  9df10c58 Browse Files
- Merge pull request #369 from MITx/feature/halogenandtoast/table_of_contents · d5dd59bc
```
Feature/halogenandtoast/table of contents
```
  David Ormsbee committed Aug 08, 2012
  d5dd59bc Browse Files
- include courseware js · bcdcd734
  Matthew Mongeau committed Aug 08, 2012
  
  bcdcd734 Browse Files
- XML based table of contents for books. · 0b03834f
  Matthew Mongeau committed Aug 08, 2012
  
  0b03834f Browse Files
- Fixed CMS setting for 1.4 transition. · 7ae0005a
  Bridger Maxwell committed Aug 08, 2012
  
  7ae0005a Browse Files
- Upgrading to django 1.4. · 14a35b96
  Bridger Maxwell committed Aug 08, 2012
  
  14a35b96 Browse Files
- Merge branch 'hotfix/1.0.4' · 80b8529f
```
Conflicts:
	common/djangoapps/util/middleware.py
```
  Calen Pennington committed Aug 08, 2012
  80b8529f Browse Files
- Merge pull request #363 from MITx/feature/ichuang/improved-staff-debug-jquery · ebd0458d
```
improve staff_problem_info jquery, so the histogram is also toggled
```
  Calen Pennington committed Aug 08, 2012
  ebd0458d Browse Files
07 Aug, 2012 24 commits
- improve staff_problem_info jquery, so the histogram is also toggled · 92418411
  ichuang committed Aug 07, 2012
  
  92418411 Browse Files
- Merge pull request #362 from MITx/ichuang/minor-disable-django-debug-dev-ike · 165ffe0a
```
disable diajgo debug toolbar on mit server (dev_ike.py)
```
  ichuang committed Aug 07, 2012
  165ffe0a Browse Files
- disable diajgo debug toolbar on mit server (dev_ike.py) · 8bbf4334
  ichuang committed Aug 07, 2012
  
  8bbf4334 Browse Files
- Merge pull request #361 from MITx/feature/disable_staff_course_check_in_dev · d558e3a4
```
Feature/disable staff course check in dev
```
  Calen Pennington committed Aug 07, 2012
  d558e3a4 Browse Files
- re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use… · f4138cae
```
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
  f4138cae Browse Files
- disable ENABLE_LMS_MIGRATION in dev mode, so courses are always displayed · fbd813ae
  David Ormsbee committed Aug 07, 2012
  
  fbd813ae Browse Files
- Merge pull request #359 from MITx/ichuang/minor-fix-edit-link · a237322b
```
change edit link showhide to use <a> instead of <input> type submit
```
  Calen Pennington committed Aug 07, 2012
  a237322b Browse Files
- change edit link showhide to use <a> instead of <input> type submit · 9d2b821c
```
(fixes issues with edit links in multipart problems and video)
```
  ichuang committed Aug 07, 2012
  9d2b821c Browse Files
- Run all tests all the way through before quitting on errors · 9cba2232
  Calen Pennington committed Aug 07, 2012
  
  9cba2232 Browse Files
- Merge pull request #349 from MITx/feature/kfiedler/courseware-style · 258b9eb5
```
A bunch of various fixes and de-styling
```
  thomasxiii committed Aug 07, 2012
  258b9eb5 Browse Files
- Merge pull request #358 from MITx/kimth/lms-coderesponse · 96252aea
```
Kimth/lms coderesponse
```
  Calen Pennington committed Aug 07, 2012
  96252aea Browse Files
- Make the modal window work in the courseware · dd6ec19e
  Kyle Fiedler committed Aug 07, 2012
  
  dd6ec19e Browse Files
- Provide default xqueue in ModuleSystem · 05646fbe
  kimth committed Aug 07, 2012
  
  05646fbe Browse Files
- Merge master · a9a19f40
  kimth committed Aug 07, 2012
  
  a9a19f40 Browse Files
- add documentation on rake + unit tests · c79da581
  ichuang committed Aug 07, 2012
  
  c79da581 Browse Files
- Remove temporary datetime · b6dc622e
  kimth committed Aug 07, 2012
  
  b6dc622e Browse Files
- StudentModule lookups in queue callback use target user, rather than request.user · c39edb65
  kimth committed Aug 07, 2012
  
  c39edb65 Browse Files
- CodeResponse uses 'is_file' helper function · 501f2ccf
  kimth committed Aug 07, 2012
  
  501f2ccf Browse Files
- Tests provide xqueue params, rather than ModuleSystem.__init__ · f6202e56
  kimth committed Aug 07, 2012
  
  f6202e56 Browse Files
- Merge pull request #344 from MITx/feature/victor/file-per-descriptor · e847bae2
```
Feature/victor/file per descriptor
```
  Calen Pennington committed Aug 07, 2012
  e847bae2 Browse Files
- Make tests pass again again · b4e400ba
```
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
```
  Victor Shnayder committed Aug 07, 2012
  b4e400ba Browse Files
- Make tests pass again · 932a9be7
```
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
```
  Victor Shnayder committed Aug 07, 2012
  932a9be7 Browse Files
- always export metadata in alphabetical order · 55edb1ef
  Victor Shnayder committed Aug 07, 2012
  
  55edb1ef Browse Files
- a few pep8 cleanups · 47b9441a
  Victor Shnayder committed Aug 07, 2012
  
  47b9441a Browse Files