Commits · af4f1668d70ce35edfe2cc6df1e7079d3016927d · edx / edx-platform · GitLab

02 Jan, 2013 6 commits
- Stub out the video and capture the html files of the high level tabs for diff comparison · af4f1668
```
Conflicts:
	lms/templates/video.html
```
  Jay Zoldak committed Jan 02, 2013
  af4f1668 Browse Files
- Add item checking within courseware tabs · 10275e97
  Jay Zoldak committed Jan 02, 2013
  
  10275e97 Browse Files
- Cleanup of imports in courseware tests · a40ea202
  Jay Zoldak committed Jan 02, 2013
  
  a40ea202 Browse Files
- Smart accordion walkthrough working for cms-master branch · 0a77dd44
```
Conflicts:
	lms/envs/cms/acceptance.py
```
  Jay Zoldak committed Jan 02, 2013
  0a77dd44 Browse Files
- New branch for clean lms acceptance tests · 668bc81d
  Jay Zoldak committed Jan 02, 2013
  
  668bc81d Browse Files
- Merge pull request #1182 from MITx/bridger/feature/ungraded_course · 8bf393fb
```
Visual changes for ungraded courses
```
  David Ormsbee committed Jan 02, 2013
  8bf393fb Browse Files
21 Dec, 2012 13 commits
- Merge pull request #1201 from MITx/feature/rocha/change-courses-layout · e4dff3f7
```
Fix broken display of courses in university profile
```
  David Ormsbee committed Dec 21, 2012
  e4dff3f7 Browse Files
- Fix broken display of courses in university profile · 1ac41787
  Carlos Andrés Rocha committed Dec 21, 2012
  
  1ac41787 Browse Files
- Merge pull request #1190 from MITx/fix/alex/opendocs_linux · bcb5eda2
```
Fix/alex/opendocs linux
```
  David Ormsbee committed Dec 21, 2012
  bcb5eda2 Browse Files
- Merge pull request #1198 from MITx/feature/ichuang/update-tracking-log-sql-schema · 8532d79e
```
update schema for tracking sql logs - larger fields; add hostname
```
  David Ormsbee committed Dec 21, 2012
  8532d79e Browse Files
- Merge pull request #1199 from MITx/fix/zoldak/test-logger-settings · 5171fe68
```
Remove logger setting override from test settings configuration file.
```
  David Ormsbee committed Dec 21, 2012
  5171fe68 Browse Files
- Merge pull request #1196 from MITx/feature/rocha/change-courses-layout · 241b4eb0
```
New Layout for course listings with new course graphical overlay
```
  David Ormsbee committed Dec 21, 2012
  241b4eb0 Browse Files
- Merge pull request #1200 from MITx/content/rocha/job-page-update · 02151d39
```
Add Instructional Designer Job Post
```
  David Ormsbee committed Dec 21, 2012
  02151d39 Browse Files
- Add Instructional Designer Job Post · 4959dc60
  Carlos Andrés Rocha committed Dec 21, 2012
  
  4959dc60 Browse Files
- Merge pull request #1189 from MITx/fix/rocha/login-redirect · f43c93e1
```
Fix django auth login redirection
```
  David Ormsbee committed Dec 21, 2012
  f43c93e1 Browse Files
- Use course metadata instead of setting attributes to display new course overlay · 8ac89c39
  Carlos Andrés Rocha committed Dec 21, 2012
  
  8ac89c39 Browse Files
- Remove logger setting override from test settings configuration file. · 3bbfb485
  Jay Zoldak committed Dec 21, 2012
  
  3bbfb485 Browse Files
- update schema for tracking sql logs - larger fields; add hostname · 320f1b41
  ichuang committed Dec 21, 2012
  
  320f1b41 Browse Files
- Add logic to display courses by start date and show the new overlay · 22de7cbb
  Carlos Andrés Rocha committed Dec 20, 2012
  
  22de7cbb Browse Files
