Commit Graph

354 Commits

Author SHA1 Message Date
Oliver Falk
6092d491b1 Merge in devel 2018-07-13 12:39:16 +02:00
Oliver Falk
63d0666b8f Merged in master 2018-07-13 12:36:57 +02:00
Oliver Falk
137af7da58 Merge in master 2018-07-13 12:31:46 +02:00
Oliver Falk
df538b2d9e Cleanup 2018-07-13 12:28:14 +02:00
Oliver Falk
973437f923 Add extra page after libravatar export upload, where user can choose what to import 2018-07-13 12:23:58 +02:00
Oliver Falk
7fc341b24a Wire up importing photo via mail and importing libravatar export in the menu 2018-07-13 08:04:09 +02:00
Oliver Falk
8101521ba3 Move list of avatars to the left on smaller devices, so we have more space on the right for openid/mail 2018-07-13 08:03:42 +02:00
Oliver Falk
752c3a6abb Fix width/height for image, truncate at 30 chars on small devices 2018-07-13 08:02:51 +02:00
Oliver Falk
f4524961cd Feature 'Import libravatar export (mails + photos)' 2018-07-12 15:00:59 +02:00
Oliver Falk
06d86e991d Missing px 2018-07-12 15:00:01 +02:00
Oliver Falk
89a12d4d30 Merge branch 'devel' into 'master'
Style and bugfixes from devel

See merge request oliver/ivatar!43
2018-07-12 07:29:32 +02:00
Oliver Falk
46a22433e5 We also need to check if user is anon:
Fix: !43, introduced by d5bf6de4
2018-07-12 07:16:01 +02:00
Oliver Falk
d5bf6de435 Deliver True/False for max_emails via context processor to all templates 2018-07-11 15:03:32 +02:00
Oliver Falk
20018cbf9f More on styling 2018-07-11 15:03:03 +02:00
Oliver Falk
504f278d23 Correct behaviour if we want to unlink/set photo to None (TODO: Same for OpenID?) 2018-07-11 15:02:34 +02:00
Oliver Falk
32d093805c Add constant for maximum allowed unconfirmed emails (need to wire up in model/view/save later!) 2018-07-11 15:01:28 +02:00
Oliver Falk
fb2a27589e Merge branch 'devel' into 'master'
Style counts

See merge request oliver/ivatar!42
2018-07-11 13:20:34 +02:00
Oliver Falk
556f48bfe7 More buttons, better styling 2018-07-11 13:05:42 +02:00
Oliver Falk
6a1288e3eb Why do we have a target there.... :-[ 2018-07-11 11:22:26 +02:00
Oliver Falk
8c175faf5d Merge branch 'devel' into 'master'
Merge in lastest devel

See merge request oliver/ivatar!41
2018-07-11 11:14:14 +02:00
Oliver Falk
52baa39bd0 Merge in photo_import 2018-07-11 11:07:30 +02:00
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