Commit Graph

69 Commits

Author SHA1 Message Date
j
9f33c16619 Merge branch 'psql' 2017-12-19 13:01:17 +01:00
j
39993a165e display links 2017-12-19 12:49:08 +01:00
j
9400e4a5e3 add gallery.html 2017-12-19 12:42:00 +01:00
j
e5e44955cf projects have galleries too 2017-12-19 12:41:34 +01:00
j
51aae2ec53 gallery helper 2017-12-19 11:54:06 +01:00
j
8e85694895 merge changes from master 2017-12-19 11:40:02 +01:00
j
5837997b7d enable django_extensions 2017-12-19 11:39:13 +01:00
j
cedc3fec64 fix pagination 2017-12-19 10:59:37 +01:00
j
fcfbc77143 fix apache config 2017-12-19 10:51:46 +01:00
j
2f1914c3db add gunicorn and deployment files 2017-12-19 10:47:16 +01:00
j
f2cd78e316 remote temp files 2017-12-19 10:47:16 +01:00
j
15558d209e remove more generated content 2017-12-19 10:47:16 +01:00
j
15b11460bd don't checkin collected static files 2017-12-19 10:47:16 +01:00
j
dcc5b2b4ab resources.type 2017-12-19 10:47:14 +01:00
vaishk
7526774a62 Search Page 2017-12-19 15:10:14 +05:30
root
b294aba41a MARKDOWNX_MEDIA_PATH is relative to MEDIA_ROOT 2017-12-18 15:14:23 +00:00
root
f6494c6adb formating 2017-12-18 15:03:10 +00:00
j
e553567b6c Merge remote-tracking branch 'origin/psql' into psql 2017-12-18 15:55:10 +01:00
root
28338bbe5e factor out preview content 2017-12-18 14:54:39 +00:00
vaishk
715c726fe5 Merge branch 'psql' of https://github.com/vaishk/camp into psql
pulling changes
2017-12-18 20:18:24 +05:30
vaishk
f32dd29f80 font size from em to px 2017-12-18 20:14:40 +05:30
root
0d95e04598 fix is_staff 2017-12-18 14:39:24 +00:00
root
30c06fb34f fix overview pages 2017-12-18 14:37:32 +00:00
root
853ffcee98 use teaser 2017-12-18 14:36:20 +00:00
root
ef3d6eb4a9 remove unused templates 2017-12-18 14:34:22 +00:00
j
e79cd73021 load venv in manage.py 2017-12-18 15:31:38 +01:00
j
424c832b88 add readme 2017-12-18 15:30:47 +01:00
root
ef24734e32 use teaser 2017-12-18 14:29:17 +00:00
j
54956d7f0a ignore venv 2017-12-18 15:23:53 +01:00
j
a1ad44f7c8 remove venv 2017-12-18 15:23:06 +01:00
root
9d08734bf2 Merge branch 'psql' of https://github.com/vaishk/camp into psql
Conflicts:
	camp/urls.py
	content/views.py
2017-12-18 14:20:54 +00:00
root
d10ae99722 only public 2017-12-18 14:17:06 +00:00
j
a872bb7b09 remove 2017-12-18 15:16:34 +01:00
j
6eb5d3810e ignore secret 2017-12-18 15:16:16 +01:00
root
905b41e666 relations, fix texts, show opt pages 2017-12-18 15:16:16 +01:00
root
fb828607f9 fix photos 2017-12-18 15:16:16 +01:00
vaishk
049407bf1a css changes 2017-12-18 19:42:43 +05:30
root
9c35b09e10 relations, fix texts, show opt pages 2017-12-18 13:44:11 +00:00
root
e555b7362b fix photos 2017-12-18 13:11:44 +00:00
root
daa81c43ae fix path 2017-12-18 13:02:33 +00:00
j
8242cd223e add requirements.txt 2017-12-18 13:57:30 +01:00
root
8b9df9d8a0 cleanups 2017-12-18 12:54:04 +00:00
j
48b495caae minimal image viewer 2017-12-12 13:42:27 +01:00
j
81973ba496 redirects, optional content 2017-12-09 13:51:56 +01:00
j
8f1c7435ec typo 2017-12-09 12:53:44 +01:00
j
9077723b1a display more content, only show published material 2017-12-09 12:52:46 +01:00
j
9e2e37b645 mark all models as managed, use Boolean or flags, fill dateadded 2017-12-09 12:52:15 +01:00
j
909a0d97ee use existing relations 2017-12-08 22:43:35 +01:00
j
573f171f57 add dependencies 2017-12-08 22:43:18 +01:00
j
406d2b9f9c activate venv 2017-12-08 22:43:08 +01:00