 Alex
|
ad06a13bb6
|
interfaces updated
|
7 years ago |
 nberting
|
1b9baec128
|
changed datetime.utcnow() to datetime.now() to give local time
|
7 years ago |
|
Alex
|
0b70070c1f
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
Alex
|
7678a838dc
|
default covers fix
|
7 years ago |
 ange
|
1acf4cc157
|
changes in annotations again
|
7 years ago |
|
ange
|
822747f428
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
ange
|
249fd90373
|
changes in annotations
|
7 years ago |
|
Alex
|
28301aa037
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
Alex
|
c2cec30113
|
update import
|
7 years ago |
|
nberting
|
e158a23f4e
|
latest upload >> latest entry
|
7 years ago |
|
nberting
|
74db0e3a57
|
got rid of id in import_csv
|
7 years ago |
|
nberting
|
be41426018
|
fixed light=light missing in some routes
|
7 years ago |
 Jocavdh
|
90b8585027
|
CSS for autocomplete extracted from jquery-ui css and included in general css
|
7 years ago |
|
ange
|
c874ec5da8
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
ange
|
8b8c64a2d2
|
edited getannot.py
|
7 years ago |
 Alice
|
64c2d4f87c
|
fixed a conflict with annot
|
7 years ago |
|
Alice
|
e89232cf33
|
removed jquery styling
|
7 years ago |
|
nberting
|
a446da6c03
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
nberting
|
cb6e05ec36
|
styling
|
7 years ago |
|
ange
|
42291a5ea4
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
ange
|
d3af64164c
|
last changes for annot
|
7 years ago |
|
Alex
|
167fe9e95e
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
Alex
|
4b5687db7a
|
changed scape
|
7 years ago |
|
ange
|
563f8cb432
|
adding annotations branch
|
7 years ago |
|
ange
|
389de3ecad
|
changes to annotations again
|
7 years ago |
|
Jocavdh
|
dfe9c9348d
|
Fixed conflict in base.html
|
7 years ago |
|
Jocavdh
|
a0558a6115
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
Jocavdh
|
f8b2c7ec07
|
Merged and fixed conflicts
|
7 years ago |
|
ange
|
f75bd69d37
|
changes in annotations
|
7 years ago |
|
Alice
|
0f5e5606ab
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
Alice
|
fae159e20f
|
added check to iframe
|
7 years ago |
|
ange
|
98c72b5b16
|
edited annotations.html
|
7 years ago |
|
ange
|
736f229eb7
|
changes to templates annotations
|
7 years ago |
|
nberting
|
d6336b7719
|
a tags
|
7 years ago |
|
ange
|
d21cfdaafc
|
changes to annotations
|
7 years ago |
|
nberting
|
3dcc1f13d4
|
some styling stuff
|
7 years ago |
|
Alice
|
1b5ea42d2f
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
Alex
|
8f05ff95a7
|
replace online dep
|
7 years ago |
|
Alex
|
6f01632d40
|
light version included. Enter billing for pro
|
7 years ago |
|
Alice
|
d8fda4640f
|
fixed silly conflict
|
7 years ago |
|
Alice
|
a108579de4
|
nothing
|
7 years ago |
|
Alex
|
d0db637115
|
MORE GRADIENT
|
7 years ago |
|
Alex
|
87e88ead59
|
GRADIENT
|
7 years ago |
|
nberting
|
5c87a17f6e
|
goddamn bracket missing from css file
|
7 years ago |
|
nberting
|
a12662ba29
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
nberting
|
1575ba828f
|
update css grid responsiveness
|
7 years ago |
|
Alice
|
9c84e75e8c
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
Alice
|
36c1590e24
|
edited stack detail
|
7 years ago |
|
nberting
|
4161d01d56
|
link to add stack on show book detail
|
7 years ago |
|
nberting
|
bd0ae3d205
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
nberting
|
aa3c461d2e
|
added outlier search category
|
7 years ago |
|
Alice
|
1889bfaa62
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
Alice
|
4fd80f4c65
|
edited add_stack page
|
7 years ago |
|
nberting
|
561d38fa49
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
7 years ago |
|
nberting
|
f1b27bff5d
|
update upload form extra questions
|
7 years ago |
|
Alice
|
ff507913e2
|
added stack length limit and ascii in catalog view
|
7 years ago |
|
Jocavdh
|
5aa4332eef
|
Lowercase
|
7 years ago |
|
ange
|
6205fc7272
|
fix conflicts xpplanot again
|
7 years ago |
|
Jocavdh
|
e4d9d0f17b
|
Removed some printouts
|
7 years ago |
|
Jocavdh
|
7cf5677221
|
Autocomplete is now visible in frontendgit add -A. Crying out of joy from the inside
|
7 years ago |
|
Alex
|
644ed7d621
|
fixed tabs after merge error
|
7 years ago |
|
Alex
|
2c41a8dc6a
|
merged stacks and master
|
7 years ago |
|
ange
|
83babb19f3
|
fix conflicts
|
7 years ago |
|
ange
|
76044807a6
|
Add stuff to xpplannot
|
7 years ago |
|
nberting
|
8e872c1958
|
updated potential pdf
|
7 years ago |
|
Alice
|
1c5204948e
|
Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff
|
7 years ago |
|
Alice
|
e7d7e9fe93
|
moved add stack link
|
7 years ago |
|
nberting
|
a4a214d488
|
fixed stack link
|
7 years ago |
|
Jocavdh
|
3715f0f70f
|
autocomplete code working on backend
|
7 years ago |
|
nberting
|
deb426ebaf
|
Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff
|
7 years ago |
|
nberting
|
8fa8200c49
|
new upload form questions
|
7 years ago |
|
Alice
|
2fb4013c7f
|
added stack author
|
7 years ago |
|
Alex
|
b369442e41
|
views
|
7 years ago |
|
nberting
|
93bf8a6b93
|
extended info on add-book page
|
7 years ago |
|
Alex
|
932ce9102a
|
conflicts
|
7 years ago |
|
nberting
|
b8a6c86a13
|
reverse query results and some new links on show_book_detail
|
7 years ago |
|
Alex
|
5ba0f10f13
|
csv in and export, instances
|
7 years ago |
|
nberting
|
22494aadd2
|
styling buttons
|
7 years ago |
|
nberting
|
2bc81e7d59
|
added message option into book database, upload form, edit form
|
7 years ago |
|
nberting
|
0696c94a14
|
updates red link page
|
7 years ago |
|
nberting
|
5fbdb06665
|
updated styling potential pdfs
|
7 years ago |
|
nberting
|
dc7ee880f4
|
Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff
|
7 years ago |
|
nberting
|
34f736ef06
|
potential pdfs
|
7 years ago |
|
Alice
|
3aae397579
|
delete book button, some css, filepath
|
7 years ago |
|
Alice
|
72004d6c51
|
fixed add form
|
7 years ago |
|
Alice
|
3ffb42280f
|
Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff
|
7 years ago |
|
Alice
|
eb69619cf3
|
text decoration edit
|
7 years ago |
|
nberting
|
aa7ad8b450
|
updated red_link page
|
7 years ago |
|
nberting
|
45800d46e7
|
fixed mistake with socket port
|
7 years ago |
|
nberting
|
d49738db27
|
connected search to chat
|
7 years ago |
|
nberting
|
7c82f2af95
|
fixed bug grid / list view
|
7 years ago |
|
nberting
|
3296a2efcf
|
updates to grid and list view
|
7 years ago |
|
Alice
|
2d8110585d
|
remove book from stacks
|
7 years ago |
|
Alice
|
869ed3f3bb
|
edited pdf view
|
7 years ago |
|
nberting
|
c6b99974da
|
new default covers and grid view in search
|
7 years ago |
|
nberting
|
1a68728ed1
|
expanded search functionality
|
7 years ago |
|
nberting
|
68c38ae198
|
added upload new version of file into edit form
|
7 years ago |
|
ange
|
24377874fa
|
Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into xpplannot
|
7 years ago |
|
ange
|
5d363f9570
|
additions to xpplannot
|
7 years ago |
 Michael Murtaugh
|
7938ec3591
|
csv export
|
7 years ago |