Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Merge branch 'adolfo' into scopes | Evgeny Fadeev | 2013-03-21 | 4 | -13/+24 | |
| | |\ | ||||||
| | | * | display error messages via exceptions on livesettings | Adolfo Fitoria | 2013-03-20 | 4 | -13/+24 | |
| | * | | added setting to turn on and off selected scopes of questions | Evgeny Fadeev | 2013-03-21 | 1 | -0/+71 | |
| | |/ | ||||||
| | * | commented out the unnecessary setting | Evgeny Fadeev | 2013-03-19 | 3 | -13/+2 | |
| | * | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-19 | 3 | -6/+11 | |
| | |\ | ||||||
| | | * | styling changes in the tag selector, added exception handling for skin | Evgeny Fadeev | 2013-03-18 | 3 | -6/+11 | |
| | * | | Merge branch 'master' of git://github.com/ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-17 | 21 | -207/+250 | |
| | |\| | ||||||
| | | * | unified css of buttons | Evgeny Fadeev | 2013-03-17 | 20 | -199/+202 | |
| | * | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-14 | 4 | -5/+5 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-13 | 25 | -126/+148 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-11 | 18 | -108/+1674 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-07 | 17 | -94/+263 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-05 | 4 | -0/+4 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-01 | 3 | -1/+502 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | fixed typo en WYSIWYG editor | Adolfo Fitoria | 2013-02-26 | 1 | -2/+2 | |
| | * | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-26 | 9 | -63/+6599 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-25 | 18 | -60/+95 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | fixed django-tinymce version | Adolfo Fitoria | 2013-02-14 | 4 | -5/+5 | |
| | * | | | | | | | | | | updated settings template and startup procedures to make tinymce work | Adolfo Fitoria | 2013-02-14 | 4 | -14/+15 | |
| | * | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-14 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | fixed import-data url in urls.py | Adolfo Fitoria | 2013-02-13 | 1 | -1/+1 | |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-13 | 9 | -50/+115 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-06 | 10 | -22/+1162 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | wrapping migration 0161 in try/except because of auth_user table modification" | Adolfo Fitoria | 2013-02-04 | 1 | -3/+6 | |
| | * | | | | | | | | | | | | | fixed logging formating | Adolfo Fitoria | 2013-02-04 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-01 | 1 | -3/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-01-31 | 3 | -9/+16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-01-29 | 10 | -31/+70 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-01-25 | 11 | -37/+57 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-01-21 | 21 | -99/+197 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | added ASKBOT_MULTILINGUAL to settings.py template, tests fails if this is not... | Adolfo Fitoria | 2013-01-15 | 2 | -0/+9 | |
| * | | | | | | | | | | | | | | | | | | | updated the changelog | Evgeny Fadeev | 2013-03-23 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | better compress support on the main and question pages | Evgeny Fadeev | 2013-03-23 | 13 | -129/+157 | |
| * | | | | | | | | | | | | | | | | | | | some additional work on the compressor branch | Evgeny Fadeev | 2013-03-23 | 5 | -19/+96 | |
| * | | | | | | | | | | | | | | | | | | | Add django_compressor to compress CSS, JS and automatically compile LESS | Tyler Mandry | 2013-03-16 | 6 | -12/+34 | |
| * | | | | | | | | | | | | | | | | | | | Add ability to use LESS development mode with extra.less | Tyler Mandry | 2013-03-16 | 2 | -4/+11 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | recompiled the style.css file | Evgeny Fadeev | 2013-03-14 | 1 | -8/+48 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | changed the .org link to .com in the footer | Evgeny Fadeev | 2013-03-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | a typo in the documentation | Evgeny Fadeev | 2013-03-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | some bugfixes | Evgeny Fadeev | 2013-03-11 | 2 | -3/+3 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #96 from siovene/box-overflow | Evgeny Fadeev | 2013-03-11 | 2 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Adds overflow:hidden to .box selector. | Salvatore Iovene | 2012-11-03 | 2 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | Merge pull request #97 from siovene/conditional-sidebar-footer | Evgeny Fadeev | 2013-03-11 | 1 | -3/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Prevents sidebar footer from showing, if it's not defined. | Salvatore Iovene | 2012-11-03 | 1 | -3/+5 | |
| | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Merge pull request #106 from emonty/master | Evgeny Fadeev | 2013-03-11 | 15 | -113/+101 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Fix fake migration errors so we can find the real ones. | Monty Taylor | 2012-12-24 | 13 | -105/+83 | |
| | * | | | | | | | | | | | | | | | | | Make column changes actually work with InnoDB | Monty Taylor | 2012-12-24 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | | | | | | Add MySQL support for safe_add_column. | Monty Taylor | 2012-12-24 | 1 | -8/+13 | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #114 from tmandry/master | Evgeny Fadeev | 2013-03-11 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Fix bug causing askbot-setup script to never accept a sqlite filename. | Tyler Mandry | 2013-03-10 | 1 | -0/+2 |