Commits · 210cdf870eb5e2d8d27c10c5676cf87968fbc97f · edx / edx-platform · GitLab

24 Jan, 2013 2 commits
- Updates to the mock peer grading service and new tests. · 210cdf87
  Diana Huang committed Jan 24, 2013
  
  210cdf87 Browse Files
- Update tests to cover the peer grading service · dc3dd41a
  Diana Huang committed Jan 24, 2013
  
  dc3dd41a Browse Files
23 Jan, 2013 25 commits
- Merge pull request #1340 from MITx/fix/zoldak/fix_jenkins · 548f3de5
```
Do not run the lms jasmine tests on jenkins for now, until we fix them.
```
  chrisndodge committed Jan 23, 2013
  548f3de5 Browse Files
- Do not run the lms jasmine tests on jenkins for now, until we fix them. · 29c4e6c0
  Jay Zoldak committed Jan 23, 2013
  
  29c4e6c0 Browse Files
- Merge pull request #1338 from MITx/fix/cdodge/remove-hide-progress-tab · 2ed5fdf7
```
Fix/cdodge/remove hide progress tab
```
  Christina Roberts committed Jan 23, 2013
  2ed5fdf7 Browse Files
- Merge pull request #1337 from MITx/feature/cale/fix-staff-debug-link · 247199d6
```
Feature/cale/fix staff debug link
```
  chrisndodge committed Jan 23, 2013
  247199d6 Browse Files
- add unit test to assert that the flag is not set on course metadata · 9c3e7278
  Chris Dodge committed Jan 23, 2013
  
  9c3e7278 Browse Files
- remove flag to hide progress tab · 9d5ac308
  Chris Dodge committed Jan 23, 2013
  
  9d5ac308 Browse Files
- Merge pull request #1334 from MITx/bug/btalbot/cms-problemmenu · cd78b27b
```
studio - resolved bug with .header CSS inheritance and problem editor
```
  Christina Roberts committed Jan 23, 2013
  cd78b27b Browse Files
- Whitespace cleanup · ae2a8e0c
  Calen Pennington committed Jan 23, 2013
  
  ae2a8e0c Browse Files
- staff_problem_info.html is only put on the page for staff, so we don't need to… · 6c181470
```
staff_problem_info.html is only put on the page for staff, so we don't need to check staff_access inside it
```
  Calen Pennington committed Jan 23, 2013
  6c181470 Browse Files
- studio - syncing cheatsheet language with new class name for heading 1 again · 25df02fe
  Brian Talbot committed Jan 23, 2013
  
  25df02fe Browse Files
- studio - syncing cheatsheet language with new class name for heading 1 · 0e061ca7
  Brian Talbot committed Jan 23, 2013
  
  0e061ca7 Browse Files
- studio - further resolved bug with .header CSS inheritance and problem editor menu UI · 5fee7eea
  Brian Talbot committed Jan 23, 2013
  
  5fee7eea Browse Files
- studio - resolved bug with .header CSS inheritance and problem editor menu UI · 2ca267dc
  Brian Talbot committed Jan 23, 2013
  
  2ca267dc Browse Files
- Merge pull request #1333 from MITx/feature/christina/misc · 6a4c6ad4
```
Import requireJS.
```
  Don Mitchell committed Jan 23, 2013
  6a4c6ad4 Browse Files
- Import requireJS. · a1eeb568
  cahrens committed Jan 23, 2013
  
  a1eeb568 Browse Files
- Merge pull request #1331 from MITx/feature/christina/tiny-mce · b0bbb346
```
Feature/christina/tiny mce
```
  Don Mitchell committed Jan 23, 2013
  b0bbb346 Browse Files
- Delete unused icon, reorder dropdown. · 2609ba40
  cahrens committed Jan 23, 2013
  
  2609ba40 Browse Files
- Merge pull request #1328 from MITx/fix/cdodge/subsection-crash-no-display-name · c7d9eb23
```
use property rather than referencing the metadata dictionary. This is be...
```
  Don Mitchell committed Jan 23, 2013
  c7d9eb23 Browse Files
- Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items · 966db4fb
```
add optional course_id parameter to DraftMongoStore.get_items()
```
  Don Mitchell committed Jan 23, 2013
  966db4fb Browse Files
- Merge pull request #1295 from MITx/feature/jarv/certificate-force-update · eab95114
```
Feature/jarv/certificate force update
```
  David Ormsbee committed Jan 23, 2013
  eab95114 Browse Files
- use property rather than referencing the metadata dictionary. This is better… · 00421315
```
use property rather than referencing the metadata dictionary. This is better because if there is no 'display_name' defined, then we get back a string of the location name
```
  Chris Dodge committed Jan 23, 2013
  00421315 Browse Files
- Merge pull request #1327 from MITx/bugfix/brian/openid_provider_post · 07785e3c
```
Fix handling of openid provider requests that use POST
```
  Victor Shnayder committed Jan 23, 2013
  07785e3c Browse Files
- add more test coverage for openid provider. · 9d28c377
  Brian Wilson committed Jan 23, 2013
  
  9d28c377 Browse Files
- Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post · ba62a657
  Brian Wilson committed Jan 22, 2013
  
  ba62a657 Browse Files
- studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon · 5e772607
  Brian Talbot committed Jan 22, 2013
  
  5e772607 Browse Files
22 Jan, 2013 13 commits
- Merge pull request #796 from MITx/feature/cale/cms-master · ae6dd496
```
CMS Master
```
  David Ormsbee committed Jan 22, 2013
  ae6dd496 Browse Files
- Removed unused and stylistically incorrect class defs · 1f261e65
  Don Mitchell committed Jan 22, 2013
  
  1f261e65 Browse Files
- studio - resolved base variable missing issue on lms side · 023dadd0
  Brian Talbot committed Jan 22, 2013
  
  023dadd0 Browse Files
- studio html editor - matched up styles for <pre> elements · fd3ae2c4
  Brian Talbot committed Jan 22, 2013
  
  fd3ae2c4 Browse Files
- Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce · 731fb209
```
Conflicts:
	cms/static/css/tiny-mce.css
```
  cahrens committed Jan 22, 2013
  731fb209 Browse Files
- studio html editor - adding in font references to tinyMCE css · b381881a
  Brian Talbot committed Jan 22, 2013
  
  b381881a Browse Files
- studio html editor - revised header styles for editing/displaying HTML… · aec7692d
```
studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules)
```
  Brian Talbot committed Jan 22, 2013
  aec7692d Browse Files
- change class on right element! · 13945994
  cahrens committed Jan 22, 2013
  
  13945994 Browse Files
- Cleanup of format dropdown, toolbar buttons. · b554eb5a
  cahrens committed Jan 22, 2013
  
  b554eb5a Browse Files
- studio html editor - added in styles for TinyMCE table elements · e3a2749f
  Brian Talbot committed Jan 22, 2013
  
  e3a2749f Browse Files
- Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · 75b0a8ee
  Calen Pennington committed Jan 22, 2013
  
  75b0a8ee Browse Files
- Merge pull request #1325 from MITx/feature/cale/anon-user-bugfix · 82eee4af
```
Anonymous users don't have an email attribute, and shouldn't be checked ...
```
  Calen Pennington committed Jan 22, 2013
  82eee4af Browse Files
- Anonymous users don't have an email attribute, and shouldn't be checked for CourseEnrollmentAllowed · bbcab731
  Calen Pennington committed Jan 22, 2013
  
  bbcab731 Browse Files