Commit Graph

238 Commits

Author SHA1 Message Date
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
Oliver Falk
0a95db81b9 Initial idea of a bootstrap navbar 2018-07-05 16:04:33 +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
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
Oliver Falk
f4803536f0 Merge branch 'devel' into 'master'
Merge in devel branch

See merge request oliver/ivatar!23
2018-07-05 12:52:45 +02:00
Oliver Falk
469ff6dbab Do not add message about successful adding (unconfirmed OpenID) 2018-07-05 12:48:20 +02:00
Oliver Falk
e599c52b00 Fix path to delete icon/image 2018-07-05 12:47:49 +02:00
Oliver Falk
d1e4184864 Link to the raw image on profile page 2018-07-04 14:30:59 +02:00
Oliver Falk
10c97f272b Merge branch 'devel' into 'master'
Merge in tools and lint via devel

See merge request oliver/ivatar!22
2018-07-03 13:40:39 +02:00
Oliver Falk
fa45375573 Merge 2018-07-03 13:36:00 +02:00
Oliver Falk
af9949f9db Forgot to import MAX_LENGTH_URL, now that it's no longer defined here 2018-07-03 13:25:04 +02:00
Oliver Falk
29f2706cfe Merge branch 'tools' into pylint 2018-07-03 13:19:13 +02:00
Oliver Falk
0c522974bb Merge branch 'master' into pylint 2018-07-03 13:18:58 +02:00
Oliver Falk
c959538619 Only a happy lint, is a good lint. 2018-07-03 13:15:34 +02:00
Oliver Falk
ca09662d47 Style the images nicer with Font Awesome and titles for these. 2018-07-03 13:07:34 +02:00
Oliver Falk
18201ed86c Include Font Awesome 2018-07-03 13:07:06 +02:00
Oliver Falk
1c6542eb34 Style fas/fab (Fonts Awesome) 2018-07-03 13:06:40 +02:00
Oliver Falk
e44413a43a Make pylint happier 2018-07-03 13:05:47 +02:00
Oliver Falk
a6cadbf1b0 Add baseurl and secure base url, in order to use it in the template(s). 2018-07-03 13:03:51 +02:00
Oliver Falk
e0ba4d8013 Merge branch 'tools' into 'master'
First tool: Check OpenID/mail

See merge request oliver/ivatar!18
2018-07-03 11:56:14 +02:00
Oliver Falk
cb99a0c678 First tool: Check OpenID/mail 2018-07-03 11:56:14 +02:00
Oliver Falk
3d7af73a5a We need to add the trailing slash now 2018-07-03 11:51:18 +02:00
Oliver Falk
1a08887892 Add functionality to check OpenID/mail; Size already works, default URL not (yet) 2018-07-03 10:58:03 +02:00
Oliver Falk
78600c1670 Merge branch 'devel' into 'master'
Merge in stashed changes

See merge request oliver/ivatar!17
2018-07-03 07:24:38 +02:00
Oliver Falk
65d989d59f Merge branch 'devel' into tools 2018-07-03 07:15:01 +02:00
Oliver Falk
613e986290 Merge in stashed changes 2018-07-03 07:14:49 +02:00
Oliver Falk
aef584d499 Merge branch 'devel' into 'master'
Add max photo size, in order to use that variable in the template

See merge request oliver/ivatar!16
2018-07-02 14:35:07 +02:00
Oliver Falk
a10145c25b Add max photo size, in order to use that variable in the template 2018-07-02 14:28:42 +02:00
Oliver Falk
2f980479a5 Add tools, first interface, no functionality yet 2018-07-02 14:26:09 +02:00
Oliver Falk
17c5086c3a Merge branch 'patch-1' into 'master'
make more space for header in ivatar.css

See merge request oliver/ivatar!15
2018-07-02 12:50:54 +02:00
clime
88546b3a53 Update ivatar.css 2018-07-02 11:42:40 +02:00
Oliver Falk
122d8f50eb Merge branch 'devel' into 'master'
Merge in latest devel branch

See merge request oliver/ivatar!14
2018-06-27 12:16:43 +02:00
Oliver Falk
9f588b9221 Docstring where pylint wants 'em, Ignore too many lines (for the moment at least), reorder module imports to make pylint happier, lots of pylint related adaptions and introduce test for CropPhotoView 2018-06-27 12:10:00 +02:00
Oliver Falk
12f80ac721 No coverage here 2018-06-27 09:36:32 +02:00
Oliver Falk
20a51602d9 This is just to be _very_ safe, during testing, this can actually not happen at all and is therefore untestable 2018-06-27 09:36:02 +02:00
Oliver Falk
e7d80d0b57 Typo 2018-06-27 09:35:17 +02:00
Oliver Falk
d029a93cf5 Merge branch 'devel' into 'master'
Merge branch 'master' into devel

See merge request oliver/ivatar!13
2018-06-27 08:54:15 +02:00
Oliver Falk
41cdf7b3d0 Merge branch 'master' into devel 2018-06-27 08:46:44 +02:00
Oliver Falk
3f2b9fd397 Merge branch 'devel' into 'master'
Merge devel into master

See merge request oliver/ivatar!12
2018-06-27 08:46:00 +02:00
Oliver Falk
96fa137b27 Merge branch 'pylint' into 'master'
Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar into pylint

See merge request oliver/ivatar!11
2018-06-27 08:43:38 +02:00
Oliver Falk
1869da2dfa Migration for digest_sha256 != NULL and no cascading deletion 2018-06-27 08:31:06 +02:00
Oliver Falk
8efbcc7ebc Avoid deleting photo cascades and deletes mail/openid and make sure digest_sha256 may not be null (needs migration 0007) 2018-06-27 08:30:18 +02:00
Oliver Falk
5ecc84bd56 Merge branch 'master' into pylint 2018-06-27 07:53:22 +02:00
Oliver Falk
0aa8aef187 Merge branch 'sha256' into 'master'
SHA256 support (hackish)

See merge request oliver/ivatar!10
2018-06-27 07:42:56 +02:00
Oliver Falk
24727f5591 OOps, need to check in the right model of course 2018-06-27 07:36:21 +02:00
Oliver Falk
08398ec293 Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar into pylint 2018-06-26 16:58:45 +02:00
Oliver Falk
991a0f33f9 Merge branch 'sha256' of https://git.linux-kernel.at/oliver/ivatar into tools 2018-06-26 16:58:17 +02:00
Oliver Falk
a641c08961 Hack in sha256 support - needs to be refactored 2018-06-26 16:55:14 +02:00