wolnelektury.git
12 years agotest settings fix
Radek Czajka [Thu, 19 Jan 2012 14:46:38 +0000 (15:46 +0100)]
test settings fix

12 years agoMerge branch 'pretty' of github.com:fnp/wolnelektury into pretty
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

12 years agomove some imports
Radek Czajka [Thu, 19 Jan 2012 14:25:14 +0000 (15:25 +0100)]
move some imports

12 years agopiwik stats minor change
Radek Czajka [Thu, 19 Jan 2012 14:23:44 +0000 (15:23 +0100)]
piwik stats minor change

12 years agostars and tags instead of shelves, move to social app
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

12 years agoignore comments in xml when indexing; make-xml-zip script
Marcin Koziej [Wed, 18 Jan 2012 14:08:25 +0000 (15:08 +0100)]
ignore comments in xml when indexing; make-xml-zip script

12 years agodont use celery to index - seems it gets blocked on index file access
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

12 years agoMerge branch 'production' into pretty
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

12 years agocotnent indexing - bugs.
Marcin Koziej [Mon, 16 Jan 2012 14:07:47 +0000 (15:07 +0100)]
cotnent indexing - bugs.

12 years agoFixed collecting content for snippet generation
Marcin Koziej [Mon, 16 Jan 2012 13:33:18 +0000 (14:33 +0100)]
Fixed collecting content for snippet generation

12 years agobook search - new design - almost ready
Marcin Koziej [Thu, 12 Jan 2012 15:40:27 +0000 (16:40 +0100)]
book search - new design - almost ready

12 years agochanges default filesystem cache location
Radek Czajka [Thu, 12 Jan 2012 14:20:47 +0000 (15:20 +0100)]
changes default filesystem cache location

12 years agoupdate to Django 1.3; cache some api calls
Radek Czajka [Thu, 12 Jan 2012 14:02:43 +0000 (15:02 +0100)]
update to Django 1.3; cache some api calls

12 years agosearch - did you mean?
Marcin Koziej [Wed, 11 Jan 2012 13:36:09 +0000 (14:36 +0100)]
search - did you mean?

12 years agosearch input field,
Marcin Koziej [Wed, 11 Jan 2012 11:54:13 +0000 (12:54 +0100)]
search input field,
reindex command accepts slugs

12 years agoreset cache on chunk save
Radek Czajka [Tue, 10 Jan 2012 15:47:39 +0000 (16:47 +0100)]
reset cache on chunk save

12 years agotemplate fix
Radek Czajka [Tue, 10 Jan 2012 15:29:24 +0000 (16:29 +0100)]
template fix

12 years agonon-permanent redirect
Radek Czajka [Tue, 10 Jan 2012 15:22:24 +0000 (16:22 +0100)]
non-permanent redirect

12 years agoadd collection for Boy
Radek Czajka [Tue, 10 Jan 2012 15:22:05 +0000 (16:22 +0100)]
add collection for Boy

12 years agolook changes
Radek Czajka [Tue, 10 Jan 2012 11:05:01 +0000 (12:05 +0100)]
look changes

12 years agoSearch - some tests, change in SearchResults cleaning.
Marcin Koziej [Mon, 9 Jan 2012 14:06:53 +0000 (15:06 +0100)]
Search - some tests, change in SearchResults cleaning.

12 years agoSome refactoring & documentation changes in search.
Marcin Koziej [Thu, 5 Jan 2012 12:11:38 +0000 (13:11 +0100)]
Some refactoring & documentation changes in search.

12 years ago#1913: tags in section titles break toc
Radek Czajka [Wed, 4 Jan 2012 12:41:52 +0000 (13:41 +0100)]
#1913: tags in section titles break toc

12 years agosome css tweaks regarding colors
Marcin Koziej [Mon, 2 Jan 2012 15:40:15 +0000 (16:40 +0100)]
some css tweaks regarding colors

