Commits · 0f043f35d70706eee5a8dfbefd495c18913e5253 · edx / edx-platform · GitLab

23 Oct, 2012 7 commits
- Remove unused github_sync app · 0f043f35
  Calen Pennington committed Oct 23, 2012
  
  0f043f35 Browse Files
- Fix path to ui icon · 4122d8da
  Calen Pennington committed Oct 23, 2012
  
  4122d8da Browse Files
- Remove leftover merge garbage · ef1ba6d9
  Calen Pennington committed Oct 23, 2012
  
  ef1ba6d9 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · b52ed482
```
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
```
  Calen Pennington committed Oct 23, 2012
  b52ed482 Browse Files
- Merge pull request #945 from MITx/feature/cas/tom/section-details · 6083ba1d
```
Feature/cas/tom/section details
```
  Calen Pennington committed Oct 23, 2012
  6083ba1d Browse Files
- Merge pull request #947 from MITx/bug/cas/tom/new-user-save · 2cd17eae
```
changed save button to add user
```
  Calen Pennington committed Oct 23, 2012
  2cd17eae Browse Files
- Merge pull request #949 from MITx/fix/cdodge/trim-section-name-edits · c1cebe0d
```
trim section name strings to remove whitespace
```
  Calen Pennington committed Oct 23, 2012
  c1cebe0d Browse Files
22 Oct, 2012 25 commits
- tweaked styles for section naming · 1d40fa33
  Tom Giannattasio committed Oct 22, 2012
  
  1d40fa33 Browse Files
- wrapped up section date setting; need help with already published sections · f84b6031
  Tom Giannattasio committed Oct 22, 2012
  
  f84b6031 Browse Files
- started styling section date pickers · e3457fa2
  Tom Giannattasio committed Oct 22, 2012
  
  e3457fa2 Browse Files
- trim section name strings to remove whitespace · 90a55714
  Chris Dodge committed Oct 22, 2012
  
  90a55714 Browse Files
- Merge pull request #948 from MITx/fix/cdodge/import-improvements · b0055879
```
have import be a bit more flexible in terms of the packaging of the cont...
```
  Calen Pennington committed Oct 22, 2012
  b0055879 Browse Files
- changed save button to add user · df0ca3c4
  Tom Giannattasio committed Oct 22, 2012
  
  df0ca3c4 Browse Files
- have import be a bit more flexible in terms of the packaging of the content.… · 1530341d
```
have import be a bit more flexible in terms of the packaging of the content. Allow for tar.gz names to be different from the course name. Also don't assume that the unpacking of the zip will yield a single top level root folder.
```
  Chris Dodge committed Oct 22, 2012
  1530341d Browse Files
- Merge pull request #936 from MITx/feature/cas/tomg/saving-conventions · 44251612
```
new saving conventions
```
  Calen Pennington committed Oct 22, 2012
  44251612 Browse Files
- changed nameString variable · fb2925a2
  Tom Giannattasio committed Oct 22, 2012
  
  fb2925a2 Browse Files
- add background to policy item being added · a8aa8770
  Tom Giannattasio committed Oct 22, 2012
  
  a8aa8770 Browse Files
- added prompt on policy delete · 25415026
  Tom Giannattasio committed Oct 22, 2012
  
  25415026 Browse Files
- tweaked saving mechanisms on subsection page · 6d595b96
  Tom Giannattasio committed Oct 22, 2012
  
  6d595b96 Browse Files
- removed toast on save component · 33e6c583
  Tom Giannattasio committed Oct 22, 2012
  
  33e6c583 Browse Files
- added spinner to unit input name · 33df317d
  Tom Giannattasio committed Oct 22, 2012
  
  33df317d Browse Files
- added autosaving to field inputs on unit and subsection pages · f6d046dd
  Tom Giannattasio committed Oct 22, 2012
  
  f6d046dd Browse Files
- fixed reordering of subsection and units; they now save on update without error · 3a612a4d
  Tom Giannattasio committed Oct 22, 2012
  
  3a612a4d Browse Files
- whitespace trim · 00f3db37
  Tom Giannattasio committed Oct 22, 2012
  
  00f3db37 Browse Files
- added toast subsection save feedback · 7655a5ad
  Tom Giannattasio committed Oct 22, 2012
  
  7655a5ad Browse Files
- added delayed save after modifying display name on unit page · 54937e46
  Tom Giannattasio committed Oct 22, 2012
  
  54937e46 Browse Files
- properties changed to settings · c34d42d8
  Tom Giannattasio committed Oct 22, 2012
  
  c34d42d8 Browse Files
- Merge pull request #906 from MITx/victor/test-speedup · f50519ae
```
Victor/test speedup
```
  Victor Shnayder committed Oct 22, 2012
  f50519ae Browse Files
- Merge pull request #946 from MITx/bug/cas/tom/password-tab-index · 35d50976
```
fixed tabindex
```
  chrisndodge committed Oct 22, 2012
  35d50976 Browse Files
- fixed tabindex · 78a1743f
  Tom Giannattasio committed Oct 22, 2012
  
  78a1743f Browse Files
- Merge pull request #943 from MITx/feature/rocha/dashboard-software-licenses · 9a4e21c0
```
Add fix for users with multiple licenses
```
  David Ormsbee committed Oct 22, 2012
  9a4e21c0 Browse Files
- Add fix for users with multiple licenses · 3784c3ce
  Carlos Andrés Rocha committed Oct 22, 2012
  
  3784c3ce Browse Files
19 Oct, 2012 8 commits
- Merge pull request #941 from MITx/feature/rocha/dashboard-software-licenses · 853051bc
```
Use test database in licenses test instead of 6.002x
```
  bridger committed Oct 19, 2012
  853051bc Browse Files
- Use test database in licenses test instead of 6.002x · f890c1dc
  Carlos Andrés Rocha committed Oct 19, 2012
  
  f890c1dc Browse Files
- Merge pull request #940 from MITx/fix/cdodge/pre-push-tweeks · 87acaab6
```
remove cut/paste error which results in a server error.  is not defined ...
```
  chrisndodge committed Oct 18, 2012
  87acaab6 Browse Files
- remove cut/paste error which results in a server error. is not defined when… · 42487584
```
remove cut/paste error which results in a server error.  is not defined when there are no assets. Also fix up base.js to only register one set of handlers for file section which gets rid of the multiple file selection dialogs from appearing
```
  Chris Dodge committed Oct 18, 2012
  42487584 Browse Files
- Merge pull request #939 from MITx/fix/cdodge/pre-push-tweeks · 218cfe28
```
catch when users empty out a section name. don't allow them to do that.
```
  chrisndodge committed Oct 18, 2012
  218cfe28 Browse Files
- catch when users empty out a section name. don't allow them to do that. · d80c8340
  Chris Dodge committed Oct 18, 2012
  
  d80c8340 Browse Files
- Merge pull request #938 from MITx/fix/cdodge/pre-push-tweeks · a00275ac
```
Fix/cdodge/pre push tweeks
```
  chrisndodge committed Oct 18, 2012
  a00275ac Browse Files
- replaced DateJS with latest version from their repository. There was a known bug… · 8ad26fc2
```
replaced DateJS with latest version from their repository. There was a known bug about parsing times that are 12:xxPM - believe it or not.
```
  Chris Dodge committed Oct 18, 2012
  8ad26fc2 Browse Files