Commit Graph

213 Commits

Author SHA1 Message Date
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
d2b85d7ce7 Add stuff to xpplannot again 2018-06-11 13:33:36 +02:00
76044807a6 Add stuff to xpplannot 2018-06-11 13:32:18 +02:00
nberting
8e872c1958 updated potential pdf 2018-06-11 13:08:22 +02:00
1c5204948e Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff 2018-06-11 12:28:11 +02:00
e7d7e9fe93 moved add stack link 2018-06-11 12:28:07 +02:00
nberting
a4a214d488 fixed stack link 2018-06-11 12:25:10 +02:00
c2e0bec1be fixed stack author 2018-06-11 12:19:49 +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
c3ea2d4868 Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff 2018-06-10 18:04:26 +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
d769aba95f ignored some files 2018-06-10 11:13:18 +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
72004d6c51 fixed add form 2018-06-09 14:27:43 +02:00
3ffb42280f Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff 2018-06-09 10:35:35 +02:00
eb69619cf3 text decoration edit 2018-06-09 10:35:23 +02:00
nberting
aa7ad8b450 updated red_link page 2018-06-08 17:56:20 +02:00
nberting
45800d46e7 fixed mistake with socket port 2018-06-08 17:09:04 +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
nberting
3296a2efcf updates to grid and list view 2018-06-07 23:33:22 +02:00
2d8110585d remove book from stacks 2018-06-07 23:05:55 +02:00
869ed3f3bb edited pdf view 2018-06-07 19:27:09 +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
Michael Murtaugh
7938ec3591 csv export 2018-06-06 19:32:40 +02:00
1ee3996ea7 viewer pdf 2018-06-06 18:54:07 +02:00
Your Name
4eb943eedc Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff 2018-06-06 18:21:21 +02:00
Your Name
093ff2d284 updated README 2018-06-06 18:20:41 +02:00
30d8bade54 resolved conflicts 2018-06-06 16:59:37 +02:00
3d3180e138 css 2018-06-06 16:56:37 +02:00
2b49e98fdd removed tab styling 2018-06-06 16:07:39 +02:00