733 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver Falk	491e6a4915	Merge photo_import	2018-07-11 11:02:55 +02:00
Oliver Falk	d70dacdf25	Merge branch 'pylint' into 'master' ... Only a happy pylint is a good pylint See merge request oliver/ivatar!39	2018-07-11 10:47:44 +02:00
Oliver Falk	0bb3a561ec	Merge branch 'devel' into 'master' ... Merge in devel See merge request oliver/ivatar!38	2018-07-11 10:45:40 +02:00
Oliver Falk	fd5ccc0f5f	Merge branch 'devel' into photo_import	2018-07-11 10:16:30 +02:00
Oliver Falk	860f8cf555	Only a happy pylint is a good pylint	2018-07-11 10:13:47 +02:00
Oliver Falk	d5ee20430e	Allow up to 10 parents	2018-07-11 10:09:28 +02:00
Oliver Falk	19dedf5e62	Merge branch 'devel' into photo_import	2018-07-11 09:04:40 +02:00
Oliver Falk	7ffd21dee7	Fix tests and eliminate bug, since we use filter now, we cannot depend on an exception raised	2018-07-11 09:04:17 +02:00
Oliver Falk	38142b303d	Merge branch 'devel' into 'master' ... Merge in latest devel See merge request oliver/ivatar!37	2018-07-11 08:15:01 +02:00
Oliver Falk	88631e3772	Change behaviour of brand image link; Logged in user => Profile. Anonymous => /	2018-07-11 08:09:00 +02:00
Oliver Falk	0ac96e2ed0	Finish feature 'import image from other sites'	2018-07-11 08:07:56 +02:00
Oliver Falk	96237bb47e	Ability to import from libravatar + import by email; Forms are WIP!	2018-07-10 14:46:30 +02:00
Oliver Falk	4cf9e72c93	Do allow importing photo from confirmed email	2018-07-10 13:19:04 +02:00
Oliver Falk	007021ce89	Correct FROM	2018-07-10 13:16:07 +02:00
Oliver Falk	d9913a8fae	Merge branch 'postgresql_fixes' into 'master' ... Postgresql fixes See merge request oliver/ivatar!36	2018-07-10 11:40:41 +02:00
Oliver Falk	59c267b05e	Adapt/add tests for handling default and redirect	2018-07-10 11:07:00 +02:00
Oliver Falk	2ace37e981	Allow specifying default as get request parameter (as specified in the standard); Do not serve picture directly, but redirect to /static	2018-07-10 11:06:27 +02:00
clime	0b241f01c3	use zero indexing to get ip_address from get_client_ip because _ already has a meaning	2018-07-10 10:58:06 +02:00
clime	f3bb567b49	get_client_ip returns (ip, routable) pair, throw away 'routable' ... * otherwise it doesn't work with PostgreSQL inet field	2018-07-10 10:42:34 +02:00
clime	80c74543d0	add missing psycopg2 requirement	2018-07-10 10:25:53 +02:00
Oliver Falk	37197162bc	No longer display images via http	2018-07-10 10:22:23 +02:00
clime	a4cb44ea79	PostgreSQL backend support	2018-07-10 10:16:46 +02:00
Oliver Falk	9c3c02bd48	Merge branch 'master' into devel	2018-07-09 15:49:10 +02:00
Oliver Falk	41fa61adaa	Do not display checksums on small devices	2018-07-09 15:48:53 +02:00
Oliver Falk	8a877aac9f	Merge branch 'master' into 'master' ... clime theme added See merge request oliver/ivatar!35	2018-07-09 15:47:33 +02:00
Oliver Falk	c6ad194cea	Merge branch 'devel' into 'master' ... Handle size parameter and correct behaviour with non existing OpenID/Email (return default) See merge request oliver/ivatar!34	2018-07-09 15:47:19 +02:00
Oliver Falk	c794378fe0	Merge branch 'master' into devel	2018-07-09 15:45:34 +02:00
clime	5c24cbda05	lighten "clime theme" up a bit	2018-07-09 15:30:08 +02:00
clime	2d15dccdd0	climes theme added	2018-07-09 15:23:04 +02:00
Oliver Falk	14ee40f52c	Return resized img, if/as requested and now also return default image (not yet as specified by the url parameters!	2018-07-09 15:21:24 +02:00
Oliver Falk	1bf2eb1e43	Move some methods to staticmethods, since not object dependent and add some __str__ functions in order to easier identify which objects it is and to whom it belongs (admin only)	2018-07-09 13:30:17 +02:00
Oliver Falk	1c355b5014	Add additional models in admin	2018-07-09 13:29:20 +02:00
Oliver Falk	f3edd5c0f2	Merge branch 'fix_userpreferences' into 'master' ... Fix userpreferences See merge request oliver/ivatar!32	2018-07-09 12:48:25 +02:00
Oliver Falk	398259100f	Merge branch 'bootstrap-navbar' into 'master' ... Bootstrap navbar and Line Awesome See merge request oliver/ivatar!33	2018-07-09 12:47:42 +02:00
Oliver Falk	c93587f025	Make sure all titles contain 'ivatar' and correct the site branding	2018-07-09 12:37:16 +02:00
clime	98767b31a9	fix non-existent UserPreferences object for a newly created user	2018-07-09 12:25:59 +02:00
Oliver Falk	1cc69ddac0	Make navbar a real bootstrap navbar and switch from Font Awesome to Line Awesome (because it's libre)	2018-07-09 12:23:22 +02:00
Oliver Falk	53508723c3	Add line awesome (because it's libre)	2018-07-09 12:22:26 +02:00
clime	841a2c5d20	fix position of bootstrap4_extra_head	2018-07-09 11:07:49 +02:00
Oliver Falk	b90c30bf69	Merge branch 'devel' into 'master' ... Do not set width, since this clashes on mobile (and outer div) See merge request oliver/ivatar!30	2018-07-09 09:46:45 +02:00
Oliver Falk	c838240002	Do not set width, since this clashes on mobile (and outer div)	2018-07-05 16:57:46 +02:00
Oliver Falk	35ccbceb3c	Merge branch 'devel' into 'master' ... max-width, instead of width See merge request oliver/ivatar!29	2018-07-05 16:09:14 +02:00
Oliver Falk	53f4140597	max-width, instead of width	2018-07-05 16:04:49 +02:00
Oliver Falk	0a95db81b9	Initial idea of a bootstrap navbar	2018-07-05 16:04:33 +02:00
Oliver Falk	7a5e2a52c5	Merge branch 'devel' into 'master' ... Avoid mixed-content warning and only display secure content if serving via https See merge request oliver/ivatar!28	2018-07-05 15:07:04 +02:00
Oliver Falk	936ba00d6f	Avoid mixed-content warning and only display secure content if serving via https	2018-07-05 15:02:31 +02:00
Oliver Falk	a2ae8ee694	Merge branch 'tools' into 'master' ... Merge tools into master See merge request oliver/ivatar!27	2018-07-05 14:49:46 +02:00
Oliver Falk	65e4a76936	Merge branch 'master' into tools	2018-07-05 14:15:50 +02:00
Oliver Falk	6c6064c23b	Merge branch 'preferences' into 'master' ... Feature: Userpreferences See merge request oliver/ivatar!24	2018-07-05 14:11:52 +02:00
Oliver Falk	1f03c66944	Feature: Userpreferences	2018-07-05 14:11:52 +02:00