Commit Graph

733 Commits

Author SHA1 Message Date
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
Oliver Falk
e6d6563712 If nothing helps, Javascript to the rescue 2018-11-06 16:28:13 +01:00
Oliver Falk
e22275f537 Merge branch 'devel' into 'master'
Make OpenID login correctly redirect (hopefully)

See merge request oliver/ivatar!62
2018-11-06 16:17:02 +01:00
Oliver Falk
936065d14e Merge branch 'master' into devel 2018-11-06 16:12:22 +01:00
Oliver Falk
0aab767ddb Merge branch 'devel' into 'master'
Merge

See merge request oliver/ivatar!61
2018-11-06 16:07:41 +01:00
Oliver Falk
7df47d6b3e Add error/failure templates and use full url for openid redirect 2018-11-06 16:03:14 +01:00
Oliver Falk
a2b820da52 Merge branch 'devel' into 'master'
Add missing lic

See merge request oliver/ivatar!60
2018-11-06 13:44:50 +01:00
Oliver Falk
617c5f2c4f Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar into devel 2018-11-06 13:39:55 +01:00
Oliver Falk
f2e24a7427 Add missing lic 2018-11-06 13:38:09 +01:00
Oliver Falk
f29bca6394 Merge branch 'devel' into 'master'
Merge in latest development tree

See merge request oliver/ivatar!59
2018-11-06 13:36:57 +01:00
Oliver Falk
5c8716324b Script to convert SVG to nobody png images 2018-11-06 13:32:15 +01:00
Oliver Falk
9da606c3e5 Update color orange-ish -> blue-ish 2018-11-06 13:31:51 +01:00
Oliver Falk
12aa5cc93a Add OpenID login form 2018-11-06 13:08:25 +01:00
Oliver Falk
d92c56c7d1 Use pickle serializer, because of https://stackoverflow.com/questions/20301338/django-openid-auth-typeerror-openid-yadis-manager-yadisservicemanager-object-is 2018-11-06 13:08:10 +01:00
Oliver Falk
c8d802eeee Merge branch 'devel' of https://git.linux-kernel.at/oliver/ivatar 2018-10-15 14:49:30 +02:00
Oliver Falk
ee9b1c561b Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar 2018-10-15 14:49:08 +02:00
Oliver Falk
9f9752e02b Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar into devel 2018-10-15 14:46:30 +02:00
Oliver Falk
20c710ddcf Merge #1 Merge in latest dev 2018-10-15 12:42:48 +00:00
Oliver Falk
3ca8023607 Merge branch 'devel' into 'master'
Add identicon (aka retro)

See merge request oliver/ivatar!58
2018-10-15 13:49:02 +02:00
Oliver Falk
ec257a238e Add mp as synonym for mm (for default) 2018-10-15 13:09:07 +02:00
Oliver Falk
b908316027 Add identicon and retro - the same for us at the moment 2018-10-15 13:06:56 +02:00
Oliver Falk
a55dd08e79 Merge branch 'devel' into 'master'
Merge in latest devel, adding description page and fixing explicit use of default=mm

See merge request oliver/ivatar!57
2018-10-10 11:56:19 +02:00
Oliver Falk
8e78808fd9 Add description page 2018-10-10 11:22:39 +02:00
Oliver Falk
98f582f503 Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar 2018-10-10 10:14:30 +02:00
Oliver Falk
5557aa4bbf Fix use of explicit default=mm in params 2018-10-10 10:10:22 +02:00
Oliver Falk
9b2dc9fad5 Merge branch 'devel' into 'master'
Monster ID support and fix default= param

See merge request oliver/ivatar!56
2018-10-10 09:53:56 +02:00
Oliver Falk
1de1257a42 use default, not d, since d not in params of course 2018-10-10 09:48:53 +02:00
Oliver Falk
9a447bb858 Add monsterid functionality 2018-10-09 19:22:15 +02:00
Oliver Falk
3badfd8dc1 Add notsetuptools as dep for monsterid and add monsterid and pydenticon 2018-10-09 19:20:31 +02:00
Oliver Falk
617717a144 Prepare for description page (WiP) 2018-10-09 19:11:31 +02:00
Oliver Falk
1afb0df721 Preferences are no longer used, do not list 'em 2018-10-09 19:11:13 +02:00
Oliver Falk
874f99c122 Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar 2018-10-08 13:32:06 +02:00
Oliver Falk
3e3db3529c Merge branch 'devel' of https://git.linux-kernel.at/oliver/ivatar 2018-10-08 13:31:40 +02:00
Oliver Falk
e5f3ba2887 Merge branch 'devel' into 'master'
Merge in devel (for security page)

See merge request oliver/ivatar!55
2018-10-08 12:48:42 +02:00
Oliver Falk
d6d1d3d306 Add 'security' page and adapt links 2018-10-08 12:43:55 +02:00
Oliver Falk
3e8061d738 More breaks 2018-10-08 12:43:23 +02:00