Commits · f4032caeaf2e24ac0ced9cf8fb0334d93c59916c · edx / edx-platform · GitLab

01 Mar, 2013 1 commit
- Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged · f4032cae
```
Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py
```
  Calen Pennington committed Mar 01, 2013
  f4032cae Browse Files
28 Feb, 2013 1 commit
- remove `self.contents` from `ConditionalModule` · e9dacfae
  Vasyl Nakvasiuk committed Feb 28, 2013
  
  e9dacfae Browse Files
27 Feb, 2013 2 commits
- use shortcut `get_display_items` · 9186e617
  Vasyl Nakvasiuk committed Feb 27, 2013
  
  9186e617 Browse Files
- fix caching problem in conditional_module · 81bfa46f
  Vasyl Nakvasiuk committed Feb 27, 2013
  
  81bfa46f Browse Files
26 Feb, 2013 1 commit
- call `system.error_tracker` together with logging · 076926c4
  Vasyl Nakvasiuk committed Feb 26, 2013
  
  076926c4 Browse Files
25 Feb, 2013 21 commits
- fix empty display_name problem · 2348ed3d
  Vasyl Nakvasiuk committed Feb 25, 2013
  
  2348ed3d Browse Files
- remove 'passed' feature · aa34c9d3
  Vasyl Nakvasiuk committed Feb 25, 2013
  
  aa34c9d3 Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · a70cb2e1
  Vasyl Nakvasiuk committed Feb 25, 2013
  
  a70cb2e1 Browse Files
- add docstring · 0448ef5e
  Vasyl Nakvasiuk committed Feb 25, 2013
  
  0448ef5e Browse Files
- Changed text on reset button. · 65bbfab5
  Valera Rozuvan committed Feb 25, 2013
  
  65bbfab5 Browse Files
- renamed · fbc8d0e9
  Alexander Kryklia committed Feb 25, 2013
  
  fbc8d0e9 Browse Files
- reset updates · ebc37f1d
  Alexander Kryklia committed Feb 25, 2013
  
  ebc37f1d Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · 767f0bd4
  Valera Rozuvan committed Feb 25, 2013
  
  767f0bd4 Browse Files
- Testing errors. · 1ca397c5
  Valera Rozuvan committed Feb 25, 2013
  
  1ca397c5 Browse Files
- add icon class support · 4600155f
  Alexander Kryklia committed Feb 25, 2013
  
  4600155f Browse Files
- Bug fixing. · df2335c9
  Valera Rozuvan committed Feb 25, 2013
  
  df2335c9 Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · 6f16455e
  Valera Rozuvan committed Feb 25, 2013
  
  6f16455e Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · 0f7db9e5
  Alexander Kryklia committed Feb 25, 2013
  
  0f7db9e5 Browse Files
- Fixing bugs. · 5a62eae7
  Valera Rozuvan committed Feb 25, 2013
  
  5a62eae7 Browse Files
- fixed reset json · f5dc0afa
  Alexander Kryklia committed Feb 25, 2013
  
  f5dc0afa Browse Files
- UI changes. · 653154f1
  Valera Rozuvan committed Feb 25, 2013
  
  653154f1 Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · d9ad4b57
  Valera Rozuvan committed Feb 25, 2013
  
  d9ad4b57 Browse Files
- Front end stuff clean up. · 268e5b4b
  Valera Rozuvan committed Feb 25, 2013
  
  268e5b4b Browse Files
- return ok on poll_reset · 82a74abd
  Alexander Kryklia committed Feb 25, 2013
  
  82a74abd Browse Files
- added icon class · 9cdd271e
  Alexander Kryklia committed Feb 25, 2013
  
  9cdd271e Browse Files
- reset part-1 · 3dae4d29
  Alexander Kryklia committed Feb 25, 2013
  
  3dae4d29 Browse Files
22 Feb, 2013 1 commit
- re-enable discussion service · 4713c5f0
  Alexander Kryklia committed Feb 22, 2013
  
  4713c5f0 Browse Files
19 Feb, 2013 3 commits
- small refactor · 6940cb33
  Alexander Kryklia committed Feb 19, 2013
  
  6940cb33 Browse Files
- get_module get descr insted of loc · e2470842
  Alexander Kryklia committed Feb 19, 2013
  
  e2470842 Browse Files
- fix typo · 841cfd28
  Alexander Kryklia committed Feb 19, 2013
  
  841cfd28 Browse Files
18 Feb, 2013 3 commits
- fix typo · 72f65783
  Alexander Kryklia committed Feb 18, 2013
  
  72f65783 Browse Files
- Revert "fix typo" · 0a80f835
```
This reverts commit 24d2c11c.
```
  Alexander Kryklia committed Feb 18, 2013
  0a80f835 Browse Files
- fix typo · 24d2c11c
  Alexander Kryklia committed Feb 18, 2013
  
  24d2c11c Browse Files
15 Feb, 2013 2 commits
- Fix tests · 2bc30001
  Calen Pennington committed Feb 15, 2013
  
  2bc30001 Browse Files
- poll and conditional finished · 059b9f66
  Alexander Kryklia committed Feb 15, 2013
  
  059b9f66 Browse Files
13 Feb, 2013 5 commits
- Fixing xmodule tests · 04d71469
  Calen Pennington committed Feb 13, 2013
  
  04d71469 Browse Files
- Indentation fix · 2443aa79
  Calen Pennington committed Feb 13, 2013
  
  2443aa79 Browse Files
- Fix course short description display (now that they're xmodules) · 50af0be1
  Calen Pennington committed Feb 13, 2013
  
  50af0be1 Browse Files
- Fix data_dirs for /static link replacement · 927da344
  Calen Pennington committed Feb 13, 2013
  
  927da344 Browse Files
- Fix more tests · f0f7e0dc
  Calen Pennington committed Feb 13, 2013
  
  f0f7e0dc Browse Files