Commits · 335c6949f8363635da6e43dfda4cd39b4c0c9a16 · edx / edx-platform · GitLab

30 Nov, 2012 8 commits
- started consolidating editor functions · 335c6949
  Tom Giannattasio committed Nov 30, 2012
  
  335c6949 Browse Files
- working on date picker; conflicts with ids · 5dd90aa9
  Tom Giannattasio committed Nov 30, 2012
  
  5dd90aa9 Browse Files
- started adding date picker · 3d9961f8
  Tom Giannattasio committed Nov 30, 2012
  
  3d9961f8 Browse Files
- update styles fixed; tweaks to white button mixins; add update to top of list;… · 46d4e27c
```
update styles fixed; tweaks to white button mixins; add update to top of list; render updates upon save
```
  Tom Giannattasio committed Nov 30, 2012
  46d4e27c Browse Files
- add sidebar column; fixed main column float bug · 261c43aa
  Tom Giannattasio committed Nov 30, 2012
  
  261c43aa Browse Files
- markup tweaks to fix content crunching · f32388f2
  Tom Giannattasio committed Nov 30, 2012
  
  f32388f2 Browse Files
- Everything tested and ready for Tom to fix · 0b7bff4c
  Don Mitchell committed Nov 30, 2012
  
  0b7bff4c Browse Files
- Hopefully the course-info changes I had made w/o link destruction · 111e8521
  Don Mitchell committed Nov 30, 2012
  
  111e8521 Browse Files
29 Nov, 2012 1 commit
- Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup · 89ad8cc5
```
Static tabs cleanup
```
  chrisndodge committed Nov 29, 2012
  89ad8cc5 Browse Files
28 Nov, 2012 2 commits
- finished styling for static tabs; required some rework of global styles · 6cfabb76
  Tom Giannattasio committed Nov 28, 2012
  
  6cfabb76 Browse Files
- most of the styling and function changes made · 6ad8a9ac
  Tom Giannattasio committed Nov 28, 2012
  
  6ad8a9ac Browse Files
26 Nov, 2012 16 commits
- Merge pull request #1079 from MITx/feature/cdodge/tabs-show-only-name-on-preview · 9723bea5
```
made a special 'module preview' view for Static Tabs in the CMS. Per Tom...
```
  chrisndodge committed Nov 26, 2012
  9723bea5 Browse Files
- made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd… · b3dcc140
```
made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button
```
  Chris Dodge committed Nov 26, 2012
  b3dcc140 Browse Files
- added factory_boy to requirements.txt · 62fa734c
  Chris Dodge committed Nov 26, 2012
  
  62fa734c Browse Files
- Merge pull request #1041 from MITx/fix/cdodge/video-captions · 8e685732
```
wire through course asset path information to the video playback module ...
```
  Calen Pennington committed Nov 26, 2012
  8e685732 Browse Files
- assume that users are putting caption information in /static/subs. We'll enforce… · 6d45445a
```
assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility
```
  Chris Dodge committed Nov 26, 2012
  6d45445a Browse Files
- consolidate logic to compute caption path to server-side, we don't need to do this client-side · 2d7f1b73
  Chris Dodge committed Nov 26, 2012
  
  2d7f1b73 Browse Files
- wire through course asset path information to the video playback module and… · 71f16d40
```
wire through course asset path information to the video playback module and corresponding .coffee files
```
  Chris Dodge committed Nov 26, 2012
  71f16d40 Browse Files
- Merge pull request #1048 from MITx/feature/cdodge/xlint · 4e3da342
```
Feature/cdodge/xlint
```
  Calen Pennington committed Nov 26, 2012
  4e3da342 Browse Files
- cleave xlint entry point in xml_importer.py to be separate from the import method · fff37828
  Chris Dodge committed Nov 26, 2012
  
  fff37828 Browse Files
- fixed header float bug · f2fec99e
  Tom Giannattasio committed Nov 26, 2012
  
  f2fec99e Browse Files
- Merge pull request #1069 from MITx/feature/cas/tom/lms-styles · ee618d42
```
added basic lms styles
```
  Calen Pennington committed Nov 26, 2012
  ee618d42 Browse Files
- removed askbot · 86ebba3f
  Tom Giannattasio committed Nov 26, 2012
  
  86ebba3f Browse Files
- Merge pull request #1049 from MITx/feature/jzoldak/cms-unit-testing · c6a9f722
```
Add Studio integration with factory boy for creating XModule objects in the data store
```
  Calen Pennington committed Nov 26, 2012
  c6a9f722 Browse Files
- Merge pull request #1056 from MITx/bugfix/ichuang/xml_importer · 2b6e2b51
```
xml_importer bugfix - when importing without policy override use course_location
```
  Calen Pennington committed Nov 26, 2012
  2b6e2b51 Browse Files
- Merge pull request #1075 from MITx/fix/cdodge/env-bad-checkin · b250cad6
```
fix edit conflict
```
  chrisndodge committed Nov 26, 2012
  b250cad6 Browse Files
- fix edit conflict · 2524cd61
  Chris Dodge committed Nov 26, 2012
  
  2524cd61 Browse Files
20 Nov, 2012 1 commit
- added basic lms styles · a98cead8
  Tom Giannattasio committed Nov 20, 2012
  
  a98cead8 Browse Files
19 Nov, 2012 2 commits
- Merge pull request #1062 from MITx/fix/cdodge/xmodule-script-load-bug · 4e876b05
```
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript()...
```
  Calen Pennington committed Nov 19, 2012
  4e876b05 Browse Files
- insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This… · ec6b1a12
```
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This allows us a single point to define this dependency.
```
  Chris Dodge committed Nov 19, 2012
  ec6b1a12 Browse Files
18 Nov, 2012 1 commit
- xml_importer bugfix - when importing without policy override use course_location · f84f08fa
  ichuang committed Nov 17, 2012
  
  f84f08fa Browse Files
16 Nov, 2012 9 commits
- Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests · 650f5377
```
Make jasmine testing quieter
```
  Calen Pennington committed Nov 16, 2012
  650f5377 Browse Files
- Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests · 3b2b8ad4
```
Capa Problem jasmine tests running independently
```
  Calen Pennington committed Nov 16, 2012
  3b2b8ad4 Browse Files
- Merge pull request #1051 from MITx/fix/cdodge/code-mirror-crash-on-style-blocks · 71927787
```
remove 'mode' property when creating a new CodeMirror control. This appe...
```
  Calen Pennington committed Nov 16, 2012
  71927787 Browse Files
- Merge branch 'feature/cale/cms-master' into feature/jzoldak/common-jasmine-tests · 8d0abcb9
  Jay Zoldak committed Nov 16, 2012
  
  8d0abcb9 Browse Files
- Refactor fixtures for capa problems. · ea4c0ed8
  Jay Zoldak committed Nov 16, 2012
  
  ea4c0ed8 Browse Files
- Fix all but 4 broken tests. · a10a3209
  Jay Zoldak committed Nov 16, 2012
  
  a10a3209 Browse Files
- Fix the new problem create statements in the describe blocks for the capa display spec. · 6ae0add9
  Jay Zoldak committed Nov 16, 2012
  
  6ae0add9 Browse Files
- Get Problem constructor working again, and copy the helper file from lms. · 718ce4db
  Jay Zoldak committed Nov 16, 2012
  
  718ce4db Browse Files
- Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · 0fff578e
```
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
```
  Calen Pennington committed Nov 16, 2012
  0fff578e Browse Files