Commit Graph

468 Commits

Author SHA1 Message Date
Oliver Falk
095f907f91 Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar 2018-11-19 16:25:49 +01:00
Oliver Falk
aeb0a529f3 Merge branch 'master' into 'devel'
# Conflicts:
#   ivatar/middleware.py
2018-11-19 16:25:01 +01:00
Oliver Falk
c1d6a751da Rewrite middleware to use FORWARDED_SERVER as FORWARDED_HOST, if available 2018-11-19 16:20:25 +01:00
Oliver Falk
24387b5b86 Merge branch 'devel' into 'master'
Middleware for multiple proxies

See merge request oliver/ivatar!78
2018-11-19 16:03:41 +01:00
Oliver Falk
033a288b8d Middleware for multiple proxies 2018-11-19 16:03:41 +01:00
Oliver Falk
2f79608a59 Add middleware and rearrange to make pylint happier 2018-11-19 15:43:46 +01:00
Oliver Falk
8f466b3682 Add middleware to fix multiple proxies issue 2018-11-19 15:43:21 +01:00
Oliver Falk
b11d4f5d42 Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar 2018-11-16 15:32:17 +01:00
Oliver Falk
81b4417e4f Happy lint, happy coverage 2018-11-16 13:33:39 +01:00
Oliver Falk
ea3c586d3b Merge branch 'devel' into 'master'
Maybe we get finally the OpenID redirect stuff right

See merge request oliver/ivatar!77
2018-11-16 13:27:52 +01:00
Oliver Falk
740c03e731 Set option to use proxy set value from X_FORWARDED_HOST 2018-11-16 13:23:18 +01:00
Oliver Falk
6c886fdb1f Revert commit e22275f5 and e6d65637, since this anyway didn't fix the OpenID redirect problem 2018-11-16 13:21:26 +01:00
Oliver Falk
65ae67918f Merge branch 'devel' into 'master'
Make sure we don't run into regressions again (issue #18 #20)