12 years agoMerge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Marcin Koziej [Fri, 30 Dec 2011 12:43:35 +0000 (13:43 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

12 years agocustom pdf download via ajaxable
Marcin Koziej [Fri, 30 Dec 2011 12:43:13 +0000 (13:43 +0100)]
custom pdf download via ajaxable

12 years agosearch fix
Radek Czajka [Fri, 30 Dec 2011 12:38:31 +0000 (13:38 +0100)]
search fix

12 years agoMerge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Marcin Koziej [Fri, 30 Dec 2011 12:21:50 +0000 (13:21 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

12 years agoajaxable dialogs fixes,
Radek Czajka [Fri, 30 Dec 2011 12:19:18 +0000 (13:19 +0100)]
ajaxable dialogs fixes,
some layout tweaking

12 years agoMerge branch 'pretty' of github.com:fnp/wolnelektury into pretty
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

12 years agobook detail page - now with media / custom pdf
Marcin Koziej [Fri, 30 Dec 2011 12:00:25 +0000 (13:00 +0100)]
book detail page - now with media / custom pdf

12 years agosearch fixes
Radek Czajka [Fri, 30 Dec 2011 11:55:52 +0000 (12:55 +0100)]
search fixes

12 years agoMerge branch 'pretty' of github.com:fnp/wolnelektury into pretty
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

12 years agochange in multilingual
Radek Czajka [Thu, 29 Dec 2011 16:23:06 +0000 (17:23 +0100)]
change in multilingual

12 years agomerge player changes and detail page + search
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

12 years agodetail page getting shape
Marcin Koziej [Thu, 29 Dec 2011 16:13:05 +0000 (17:13 +0100)]
detail page getting shape

12 years agojplayer
Radek Czajka [Thu, 29 Dec 2011 11:06:12 +0000 (12:06 +0100)]
jplayer

12 years agopublish plan fix
Radek Czajka [Thu, 29 Dec 2011 09:41:09 +0000 (10:41 +0100)]
publish plan fix

12 years agopublishing plan, plus some layout fixes
Radek Czajka [Wed, 28 Dec 2011 16:29:37 +0000 (17:29 +0100)]
publishing plan, plus some layout fixes

12 years agosome css tweaks to download popup and logo/tagline shifted right a bit
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

12 years agomerge wyszukiwania.
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

12 years agofix chaining querysets for pagination
Radek Czajka [Tue, 27 Dec 2011 12:46:32 +0000 (13:46 +0100)]
fix chaining querysets for pagination

12 years agosearch ui draft
Marcin Koziej [Tue, 27 Dec 2011 12:36:18 +0000 (13:36 +0100)]
search ui draft

12 years agolayout changes
Radek Czajka [Tue, 27 Dec 2011 12:29:40 +0000 (13:29 +0100)]
layout changes

12 years agoSearch hints/javascript
Marcin Koziej [Tue, 27 Dec 2011 11:47:29 +0000 (12:47 +0100)]
Search hints/javascript

12 years agoimport fix
Radek Czajka [Thu, 22 Dec 2011 12:51:53 +0000 (13:51 +0100)]
import fix

12 years agofix broken publishing\
Marcin Koziej [Thu, 22 Dec 2011 12:25:26 +0000 (13:25 +0100)]
fix broken publishing\

12 years agominor change in import - lets not use the simpleimagestore class
Marcin Koziej [Thu, 22 Dec 2011 11:42:39 +0000 (12:42 +0100)]
minor change in import - lets not use the simpleimagestore class

12 years agosha1 in test xml file
Marcin Koziej [Thu, 22 Dec 2011 11:41:37 +0000 (12:41 +0100)]
sha1 in test xml file

12 years agopublishing + some template changes
Radek Czajka [Wed, 21 Dec 2011 16:00:40 +0000 (17:00 +0100)]
publishing + some template changes

12 years agoslucha - 2 pliki jeszcze
Marcin Koziej [Wed, 21 Dec 2011 16:00:10 +0000 (17:00 +0100)]
slucha - 2 pliki jeszcze

12 years agotag page, short_html
Marcin Koziej [Wed, 21 Dec 2011 15:57:36 +0000 (16:57 +0100)]
tag page, short_html

12 years agopassing book info to search index
Marcin Koziej [Wed, 21 Dec 2011 13:30:20 +0000 (14:30 +0100)]
passing book info to search index
indexing dc field author->authors

12 years agoGenerate tags for picture themes
Marcin Koziej [Wed, 21 Dec 2011 12:03:51 +0000 (13:03 +0100)]
Generate tags for picture themes

12 years agomerge search into pretty branch
Marcin Koziej [Wed, 21 Dec 2011 09:03:56 +0000 (10:03 +0100)]
merge search into pretty branch

12 years agobump librarian version
Marcin Koziej [Wed, 21 Dec 2011 08:40:23 +0000 (09:40 +0100)]
bump librarian version

12 years agonew book.short_html, unfinished
Radek Czajka [Wed, 21 Dec 2011 08:00:58 +0000 (09:00 +0100)]
new book.short_html, unfinished

12 years agoPicture form + test
Marcin Koziej [Tue, 20 Dec 2011 16:33:48 +0000 (17:33 +0100)]
Picture form + test

12 years agoremove some old around-search stuff
Radek Czajka [Tue, 20 Dec 2011 16:21:38 +0000 (17:21 +0100)]
remove some old around-search stuff

12 years agostandarize ajaxable dialogs
Radek Czajka [Tue, 20 Dec 2011 15:43:13 +0000 (16:43 +0100)]
standarize ajaxable dialogs

12 years agooops. missing import.
Marcin Koziej [Tue, 20 Dec 2011 15:08:50 +0000 (16:08 +0100)]
oops. missing import.

12 years agoadd auth to picture handler
Marcin Koziej [Tue, 20 Dec 2011 14:28:52 +0000 (15:28 +0100)]
add auth to picture handler

12 years agoPicture create api
Marcin Koziej [Tue, 20 Dec 2011 14:13:53 +0000 (15:13 +0100)]
Picture create api

12 years agobump librarian version
Marcin Koziej [Tue, 20 Dec 2011 10:51:43 +0000 (11:51 +0100)]
bump librarian version

12 years agoMerge branch 'pretty' of github.com:fnp/wolnelektury into pretty
Marcin Koziej [Tue, 20 Dec 2011 10:17:01 +0000 (11:17 +0100)]
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

12 years agogenerate covers in migration
Radek Czajka [Tue, 20 Dec 2011 10:11:29 +0000 (11:11 +0100)]
generate covers in migration

12 years agomake this templates a package, arr!
Marcin Koziej [Tue, 20 Dec 2011 10:10:25 +0000 (11:10 +0100)]
make this templates a package, arr!

12 years agomerge picture to pretty
Marcin Koziej [Tue, 20 Dec 2011 09:37:37 +0000 (10:37 +0100)]
merge picture to pretty

12 years agothere are no tags on main page
Radek Czajka [Mon, 19 Dec 2011 16:29:31 +0000 (17:29 +0100)]
there are no tags on main page

12 years agocover images; sorl>=10; hook sponsors off sorl
Radek Czajka [Mon, 19 Dec 2011 16:28:24 +0000 (17:28 +0100)]
cover images; sorl>=10; hook sponsors off sorl

12 years agoupdate Tag.book_count in celery
Radek Czajka [Mon, 19 Dec 2011 14:37:01 +0000 (15:37 +0100)]
update Tag.book_count in celery

12 years agoMerge branch 'picture' into pretty
Radek Czajka [Fri, 16 Dec 2011 16:13:21 +0000 (17:13 +0100)]
Merge branch 'picture' into pretty

Conflicts:
apps/catalogue/management/commands/importbooks.py

12 years agoinfopages: allow template tags, some cleaning
Radek Czajka [Fri, 16 Dec 2011 16:03:43 +0000 (17:03 +0100)]
infopages: allow template tags, some cleaning

12 years agocleaning around ebooks
Radek Czajka [Fri, 16 Dec 2011 15:36:38 +0000 (16:36 +0100)]
cleaning around ebooks

12 years agostarting with the new look
Radek Czajka [Fri, 16 Dec 2011 11:06:48 +0000 (12:06 +0100)]
starting with the new look

12 years agobump librarian to version with picture support
Marcin Koziej [Wed, 14 Dec 2011 13:11:52 +0000 (14:11 +0100)]
bump librarian to version with picture support

12 years agoremove extrenal librarian from tags.
Marcin Koziej [Wed, 14 Dec 2011 13:11:09 +0000 (14:11 +0100)]
remove extrenal librarian from tags.

12 years agoPicture model and importbooks -p to import a picture.
Marcin Koziej [Wed, 14 Dec 2011 13:10:49 +0000 (14:10 +0100)]
Picture model and importbooks -p to import a picture.

12 years agodocumentation
Marcin Koziej [Tue, 13 Dec 2011 10:27:26 +0000 (11:27 +0100)]
documentation

12 years agoOPDS advanced search
Marcin Koziej [Tue, 13 Dec 2011 10:26:02 +0000 (11:26 +0100)]
OPDS advanced search

12 years agobump librarian version and do not fetch tags from librarian in virtualenv
Marcin Koziej [Tue, 13 Dec 2011 10:25:51 +0000 (11:25 +0100)]
bump librarian version and do not fetch tags from librarian in virtualenv

12 years agofix variable name
Marcin Koziej [Mon, 12 Dec 2011 08:39:21 +0000 (09:39 +0100)]
fix variable name

12 years agoBook.short_html fix
Radek Czajka [Mon, 12 Dec 2011 08:36:41 +0000 (09:36 +0100)]
Book.short_html fix

12 years agomerge new librarian changes with custom pdf fix
Marcin Koziej [Mon, 12 Dec 2011 08:18:49 +0000 (09:18 +0100)]
merge new librarian changes with custom pdf fix

12 years agoFix for a bug introduced in refactoring: customized pdfs were instantly deleted,...
Marcin Koziej [Sun, 11 Dec 2011 16:56:01 +0000 (17:56 +0100)]
Fix for a bug introduced in refactoring: customized pdfs were instantly deleted, as when a master-PDF is generated

12 years agobasic multilingual publications support
Radek Czajka [Wed, 7 Dec 2011 16:18:36 +0000 (17:18 +0100)]
basic multilingual publications support
removed the unused FileRecord model

12 years agonew librarian sub-module: custom pdfs
Marcin Koziej [Wed, 7 Dec 2011 11:57:29 +0000 (12:57 +0100)]
new librarian sub-module: custom pdfs

12 years agonew librarian sub-module: custom pdfs
Marcin Koziej [Mon, 5 Dec 2011 13:43:59 +0000 (14:43 +0100)]
new librarian sub-module: custom pdfs

12 years agofix test for custom pdf file generation
Marcin Koziej [Mon, 5 Dec 2011 13:04:50 +0000 (14:04 +0100)]
fix test for custom pdf file generation

12 years agocustomized pdf generation.
Marcin Koziej [Mon, 5 Dec 2011 12:58:40 +0000 (13:58 +0100)]
customized pdf generation.

12 years agoCustomized pdf basically works.
Marcin Koziej [Thu, 1 Dec 2011 15:56:04 +0000 (16:56 +0100)]
Customized pdf basically works.

12 years agobe prepared for mixes unicode/str input from lxml..
Marcin Koziej [Thu, 1 Dec 2011 15:13:54 +0000 (16:13 +0100)]
be prepared for mixes unicode/str input from lxml..

12 years agoSplit themes by ,
Marcin Koziej [Thu, 1 Dec 2011 14:48:31 +0000 (15:48 +0100)]
Split themes by ,
Do not add fragments with empty themes

12 years agoMerge branch 'search' of git+ssh://stigma.fnp/home/mkoziej/wl into search
Marcin Koziej [Thu, 1 Dec 2011 13:18:42 +0000 (14:18 +0100)]
Merge branch 'search' of git+ssh://stigma.fnp/home/mkoziej/wl into search

12 years agoSearch in stagin phase - waiting for final guidelines on new wl
Marcin Koziej [Thu, 24 Nov 2011 16:10:14 +0000 (17:10 +0100)]
Search in stagin phase - waiting for final guidelines on new wl
Search integrated into tagbook context
thrown out blockjoins

12 years agofirst search demo
Marcin Koziej [Thu, 24 Nov 2011 16:08:36 +0000 (17:08 +0100)]
first search demo
reusable index. first attempt at rich search query
async indexing, fixes
multisearch fails to see joined queries -> will try to use one toplevel
store contents in index for highlighting fragments
aggregate & display results
fixed multithreading bug with attaching to jvm
log parallel job exceptions
don't index tags from db.
paralell indexing

12 years agosearching works, without fragments
Marcin Koziej [Thu, 24 Nov 2011 16:07:38 +0000 (17:07 +0100)]
searching works, without fragments
basic query using Dublin core fields works
Index has proper tokens.
search index building on import

12 years agoSearch in stagin phase - waiting for final guidelines on new wl
Marcin Koziej [Thu, 24 Nov 2011 15:40:18 +0000 (16:40 +0100)]
Search in stagin phase - waiting for final guidelines on new wl

12 years agomore integrated to templates
Marcin Koziej [Thu, 24 Nov 2011 11:28:33 +0000 (12:28 +0100)]
more integrated to templates

12 years ago302 for main
Radek Czajka [Thu, 24 Nov 2011 09:30:41 +0000 (10:30 +0100)]
302 for main