Marcin Koziej [Tue, 31 Jan 2012 09:05:00 +0000 (10:05 +0100)]
some speedups for batch indexing
Marcin Koziej [Mon, 30 Jan 2012 16:44:44 +0000 (17:44 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Conflicts:
wolnelektury/templates/catalogue/book_searched.html
Radek Czajka [Mon, 30 Jan 2012 16:18:31 +0000 (17:18 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Conflicts:
wolnelektury/static/js/search.js
Radek Czajka [Mon, 30 Jan 2012 16:16:43 +0000 (17:16 +0100)]
more dynamic popups, compatibility fixes
Marcin Koziej [Mon, 30 Jan 2012 16:15:39 +0000 (17:15 +0100)]
remove set_trace
Marcin Koziej [Mon, 30 Jan 2012 16:14:35 +0000 (17:14 +0100)]
check for empty source in dc
Marcin Koziej [Mon, 30 Jan 2012 16:10:48 +0000 (17:10 +0100)]
search display tags at top.
Marcin Koziej [Mon, 30 Jan 2012 12:21:06 +0000 (13:21 +0100)]
Fix section counting/targetting from search snippet
Radek Czajka [Mon, 30 Jan 2012 11:45:28 +0000 (12:45 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Conflicts:
lib/librarian
Radek Czajka [Mon, 30 Jan 2012 11:43:46 +0000 (12:43 +0100)]
display fixes
Marcin Koziej [Mon, 30 Jan 2012 10:50:50 +0000 (11:50 +0100)]
footnotes
Marcin Koziej [Mon, 30 Jan 2012 09:37:42 +0000 (10:37 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Conflicts:
lib/librarian
Marcin Koziej [Mon, 30 Jan 2012 09:33:58 +0000 (10:33 +0100)]
librarian bump with proper merge
Radek Czajka [Mon, 30 Jan 2012 08:58:16 +0000 (09:58 +0100)]
new cover
Marcin Koziej [Sat, 28 Jan 2012 06:14:16 +0000 (07:14 +0100)]
somehow librarian bump wasnt commited
Radek Czajka [Fri, 27 Jan 2012 18:44:09 +0000 (19:44 +0100)]
default covers
Radek Czajka [Fri, 27 Jan 2012 16:53:42 +0000 (17:53 +0100)]
more fixes
Radek Czajka [Fri, 27 Jan 2012 16:19:33 +0000 (17:19 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Radek Czajka [Fri, 27 Jan 2012 16:18:55 +0000 (17:18 +0100)]
don't delay touch_tag
Marcin Koziej [Fri, 27 Jan 2012 16:07:31 +0000 (17:07 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Radek Czajka [Fri, 27 Jan 2012 16:05:33 +0000 (17:05 +0100)]
fix
Radek Czajka [Fri, 27 Jan 2012 15:59:26 +0000 (16:59 +0100)]
fix
Marcin Koziej [Fri, 27 Jan 2012 15:58:59 +0000 (16:58 +0100)]
add section numbers in search + fixes
Radek Czajka [Fri, 27 Jan 2012 15:55:10 +0000 (16:55 +0100)]
fix
Radek Czajka [Fri, 27 Jan 2012 15:53:32 +0000 (16:53 +0100)]
fix
Radek Czajka [Fri, 27 Jan 2012 15:51:58 +0000 (16:51 +0100)]
fix
Radek Czajka [Fri, 27 Jan 2012 15:44:35 +0000 (16:44 +0100)]
some css + l10n
Radek Czajka [Fri, 27 Jan 2012 14:22:42 +0000 (15:22 +0100)]
use html5 placeholder and hide labels,
pretty fragments,
more display fixes
Marcin Koziej [Fri, 27 Jan 2012 11:58:04 +0000 (12:58 +0100)]
search fixes
Radek Czajka [Thu, 26 Jan 2012 15:28:04 +0000 (16:28 +0100)]
display fixes
Radek Czajka [Thu, 26 Jan 2012 15:00:40 +0000 (16:00 +0100)]
dynamic catalogue menu
Marcin Koziej [Thu, 26 Jan 2012 13:17:43 +0000 (14:17 +0100)]
merge
Marcin Koziej [Thu, 26 Jan 2012 13:16:29 +0000 (14:16 +0100)]
Some search fixes.
Radek Czajka [Thu, 26 Jan 2012 11:55:38 +0000 (12:55 +0100)]
pretty cite on main
Radek Czajka [Wed, 25 Jan 2012 13:19:46 +0000 (14:19 +0100)]
editable promo on main
Radek Czajka [Wed, 25 Jan 2012 12:56:45 +0000 (13:56 +0100)]
allow marking long cites
Radek Czajka [Wed, 25 Jan 2012 12:17:21 +0000 (13:17 +0100)]
nicer fragments: no anchors in text, prettier short_text
Radek Czajka [Tue, 24 Jan 2012 16:06:12 +0000 (17:06 +0100)]
catalogue style change
Radek Czajka [Tue, 24 Jan 2012 15:51:33 +0000 (16:51 +0100)]
more box fixes
Radek Czajka [Tue, 24 Jan 2012 15:09:22 +0000 (16:09 +0100)]
display changes, mostly in book boxes
Radek Czajka [Tue, 24 Jan 2012 12:06:37 +0000 (13:06 +0100)]
better related books
Radek Czajka [Mon, 23 Jan 2012 14:49:49 +0000 (15:49 +0100)]
change cover thumb size
Radek Czajka [Mon, 23 Jan 2012 14:17:16 +0000 (15:17 +0100)]
cache fix
Radek Czajka [Mon, 23 Jan 2012 13:51:56 +0000 (14:51 +0100)]
book children are back, + related books
Radek Czajka [Mon, 23 Jan 2012 13:25:37 +0000 (14:25 +0100)]
selected cites in admin
Radek Czajka [Mon, 23 Jan 2012 13:17:04 +0000 (14:17 +0100)]
pictures cache fix
Marcin Koziej [Mon, 23 Jan 2012 12:34:23 +0000 (13:34 +0100)]
un-leak local conf
Marcin Koziej [Mon, 23 Jan 2012 12:26:03 +0000 (13:26 +0100)]
search result display
Marcin Koziej [Sun, 22 Jan 2012 21:29:31 +0000 (22:29 +0100)]
result categories working.
Radek Czajka [Mon, 23 Jan 2012 11:09:31 +0000 (12:09 +0100)]
basic fragment choosing
Radek Czajka [Fri, 20 Jan 2012 14:29:07 +0000 (15:29 +0100)]
minor style fix
Radek Czajka [Fri, 20 Jan 2012 14:24:19 +0000 (15:24 +0100)]
search fixes
Radek Czajka [Fri, 20 Jan 2012 14:17:30 +0000 (15:17 +0100)]
main page look minor fixes
Marcin Koziej [Thu, 19 Jan 2012 16:19:52 +0000 (17:19 +0100)]
pass context
Marcin Koziej [Thu, 19 Jan 2012 15:58:04 +0000 (16:58 +0100)]
oops sorry; commited local mysqldb setup
Marcin Koziej [Thu, 19 Jan 2012 15:48:05 +0000 (16:48 +0100)]
merge settings cache chagnes
Marcin Koziej [Thu, 19 Jan 2012 15:45:27 +0000 (16:45 +0100)]
search - new result layout. the css is not perfect though.
Marcin Koziej [Wed, 18 Jan 2012 10:49:37 +0000 (11:49 +0100)]
bugfixes
Radek Czajka [Thu, 19 Jan 2012 14:46:38 +0000 (15:46 +0100)]
test settings fix
Radek Czajka [Thu, 19 Jan 2012 14:46:10 +0000 (15:46 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Conflicts:
wolnelektury/static/css/book_box.css
wolnelektury/templates/catalogue/book_wide.html
Radek Czajka [Thu, 19 Jan 2012 14:25:14 +0000 (15:25 +0100)]
move some imports
Radek Czajka [Thu, 19 Jan 2012 14:23:44 +0000 (15:23 +0100)]
piwik stats minor change
Radek Czajka [Thu, 19 Jan 2012 14:21:59 +0000 (15:21 +0100)]
stars and tags instead of shelves, move to social app
Book.related_info cache for related tags and media instead of short_html cache
ajaxable: add Vary header for ajax, support for login-only forms and prefixing,
and we don't need the ?ajax nonsense
move SearchForm to search
Marcin Koziej [Wed, 18 Jan 2012 14:08:25 +0000 (15:08 +0100)]
ignore comments in xml when indexing; make-xml-zip script
Marcin Koziej [Wed, 18 Jan 2012 09:17:58 +0000 (10:17 +0100)]
dont use celery to index - seems it gets blocked on index file access
Radek Czajka [Fri, 13 Jan 2012 16:05:36 +0000 (17:05 +0100)]
Merge branch 'production' into pretty
Conflicts:
apps/catalogue/models.py
wolnelektury/settings.py
wolnelektury/templates/catalogue/main_page.html
wolnelektury/urls.py
Marcin Koziej [Mon, 16 Jan 2012 14:07:47 +0000 (15:07 +0100)]
cotnent indexing - bugs.
Marcin Koziej [Mon, 16 Jan 2012 13:33:18 +0000 (14:33 +0100)]
Fixed collecting content for snippet generation
Marcin Koziej [Thu, 12 Jan 2012 15:40:27 +0000 (16:40 +0100)]
book search - new design - almost ready
Radek Czajka [Thu, 12 Jan 2012 14:20:47 +0000 (15:20 +0100)]
changes default filesystem cache location
Radek Czajka [Thu, 12 Jan 2012 14:02:43 +0000 (15:02 +0100)]
update to Django 1.3; cache some api calls
Marcin Koziej [Wed, 11 Jan 2012 13:36:09 +0000 (14:36 +0100)]
search - did you mean?
Marcin Koziej [Wed, 11 Jan 2012 11:54:13 +0000 (12:54 +0100)]
search input field,
reindex command accepts slugs
Radek Czajka [Tue, 10 Jan 2012 15:47:39 +0000 (16:47 +0100)]
reset cache on chunk save
Radek Czajka [Tue, 10 Jan 2012 15:29:24 +0000 (16:29 +0100)]
template fix
Radek Czajka [Tue, 10 Jan 2012 15:22:24 +0000 (16:22 +0100)]
non-permanent redirect
Radek Czajka [Tue, 10 Jan 2012 15:22:05 +0000 (16:22 +0100)]
add collection for Boy
Radek Czajka [Tue, 10 Jan 2012 11:05:01 +0000 (12:05 +0100)]
look changes
Marcin Koziej [Mon, 9 Jan 2012 14:06:53 +0000 (15:06 +0100)]
Search - some tests, change in SearchResults cleaning.
Marcin Koziej [Thu, 5 Jan 2012 12:11:38 +0000 (13:11 +0100)]
Some refactoring & documentation changes in search.
Radek Czajka [Wed, 4 Jan 2012 12:41:52 +0000 (13:41 +0100)]
#1913: tags in section titles break toc
Marcin Koziej [Mon, 2 Jan 2012 15:40:15 +0000 (16:40 +0100)]
some css tweaks regarding colors
Marcin Koziej [Fri, 30 Dec 2011 12:43:35 +0000 (13:43 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Marcin Koziej [Fri, 30 Dec 2011 12:43:13 +0000 (13:43 +0100)]
custom pdf download via ajaxable
Radek Czajka [Fri, 30 Dec 2011 12:38:31 +0000 (13:38 +0100)]
search fix
Marcin Koziej [Fri, 30 Dec 2011 12:21:50 +0000 (13:21 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Radek Czajka [Fri, 30 Dec 2011 12:19:18 +0000 (13:19 +0100)]
ajaxable dialogs fixes,
some layout tweaking
Marcin Koziej [Fri, 30 Dec 2011 12:08:29 +0000 (13:08 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Conflicts:
apps/catalogue/urls.py
apps/catalogue/views.py
Marcin Koziej [Fri, 30 Dec 2011 12:00:25 +0000 (13:00 +0100)]
book detail page - now with media / custom pdf
Radek Czajka [Fri, 30 Dec 2011 11:55:52 +0000 (12:55 +0100)]
search fixes
Radek Czajka [Fri, 30 Dec 2011 08:45:20 +0000 (09:45 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Conflicts:
apps/catalogue/management/commands/importbooks.py
wolnelektury/templates/catalogue/book_detail.html
wolnelektury/templates/catalogue/book_short.html
Radek Czajka [Thu, 29 Dec 2011 16:23:06 +0000 (17:23 +0100)]
change in multilingual
Marcin Koziej [Thu, 29 Dec 2011 16:17:54 +0000 (17:17 +0100)]
merge player changes and detail page + search
Conflicts:
wolnelektury/static/css/base.css
wolnelektury/static/css/book_box.css
wolnelektury/templates/catalogue/book_short.html
Marcin Koziej [Thu, 29 Dec 2011 16:13:05 +0000 (17:13 +0100)]
detail page getting shape
Radek Czajka [Thu, 29 Dec 2011 11:06:12 +0000 (12:06 +0100)]
jplayer
Radek Czajka [Thu, 29 Dec 2011 09:41:09 +0000 (10:41 +0100)]
publish plan fix
Radek Czajka [Wed, 28 Dec 2011 16:29:37 +0000 (17:29 +0100)]
publishing plan, plus some layout fixes
Marcin Koziej [Wed, 28 Dec 2011 15:55:55 +0000 (16:55 +0100)]
some css tweaks to download popup and logo/tagline shifted right a bit
Marcin Koziej [Wed, 28 Dec 2011 09:14:23 +0000 (10:14 +0100)]
merge wyszukiwania.
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Conflicts:
lib/librarian
wolnelektury/templates/base.html
Radek Czajka [Tue, 27 Dec 2011 12:46:32 +0000 (13:46 +0100)]
fix chaining querysets for pagination
fnp / wolnelektury.git / log