|
|
c874ec5da8
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
2018-06-13 16:49:26 +02:00 |
|
|
|
8b8c64a2d2
|
edited getannot.py
|
2018-06-13 16:49:14 +02:00 |
|
|
|
64c2d4f87c
|
fixed a conflict with annot
|
2018-06-13 16:45:51 +02:00 |
|
|
|
e89232cf33
|
removed jquery styling
|
2018-06-13 16:44:29 +02:00 |
|
nberting
|
a446da6c03
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
2018-06-13 15:27:40 +02:00 |
|
nberting
|
cb6e05ec36
|
styling
|
2018-06-13 15:27:34 +02:00 |
|
|
|
42291a5ea4
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
2018-06-13 15:26:06 +02:00 |
|
|
|
d3af64164c
|
last changes for annot
|
2018-06-13 15:25:55 +02:00 |
|
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
|
475ec71740
|
fixed conflixt in pip requirements.txt
|
2018-06-13 13:57:25 +02:00 |
|
Jocavdh
|
dfe9c9348d
|
Fixed conflict in base.html
|
2018-06-13 13:55:37 +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 |
|
|
|
f75bd69d37
|
changes in annotations
|
2018-06-13 12:27:31 +02:00 |
|
|
|
0f5e5606ab
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
2018-06-13 10:48:37 +02:00 |
|
|
|
fae159e20f
|
added check to iframe
|
2018-06-13 10:48:33 +02:00 |
|
|
|
98c72b5b16
|
edited annotations.html
|
2018-06-13 10:27:26 +02:00 |
|
|
|
736f229eb7
|
changes to templates annotations
|
2018-06-13 10:20:53 +02:00 |
|
nberting
|
d6336b7719
|
a tags
|
2018-06-12 20:04:26 +02:00 |
|
|
|
d21cfdaafc
|
changes to annotations
|
2018-06-12 19:55:56 +02:00 |
|
nberting
|
3dcc1f13d4
|
some styling stuff
|
2018-06-12 19:54:22 +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
|
8f05ff95a7
|
replace online dep
|
2018-06-12 14:31:32 +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
|
5c87a17f6e
|
goddamn bracket missing from css file
|
2018-06-11 19:16:06 +02:00 |
|
nberting
|
a12662ba29
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
2018-06-11 18:48:11 +02:00 |
|
nberting
|
1575ba828f
|
update css grid responsiveness
|
2018-06-11 18:45:09 +02:00 |
|
|
|
9c84e75e8c
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
2018-06-11 18:23:52 +02:00 |
|
|
|
36c1590e24
|
edited stack detail
|
2018-06-11 18:23:42 +02:00 |
|
nberting
|
4161d01d56
|
link to add stack on show book detail
|
2018-06-11 18:15:58 +02:00 |
|
nberting
|
bd0ae3d205
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
2018-06-11 18:09:26 +02:00 |
|
nberting
|
aa3c461d2e
|
added outlier search category
|
2018-06-11 18:09:17 +02:00 |
|
|
|
1889bfaa62
|
Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib
|
2018-06-11 17:57:36 +02:00 |
|
|
|
4fd80f4c65
|
edited add_stack page
|
2018-06-11 17:57:22 +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 |
|
