Commits · 077603bb9e16dd04bbe83e313e6a7908e8a110be · edx / edx-platform · GitLab

25 Jan, 2012 6 commits
- Merge with wiki branch (make sure to update templates too). · 077603bb
  Bridger Maxwell committed Jan 25, 2012
  
  077603bb Browse Files
- Fixed bug for first article creation. · 08e7d069
```
--HG--
branch : bridgerwiki
```
  Bridger Maxwell committed Jan 25, 2012
  08e7d069 Browse Files
- Added UI for locking article. Did more testing/bug fixes on deletion. Seems stable. · 614f1566
```
--HG--
branch : bridgerwiki
```
  Bridger Maxwell committed Jan 24, 2012
  614f1566 Browse Files
- Related bug fixed · 5a5e65a9
  Piotr Mitros committed Jan 24, 2012
  
  5a5e65a9 Browse Files
- Revert reversed. Database insert vs. update bug fixed · d0c8722d
  Piotr Mitros committed Jan 24, 2012
  
  d0c8722d Browse Files
- Got most of deleting working. · 056924ad
```
--HG--
branch : bridgerwiki
```
  Bridger Maxwell committed Jan 24, 2012
  056924ad Browse Files
24 Jan, 2012 11 commits
- Got most of admin deleting and user deleting implemented. Need to work on… · b3797a41
```
Got most of admin deleting and user deleting implemented. Need to work on interface for encountering deleted articles.

--HG--
branch : bridgerwiki
```
  Bridger Maxwell committed Jan 24, 2012
  b3797a41 Browse Files
- Tab type missing in list of modules · 98efb8c0
  Piotr Mitros committed Jan 24, 2012
  
  98efb8c0 Browse Files
- Profile page path issue · 8b4efadf
  Piotr Mitros committed Jan 24, 2012
  
  8b4efadf Browse Files
- Previous change introduced a bug where Django's ORM would insert instead of… · 7971a028
```
Previous change introduced a bug where Django's ORM would insert instead of update. Momentary revert.
```
  Piotr Mitros committed Jan 24, 2012
  7971a028 Browse Files
- Stage still needs old Askbot. Broken schema migrations. · 94a5c750
  Piotr Mitros committed Jan 24, 2012
  
  94a5c750 Browse Files
- Nasty bug fixes in when we can render. Need to apply to vertical too · acafd3f6
  Piotr Mitros committed Jan 23, 2012
  
  acafd3f6 Browse Files
- working on import issues · f3eb22e0
  Piotr Mitros committed Jan 23, 2012
  
  f3eb22e0 Browse Files
- Fully qualified path in import. Attempting to debug staging problem · 150fbc80
  Piotr Mitros committed Jan 23, 2012
  
  150fbc80 Browse Files
- New hgignore. Ignore this commit · 17a0c1e1
  Piotr Mitros committed Jan 23, 2012
  
  17a0c1e1 Browse Files
- Stupid infrastructure for benchmarking · 7ebdd04d
  Piotr Mitros committed Jan 23, 2012
  
  7ebdd04d Browse Files
- Redundant DB queries eliminated. We're at about 5 hits per sequence w/o Askbot, and 10 with · 4442754a
  Piotr Mitros committed Jan 23, 2012
  
  4442754a Browse Files
23 Jan, 2012 18 commits
- Fixed revert · 98e9d96c
  Piotr Mitros committed Jan 23, 2012
  
  98e9d96c Browse Files
- Merge · e982418a
  Piotr Mitros committed Jan 23, 2012
  
  e982418a Browse Files
- Adding fixture for pmitros@csail.mit.edu · b2d5c680
  Piotr Mitros committed Jan 23, 2012
  
  b2d5c680 Browse Files
- merging changes from wiki · faae6b59
  David Ormsbee committed Jan 23, 2012
  
  faae6b59 Browse Files
- added logging setup for settings_new_askbot.py · 28bc63f1
  David Ormsbee committed Jan 23, 2012
  
  28bc63f1 Browse Files
- Adding delete functionality · 608fa179
```
--HG--
branch : bridgerwiki
```
  Bridger Maxwell committed Jan 23, 2012
  608fa179 Browse Files
- Merge · 7e177fc6
```
--HG--
branch : bridgerwiki
```
  Bridger Maxwell committed Jan 23, 2012
  7e177fc6 Browse Files
- Simple logging so we can test loggers on staging. · dda92908
  David Ormsbee committed Jan 23, 2012
  
  dda92908 Browse Files
- merge · 81e70347
  Bridger Maxwell committed Jan 23, 2012
  
  81e70347 Browse Files
- Wiki redirection bug fix · f2f6f0c1
```
--HG--
branch : bridgerwiki
```
  Bridger Maxwell committed Jan 23, 2012
  f2f6f0c1 Browse Files
- rearrange imports · b8087c10
  David Ormsbee committed Jan 23, 2012
  
  b8087c10 Browse Files
- Merge · 01fbbb9f
  Piotr Mitros committed Jan 23, 2012
  
  01fbbb9f Browse Files
- merge · 5227734f
  Bridger Maxwell committed Jan 23, 2012
  
  5227734f Browse Files
- Merge · b694183d
  Bridger Maxwell committed Jan 23, 2012
  
  b694183d Browse Files
- Changed structure of wiki so that the base article is just '/' · 499ff9a9
```
--HG--
branch : bridgerwiki
```
  Bridger Maxwell committed Jan 23, 2012
  499ff9a9 Browse Files
- Switching to new Askbot · 747f5ac2
  Piotr Mitros committed Jan 23, 2012
  
  747f5ac2 Browse Files
- Bug fix in profile page · 11f30122
  Piotr Mitros committed Jan 23, 2012
  
  11f30122 Browse Files
- Video module set up to store last location. Several bug fixes too. · ef1c465d
  Piotr Mitros committed Jan 23, 2012
  
  ef1c465d Browse Files
22 Jan, 2012 1 commit
- Series remembers last spot · d989621b
  Piotr Mitros committed Jan 21, 2012
  
  d989621b Browse Files
21 Jan, 2012 4 commits
- Accidentally left in a print · 29d23d15
  Piotr Mitros committed Jan 21, 2012
  
  29d23d15 Browse Files
- All modules moved into new OO framework · ba2c0335
  Piotr Mitros committed Jan 21, 2012
  
  ba2c0335 Browse Files
- Vertical Module is now an x_module · 16ab1bb5
  Piotr Mitros committed Jan 21, 2012
  
  16ab1bb5 Browse Files
- Modules moved into their own directory · 837e87e1
```
--HG--
rename : courseware/capa_module.py => courseware/modules/capa_module.py
rename : courseware/html_module.py => courseware/modules/html_module.py
rename : courseware/schematic_module.py => courseware/modules/schematic_module.py
rename : courseware/video_module.py => courseware/modules/video_module.py
rename : courseware/x_module.py => courseware/modules/x_module.py
```
  Piotr Mitros committed Jan 21, 2012
  837e87e1 Browse Files