Commit Graph

91 Commits

Author SHA1 Message Date
Alex
167fe9e95e Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib 2018-06-13 15:12:39 +02:00
Alex
4b5687db7a changed scape 2018-06-13 15:12:32 +02:00
563f8cb432 adding annotations branch 2018-06-13 15:12:03 +02:00
389de3ecad changes to annotations again 2018-06-13 14:34:15 +02:00
Jocavdh
a0558a6115 Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib 2018-06-13 13:52:44 +02:00
Jocavdh
f8b2c7ec07 Merged and fixed conflicts 2018-06-13 13:17:34 +02:00
736f229eb7 changes to templates annotations 2018-06-13 10:20:53 +02:00
d21cfdaafc changes to annotations 2018-06-12 19:55:56 +02:00
1b5ea42d2f Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib 2018-06-12 17:07:52 +02:00
Alex
6f01632d40 light version included. Enter billing for pro 2018-06-12 13:17:02 +02:00
d8fda4640f fixed silly conflict 2018-06-11 21:08:18 +02:00
a108579de4 nothing 2018-06-11 21:05:17 +02:00
Alex
d0db637115 MORE GRADIENT 2018-06-11 19:24:53 +02:00
Alex
87e88ead59 GRADIENT 2018-06-11 19:20:59 +02:00
nberting
aa3c461d2e added outlier search category 2018-06-11 18:09:17 +02:00
nberting
561d38fa49 Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib 2018-06-11 17:24:37 +02:00
nberting
f1b27bff5d update upload form extra questions 2018-06-11 17:24:30 +02:00
ff507913e2 added stack length limit and ascii in catalog view 2018-06-11 16:56:34 +02:00
Jocavdh
5aa4332eef Lowercase 2018-06-11 16:08:09 +02:00
6205fc7272 fix conflicts xpplanot again 2018-06-11 15:08:53 +02:00
Jocavdh
e4d9d0f17b Removed some printouts 2018-06-11 14:49:05 +02:00
Jocavdh
7cf5677221 Autocomplete is now visible in frontendgit add -A. Crying out of joy from the inside 2018-06-11 14:44:11 +02:00
Alex
644ed7d621 fixed tabs after merge error 2018-06-11 14:03:34 +02:00
Alex
2c41a8dc6a merged stacks and master 2018-06-11 13:51:24 +02:00
83babb19f3 fix conflicts 2018-06-11 13:38:23 +02:00
76044807a6 Add stuff to xpplannot 2018-06-11 13:32:18 +02:00
Jocavdh
3715f0f70f autocomplete code working on backend 2018-06-11 12:01:51 +02:00
nberting
deb426ebaf Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff 2018-06-11 12:00:53 +02:00
nberting
8fa8200c49 new upload form questions 2018-06-11 12:00:48 +02:00
2fb4013c7f added stack author 2018-06-10 19:33:50 +02:00
Alex
b369442e41 views 2018-06-10 19:22:24 +02:00
nberting
93bf8a6b93 extended info on add-book page 2018-06-10 17:41:44 +02:00
Alex
932ce9102a conflicts 2018-06-10 12:32:32 +02:00
nberting
b8a6c86a13 reverse query results and some new links on show_book_detail 2018-06-10 12:29:09 +02:00
Alex
5ba0f10f13 csv in and export, instances 2018-06-10 12:15:07 +02:00
nberting
22494aadd2 styling buttons 2018-06-10 11:16:47 +02:00
nberting
2bc81e7d59 added message option into book database, upload form, edit form 2018-06-09 22:05:47 +02:00
nberting
0696c94a14 updates red link page 2018-06-09 19:27:55 +02:00
nberting
5fbdb06665 updated styling potential pdfs 2018-06-09 18:13:18 +02:00
nberting
dc7ee880f4 Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff 2018-06-09 15:41:27 +02:00
nberting
34f736ef06 potential pdfs 2018-06-09 15:41:21 +02:00
3aae397579 delete book button, some css, filepath 2018-06-09 15:27:49 +02:00
nberting
d49738db27 connected search to chat 2018-06-08 16:15:09 +02:00
nberting
7c82f2af95 fixed bug grid / list view 2018-06-07 23:52:41 +02:00
2d8110585d remove book from stacks 2018-06-07 23:05:55 +02:00
nberting
c6b99974da new default covers and grid view in search 2018-06-07 19:10:56 +02:00
nberting
1a68728ed1 expanded search functionality 2018-06-07 10:46:14 +02:00
nberting
68c38ae198 added upload new version of file into edit form 2018-06-07 09:59:08 +02:00
24377874fa Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into xpplannot 2018-06-06 19:36:19 +02:00
5d363f9570 additions to xpplannot 2018-06-06 19:34:32 +02:00