See merge request oliver/ivatar!76
2018-11-16 12:22:47 +01:00
Oliver Falk
9119e5f78c Make sure we don't run into regressions again (issue #18 #20) 2018-11-16 12:18:21 +01:00
Oliver Falk
1399bb8758 Merge branch 'devel' into 'master'
Regression fix (issue #18, #20)

Closes #20

See merge request oliver/ivatar!75
2018-11-16 12:13:01 +01:00
Oliver Falk
c6710052d2 Fix regression introduced by commit c3ed5fb0 (issue #18 - fixes issue #20 2018-11-16 12:08:11 +01:00
Oliver Falk
8941489067 Merge branch 'devel' into 'master'
Fix issue #18 and #19

Closes #18 and #19

See merge request oliver/ivatar!73
2018-11-16 11:13:57 +01:00
Oliver Falk
3be9611cf8 Regression from fixing issue #18 - adapt test accordingly 2018-11-16 11:09:24 +01:00
Oliver Falk
da6c0691dc Address issue #19, inconsistent padding size in relation to requested size + final image return is larger, since padding is added 2018-11-16 11:03:50 +01:00
Oliver Falk
0d404dc559 Return nobody instead of misteryman - as pointed out in issue #18 (fixed) 2018-11-16 10:51:08 +01:00
Oliver Falk
db01e5d94d Merge branch 'devel' into 'master'
Fix issue #17

Closes #17

See merge request oliver/ivatar!72
2018-11-16 10:51:01 +01:00
Oliver Falk
c3ed5fb014 Fix issue #17 2018-11-16 10:45:42 +01:00
Oliver Falk
4288d480eb Merge branch 'devel' into 'master'
Fix issue #16

Closes #16

See merge request oliver/ivatar!71
2018-11-16 10:43:21 +01:00
Oliver Falk
22fb786cff Fix issue #16 2018-11-16 10:38:47 +01:00
Oliver Falk
e5e00feda9 Merge branch 'devel' into 'master'
Fix issue #15 - Picture import doesn't work

Closes #15

See merge request oliver/ivatar!70
2018-11-14 15:02:57 +01:00
Oliver Falk
7bb57e9b9c Fix issue #15, only use the first part of the client IP - this dosn't happen in SQLite envs, since types are not enforced 2018-11-14 14:58:22 +01:00
Oliver Falk
0d9159a62d Merge branch 'switch-to-python36' into 'master'
Use Python 3.6 now (=> Django 2.1)

See merge request oliver/ivatar!69
2018-11-14 14:49:09 +01:00
Oliver Falk
b72eb289f4 Use latest pip 2018-11-14 14:40:02 +01:00
Oliver Falk
8bd5fb03d1 Make sure we use py 3.6 for virtualenv 2018-11-14 14:26:26 +01:00
Oliver Falk
3bde5e8da2 Still need to use pip from py 3.4 2018-11-14 14:24:31 +01:00
Oliver Falk
ffd0637e05 Use Python 3.6 now 2018-11-14 14:15:34 +01:00
Oliver Falk
1da9af1c83 Merge branch 'devel' into 'master'
Merge in latest development tree

See merge request oliver/ivatar!68
2018-11-14 14:10:35 +01:00
Oliver Falk
879463edbf Password reset/change, remove various occurances of 'or' between button and adjust the content div width 2018-11-14 14:05:56 +01:00
Oliver Falk
93ee211e50 Merge branch 'devel' into 'master'
Fix issue #14.

Closes #14

See merge request oliver/ivatar!67
2018-11-12 16:25:35 +01:00
Oliver Falk
847b9ec8e2 Do not allow logged in users to view all raw images 2018-11-12 16:06:05 +01:00
Oliver Falk
ea4603505e Merge branch 'devel' into 'master'
Merge in latest devel tree

See merge request oliver/ivatar!66
2018-11-12 15:16:30 +01:00
Oliver Falk
9b992cf79f Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar into devel 2018-11-12 14:29:38 +01:00
Oliver Falk
8ef362aff9 Merge branch 'devel' into access_counts 2018-11-12 13:31:11 +01:00
Oliver Falk
a56b8af7a9 Track access counts and show them on mouseover 2018-11-12 13:30:50 +01:00
Oliver Falk
40e976cce8 Login/Signup redirect to profile if logged in 2018-11-12 13:25:50 +01:00
Oliver Falk
b9d062c19c Correct lock, add space between OpenID/mail and lock, adapt width 2018-11-12 13:24:04 +01:00
Oliver Falk
e3819e8970 Merge branch 'patch-1' into 'master'
Fixed a bug with the translations in login.html

See merge request oliver/ivatar!65
2018-11-12 05:52:42 +01:00
Niklas Poslovski
5a964320e2 Fixed a bug with the translations in login.html 2018-11-11 20:42:24 +01:00
Oliver Falk
d0d77d85c8 Merge branch 'devel' into 'master'
OpenID work (latest devel) and messages

See merge request oliver/ivatar!64
2018-11-07 15:26:00 +01:00
Oliver Falk
ffde836b07 Regression in tests 2018-11-07 15:21:43 +01:00
Oliver Falk
c8a8624da0 Add button/link to OpenID login 2018-11-07 15:11:30 +01:00
Oliver Falk
9c4a975a77 We also need to delete the main OpenID object to not leave any traces 2018-11-07 15:11:12 +01:00
Oliver Falk
9009bc7e2f Add messages again 2018-11-07 15:10:47 +01:00
Oliver Falk
a4b49906a6 Style the buttons as all othe rbuttons 2018-11-07 15:10:10 +01:00
Oliver Falk
5f93585435 Merge branch 'devel' into 'master'
If nothing helps, Javascript to the rescue

See merge request oliver/ivatar!63
2018-11-06 16:32:43 +01:00