Commits · master · edx / acid-block

06 Sep, 2016 1 commit
- Merge pull request #13 from edx/add-openedx-yaml · b6febcd0
```
Add an OEP-2 compliant openedx.yaml file
```
  Calen Pennington committed Sep 06, 2016
  b6febcd0 Browse Files
23 Aug, 2016 2 commits
- Specify an owner · c72ed01f
  Calen Pennington committed Aug 23, 2016
  
  c72ed01f Browse Files
- Add an OEP-2 compliant openedx.yaml file · 5856b484
  Calen Pennington committed Aug 23, 2016
  
  5856b484 Browse Files
04 Dec, 2015 2 commits
- Merge pull request #12 from Lyla-Fischer/lyla/authors · 9aeb2152
```
added myself to authors
```
  Sarina Canelake committed Dec 04, 2015
  9aeb2152 Browse Files
- added myself to authors · aa4e9d8f
  Lyla Fischer committed Dec 04, 2015
  
  aa4e9d8f Browse Files
26 Nov, 2014 2 commits
- Merge pull request #9 from edx/dhm/aside · e46f9cda
```
Add Aside
```
  Don Mitchell committed Nov 26, 2014
  e46f9cda Browse Files
- Make acid_parent use js subclassing · 5bbb4a22
```
and get it to work.
```
  Don Mitchell committed Nov 26, 2014
  5bbb4a22 Browse Files
25 Nov, 2014 1 commit
- Change aside to render as a button which toggle shows · 2921b892
  Don Mitchell committed Nov 25, 2014
  
  2921b892 Browse Files
24 Nov, 2014 1 commit
- Making acid and aside real js objects · 0c8ac082
```
and changing test code for aside to check type of block dom
```
  Don Mitchell committed Nov 24, 2014
  0c8ac082 Browse Files
17 Nov, 2014 1 commit
- Add Aside · f8faad69
```
PLAT-216
```
  Don Mitchell committed Nov 17, 2014
  f8faad69 Browse Files
16 Oct, 2014 1 commit
- Merge pull request #8 from cpennington/count-acid-children-only · df1a7f0c
```
Count only acid-children in javascript child count tests.
```
  Calen Pennington committed Oct 16, 2014
  df1a7f0c Browse Files
15 Oct, 2014 2 commits
- Use unicode rather than str on usage_id to account for opaque_keys and other… · 805ef6bb
```
Use unicode rather than str on usage_id to account for opaque_keys and other unicode-aware key types
```
  Calen Pennington committed Oct 15, 2014
  805ef6bb Browse Files
- Only count acid block children when asserting the number of acid children from the front-end · 4fcf61af
  Calen Pennington committed Oct 15, 2014
  
  4fcf61af Browse Files
26 Mar, 2014 1 commit
- Fix Andy's entry · 3d1e4246
  Ned Batchelder committed Mar 26, 2014
  
  3d1e4246 Browse Files
05 Mar, 2014 2 commits
- Merge pull request #5 from edx/andya/acid-parent-xblock · 459aff7b
```
Split AcidBlock into leaf and parent variants
```
  Andy Armstrong committed Mar 05, 2014
  459aff7b Browse Files
- Split AcidBlock into leaf and parent variants · 5de8bcd6
```
Introduced a new AcidParentBlock, and refactored AcidBlock so that it doesn't have children.
```
  Andy Armstrong committed Mar 05, 2014
  5de8bcd6 Browse Files
04 Mar, 2014 1 commit
- Add myself to AUTHORS file. · 73de65fe
  Andy Armstrong committed Mar 03, 2014
  
  73de65fe Browse Files
25 Feb, 2014 1 commit
- Make AUTHORS match reality. · b734c955
  Ned Batchelder committed Feb 25, 2014
  
  b734c955 Browse Files
24 Feb, 2014 2 commits
- Merge pull request #4 from cpennington/remove-doc-ready · bf61f0fc
```
Remove the doc-ready function, as XBlock runtimes should be waiting until after the document is loaded to call XBlock initializers
```
  Calen Pennington committed Feb 24, 2014
  bf61f0fc Browse Files
- Remove the doc-ready function, as XBlock runtimes should be waiting until after… · dd7ee806
```
Remove the doc-ready function, as XBlock runtimes should be waiting until after the document is loaded to call XBlock initializers
```
  Calen Pennington committed Feb 24, 2014
  dd7ee806 Browse Files
20 Feb, 2014 1 commit
- Merge pull request #2 from cpennington/resources-test · ce4c0961
```
Add test of resources url
```
  Calen Pennington committed Feb 20, 2014
  ce4c0961 Browse Files
19 Feb, 2014 3 commits
- Add test of resources url · 43ebb814
  Calen Pennington committed Feb 19, 2014
  
  43ebb814 Browse Files
- Merge pull request #1 from cpennington/acid-child-test · 9c832513
```
Add tests of javascript children methods to AcidBlock
```
  Calen Pennington committed Feb 19, 2014
  9c832513 Browse Files
- Add tests of javascript children methods to AcidBlock · 11ab81ce
  Calen Pennington committed Feb 19, 2014
  
  11ab81ce Browse Files
13 Feb, 2014 2 commits
- Initial clone of acid xblock from… · aa95a3c1
```
Initial clone of acid xblock from https://github.com/edx/XBlock/commit/76486d8f49d3b77dc163e3f8e89967e789e8d8a7
```
  Calen Pennington committed Feb 13, 2014
  aa95a3c1 Browse Files
- Initial commit · da00e1d0
  Calen Pennington committed Feb 13, 2014
  
  da00e1d0 Browse Files