Commits · c5ce0bdfea3a7fc4ccd573d772e7c5dd96201b63 · edx / edx-platform · GitLab

17 Jul, 2012 21 commits
- updates copy on about contact and faq, tweeks home page header · c5ce0bdf
  Galen Frechette committed Jul 17, 2012
  
  c5ce0bdf Browse Files
- updates and imporves design of the home page header · d55cd78c
  Galen Frechette committed Jul 17, 2012
  
  d55cd78c Browse Files
- Merge pull request #179 from MITx/course_start · 04b8dbe0
```
Course start
```
  bridger committed Jul 17, 2012
  04b8dbe0 Browse Files
- Merge remote-tracking branch 'origin/master' into course_start · 2f4cf23b
```
Conflicts:
	common/djangoapps/student/views.py
```
  Bridger Maxwell committed Jul 17, 2012
  2f4cf23b Browse Files
- Merge pull request #184 from MITx/template_caching · 08ddd03b
```
edX caching
```
  bridger committed Jul 17, 2012
  08ddd03b Browse Files
- Merge remote-tracking branch 'origin/master' into template_caching · 615f11e2
  Bridger Maxwell committed Jul 17, 2012
  
  615f11e2 Browse Files
- Merge pull request #188 from MITx/dormsbee/portal_display_tweaks · 02a30ef0
```
Dormsbee/portal display tweaks
```
  Calen Pennington committed Jul 17, 2012
  02a30ef0 Browse Files
- Changed check_course from a decorator to a regular function that throws… · 938f0d19
```
Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now.
```
  Bridger Maxwell committed Jul 17, 2012
  938f0d19 Browse Files
- Use Course.number, remove final exam and content length from the course sidebar… · b4a8417e
```
Use Course.number, remove final exam and content length from the course sidebar (do we have that data yet?)
```
  David Ormsbee committed Jul 17, 2012
  b4a8417e Browse Files
- Add overview.html, a simple one page place where course staff can control a course about page. · 28fc3ec1
  David Ormsbee committed Jul 17, 2012
  
  28fc3ec1 Browse Files
- Merge remote-tracking branch 'origin/master' into course_start · 8ebaf8a7
```
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/urls.py
```
  Bridger Maxwell committed Jul 17, 2012
  8ebaf8a7 Browse Files
- Merge pull request #187 from MITx/dormsbee/portal_display_tweaks · c85cf38a
```
Dormsbee/portal display tweaks
```
  Calen Pennington committed Jul 17, 2012
  c85cf38a Browse Files
- Minor formatting change in OSX docs for CMS import · f6cc97a9
  Calen Pennington committed Jul 17, 2012
  
  f6cc97a9 Browse Files
- Add basic documentation of importing data into the CMS for development · 17c3d068
  Calen Pennington committed Jul 17, 2012
  
  17c3d068 Browse Files
- Remove duplicate entries of courses. · c0e8dc1b
  David Ormsbee committed Jul 17, 2012
  
  c0e8dc1b Browse Files
- Add number property to CourseDescriptor and switch templates to use it. · 373db870
  David Ormsbee committed Jul 17, 2012
  
  373db870 Browse Files
- Change course listing to show course numbers + title · 27ec1b4d
  David Ormsbee committed Jul 17, 2012
  
  27ec1b4d Browse Files
- Shorten course about link · e8516c5a
  David Ormsbee committed Jul 17, 2012
  
  e8516c5a Browse Files
- Allow UTF-8 chars in about sections. · d20eb077
  David Ormsbee committed Jul 17, 2012
  
  d20eb077 Browse Files
- Merge remote-tracking branch 'origin/master' into template_caching · d38903ac
```
Conflicts:
	lms/static/sass/application.css
```
  Bridger Maxwell committed Jul 16, 2012
  d38903ac Browse Files
- renames some scss files for better orginization, sets fixed widths on main… · 76746938
```
renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling
```
  Galen Frechette committed Jul 16, 2012
  76746938 Browse Files
16 Jul, 2012 19 commits
- imporves course object header typography · 600aff59
  Galen Frechette committed Jul 16, 2012
  
  600aff59 Browse Files
- Removing lms/static/sass/application.css again. · 36408a8d
  Bridger Maxwell committed Jul 16, 2012
  
  36408a8d Browse Files
- adds icons to course about page, user nav and dashboard, adds styles to activation pages · 96361c3f
  Galen Frechette committed Jul 16, 2012
  
  96361c3f Browse Files
- Ignoring +lms/static/sass/application.css · e7fa4226
  Bridger Maxwell committed Jul 16, 2012
  
  e7fa4226 Browse Files
- Merge pull request #186 from MITx/ccp0101/capa_pythonpath · ffb341f6
```
Ccp0101/capa pythonpath
```
  ichuang committed Jul 16, 2012
  ffb341f6 Browse Files
- Removing compiles application.css file. · d690a0de
  Bridger Maxwell committed Jul 16, 2012
  
  d690a0de Browse Files
- Merge branch 'master' into ccp0101/capa_pythonpath · 8365c2fd
  Arjun Singh committed Jul 16, 2012
  
  8365c2fd Browse Files
- Allows for additional paths when executing code in a loncapa problem. Adds a… · 06824018
```
Allows for additional paths when executing code in a loncapa problem. Adds a default path of data/course/code.
```
  Arjun Singh committed Jul 16, 2012
  06824018 Browse Files
- Merge remote-tracking branch 'origin/master' into template_caching · bde93aea
```
Conflicts:
	lms/templates/footer.html
	lms/templates/signup_modal.html
```
  Bridger Maxwell committed Jul 16, 2012
  bde93aea Browse Files
- Merged with master. Moved a bunch of static template files to their own urls (without /t/template). · 70e2f7c0
  Bridger Maxwell committed Jul 16, 2012
  
  70e2f7c0 Browse Files
- Merge pull request #183 from MITx/victor/cms_more_auth · c3437342
```
Add fixes to notes in #182
```
  Victor Shnayder committed Jul 16, 2012
  c3437342 Browse Files
- Add fixes to notes in #182 · f8ce11a6
```
* use 'location' instead of 'id' in views.
* still need to change names in the coffeescript--quick fix didn't work
```
  Victor Shnayder committed Jul 16, 2012
  f8ce11a6 Browse Files
- Merge pull request #182 from MITx/victor/cms_more_auth · f8878279
```
Victor/cms more auth
```
  Calen Pennington committed Jul 16, 2012
  f8878279 Browse Files
- Added a cache_if_anonymous decorator. · 960c8619
  Bridger Maxwell committed Jul 16, 2012
  
  960c8619 Browse Files
- styles activation message · 2d3bab41
  Galen Frechette committed Jul 16, 2012
  
  2d3bab41 Browse Files
- simplify rakefile a bit in response to comments on #178 · 97a24226
  Victor Shnayder committed Jul 16, 2012
  
  97a24226 Browse Files
- fix description of mitxmako · caf163eb
  Victor Shnayder committed Jul 16, 2012
  
  caf163eb Browse Files
- address comments in pull #178 · 49576f9d
  Victor Shnayder committed Jul 16, 2012
  
  49576f9d Browse Files
- remove empty marketing template · 5609ca6e
  Victor Shnayder committed Jul 16, 2012
  
  5609ca6e Browse Files