Commit Graph

77 Commits

Author SHA1 Message Date
j
8e85694895 merge changes from master 2017-12-19 11:40:02 +01:00
j
cedc3fec64 fix pagination 2017-12-19 10:59:37 +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
f6494c6adb formating 2017-12-18 15:03:10 +00:00
root
28338bbe5e factor out preview content 2017-12-18 14:54:39 +00:00
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
root
ef24734e32 use teaser 2017-12-18 14:29:17 +00: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
root
905b41e666 relations, fix texts, show opt pages 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
8b9df9d8a0 cleanups 2017-12-18 12:54:04 +00:00
vaishk
268900b7b9 updates 2017-08-03 23:14:00 +05:30
vaishk
af436b523c changes 2017-07-03 13:44:07 +05:30
Sanjay Bhangar
c728d55216 try setting up to move to postgres 2017-06-10 17:35:37 +05:30
Sanjay Bhangar
8c2c532ce7 add parents as inline to contents 2017-06-10 16:37:32 +05:30
vaishk
162af16b32 templates 2017-06-10 15:29:00 +05:30
vaishk
c929add2bf manytomany 2017-05-24 18:28:04 +05:30
vaishk
5a375cb8cc manytomany 2017-05-24 18:11:59 +05:30
vaishk
4eb72f9d9a changes 2017-05-24 17:14:04 +05:30
Sanjay Bhangar
845dc36d99 add unicode method for content 2017-05-20 18:11:15 +05:30
vaishk
34f98fe480 content 2017-05-20 18:15:26 +05:30