20 Dec, 2012 8 commits
- Merge branch 'style/btalbot/homepage-courselistings' into feature/rocha/change-courses-layout · a0d1d98c
  Carlos Andrés Rocha committed Dec 20, 2012
  
  a0d1d98c Browse Files
- Merge pull request #1193 from MITx/content/rocha/new-courses-2013 · ecc4d79f
```
Correct some spring courses announcement information
```
  David Ormsbee committed Dec 20, 2012
  ecc4d79f Browse Files
- Remove unused code from accounts login page · 3a4b626e
  Carlos Andrés Rocha committed Dec 20, 2012
  
  3a4b626e Browse Files
- Correct some spring courses announcement information · 6ad6d348
```
[#41545421]
```
  Carlos Andrés Rocha committed Dec 20, 2012
  6ad6d348 Browse Files
- fix · cc76e051
  Alexander Kryklia committed Dec 20, 2012
  
  cc76e051 Browse Files
- enabled rake docs for ubuntu · 4811e736
  Alexander Kryklia committed Dec 20, 2012
  
  4811e736 Browse Files
- course listings - new html and css for ordering - finished sass changes and static markup example · f92266d6
  Brian Talbot committed Dec 20, 2012
  
  f92266d6 Browse Files
- course listings - new html and css for ordering - wip · 37e0d98f
  Brian Talbot committed Dec 20, 2012
  
  37e0d98f Browse Files
19 Dec, 2012 13 commits
- Fix django auth login redirection · 5d85fab2
```
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.

We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.

[#41499213]
```
  Carlos Andrés Rocha committed Dec 19, 2012
  5d85fab2 Browse Files
- added new visual status to course listings on edx.org · 4d137446
  Brian Talbot committed Dec 19, 2012
  
  4d137446 Browse Files
- Merge pull request #1186 from MITx/content/rocha/new-courses-2013 · 89527281
```
Fix links for Software as a Service courses
```
  David Ormsbee committed Dec 19, 2012
  89527281 Browse Files
- Merge pull request #1185 from MITx/style/btalbot/edxsupportlogo · 65ec8ae0
```
edX's Zendesk Logo
```
  David Ormsbee committed Dec 19, 2012
  65ec8ae0 Browse Files
- Fix links for Software as a Service courses · b3343944
  Carlos Andrés Rocha committed Dec 19, 2012
  
  b3343944 Browse Files
- Merge pull request #1183 from MITx/bug/dhm/ie7 · 6905f7df
```
Bug/dhm/ie7
```
  Calen Pennington committed Dec 19, 2012
  6905f7df Browse Files
- adding zendesk logo for styling purposes · 4bcfa845
  Brian Talbot committed Dec 19, 2012
  
  4bcfa845 Browse Files
- The progress page now checks course.metadata.get(no_grade, False) to see if the course has a grade. · d9112976
  Bridger Maxwell committed Dec 19, 2012
  
  d9112976 Browse Files
- Added parameters to hide grade totals and grade cutoffs in progress graph. · 5a65c245
  Bridger Maxwell committed Dec 19, 2012
  
  5a65c245 Browse Files
- Merge pull request #1181 from MITx/content/rocha/new-courses-2013 · a53959a7
```
Add news announcement for spring 2013 courses
```
  David Ormsbee committed Dec 19, 2012
  a53959a7 Browse Files
- Merge pull request #1180 from MITx/feature/rocha/google-analytics-on-registration · ed051a50
```
Add google analytics to model signup and login panels
```
  David Ormsbee committed Dec 19, 2012
  ed051a50 Browse Files
- Merge pull request #1179 from MITx/content/rocha/job-and-faq-update · 4a283218
```
Update jobs and faq page
```
  David Ormsbee committed Dec 19, 2012
  4a283218 Browse Files
- Add google analytics to model signup and login panels · a239fe2e
```
[# 40805407]
```
  Carlos Andrés Rocha committed Dec 19, 2012
  a239fe2e Browse Files