 Alice
|
64c2d4f87c
|
fixed a conflict with annot
|
6 years ago |
|
Alice
|
e89232cf33
|
removed jquery styling
|
6 years ago |
 nberting
|
a446da6c03
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
6 years ago |
|
nberting
|
cb6e05ec36
|
styling
|
6 years ago |
 ange
|
42291a5ea4
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
6 years ago |
|
ange
|
d3af64164c
|
last changes for annot
|
6 years ago |
 Alex
|
167fe9e95e
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
6 years ago |
|
Alex
|
4b5687db7a
|
changed scape
|
6 years ago |
|
ange
|
563f8cb432
|
adding annotations branch
|
6 years ago |
|
ange
|
389de3ecad
|
changes to annotations again
|
6 years ago |
 Jocavdh
|
dfe9c9348d
|
Fixed conflict in base.html
|
6 years ago |
|
Jocavdh
|
a0558a6115
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
6 years ago |
|
Jocavdh
|
f8b2c7ec07
|
Merged and fixed conflicts
|
6 years ago |
|
ange
|
f75bd69d37
|
changes in annotations
|
6 years ago |
|
Alice
|
0f5e5606ab
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
6 years ago |
|
Alice
|
fae159e20f
|
added check to iframe
|
6 years ago |
|
ange
|
98c72b5b16
|
edited annotations.html
|
6 years ago |
|
ange
|
736f229eb7
|
changes to templates annotations
|
6 years ago |
|
ange
|
d21cfdaafc
|
changes to annotations
|
6 years ago |
|
nberting
|
3dcc1f13d4
|
some styling stuff
|
6 years ago |
|
Alex
|
8f05ff95a7
|
replace online dep
|
6 years ago |
|
Alex
|
6f01632d40
|
light version included. Enter billing for pro
|
6 years ago |
|
Alex
|
d0db637115
|
MORE GRADIENT
|
6 years ago |
|
Alex
|
87e88ead59
|
GRADIENT
|
6 years ago |
|
nberting
|
5c87a17f6e
|
goddamn bracket missing from css file
|
6 years ago |
|
Alice
|
9c84e75e8c
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
6 years ago |
|
Alice
|
36c1590e24
|
edited stack detail
|
6 years ago |
|
nberting
|
4161d01d56
|
link to add stack on show book detail
|
6 years ago |
|
nberting
|
bd0ae3d205
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
6 years ago |
|
nberting
|
aa3c461d2e
|
added outlier search category
|
6 years ago |
|
Alice
|
1889bfaa62
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
6 years ago |
|
Alice
|
4fd80f4c65
|
edited add_stack page
|
6 years ago |
|
nberting
|
561d38fa49
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
6 years ago |
|
nberting
|
f1b27bff5d
|
update upload form extra questions
|
6 years ago |
|
Alice
|
ff507913e2
|
added stack length limit and ascii in catalog view
|
6 years ago |
|
ange
|
6205fc7272
|
fix conflicts xpplanot again
|
6 years ago |
|
Alex
|
644ed7d621
|
fixed tabs after merge error
|
6 years ago |
|
Alex
|
2c41a8dc6a
|
merged stacks and master
|
6 years ago |
|
ange
|
83babb19f3
|
fix conflicts
|
6 years ago |
|
ange
|
76044807a6
|
Add stuff to xpplannot
|
6 years ago |
|
nberting
|
8e872c1958
|
updated potential pdf
|
6 years ago |
|
Alice
|
1c5204948e
|
Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff
|
6 years ago |
|
Alice
|
e7d7e9fe93
|
moved add stack link
|
6 years ago |
|
nberting
|
a4a214d488
|
fixed stack link
|
6 years ago |
|
Jocavdh
|
3715f0f70f
|
autocomplete code working on backend
|
6 years ago |
|
nberting
|
deb426ebaf
|
Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff
|
6 years ago |
|
nberting
|
8fa8200c49
|
new upload form questions
|
6 years ago |
|
Alice
|
2fb4013c7f
|
added stack author
|
6 years ago |
|
nberting
|
93bf8a6b93
|
extended info on add-book page
|
6 years ago |
|
Alex
|
932ce9102a
|
conflicts
|
6 years ago |