Commit Graph

868 Commits

Author SHA1 Message Date
Oliver Falk
cadf30d696 Merge branch 'fix_site_name' into 'devel'
differentiate between software (ivatar) and a site_name

See merge request oliver/ivatar!105
2019-02-12 15:29:53 +01:00
Oliver Falk
54e2ee482e Merge branch 'master' of git.linux-kernel.at:oliver/ivatar into devel 2019-02-12 15:28:25 +01:00
Oliver Falk
5b6f219c07 Merge branch 'devel' into 'devel'
enable setting SERVER_EMAIL from env, use DEFAULT_FROM_EMAIL for send_mail

See merge request oliver/ivatar!104
2019-02-12 15:28:14 +01:00
Oliver Falk
2bed4e5aaf Do no longer append '/' automatically, but make sure we have a protocol in place -> Fixes and closes #35 2019-02-12 15:26:43 +01:00
clime
a6addc545b differentiate between software (ivatar) and a site_name 2019-02-10 19:59:57 +01:00
clime
3fda33b6f6 enable setting SERVER_EMAIL from env, use DEFAULT_FROM_EMAIL for send_mail
From documentation for DEFAULT_FROM_EMAIL:

Default email address to use for various automated correspondence from the site manager(s).
This doesn’t include error messages sent to ADMINS and MANAGERS; for that, see SERVER_EMAIL.

That means it makes sense to make SERVER_EMAIL and DEFAULT_FROM_EMAIL separate settings and
not set one from another.
2019-02-10 19:36:43 +01:00
Oliver Falk
7173909b9b Merge branch 'master' into 'master'
Improve homepage

See merge request oliver/ivatar!103
2019-01-17 09:20:00 +01:00
Niklas Poslovski
049ebc4fd2 Move user dropdown to a better position on the homepage 2019-01-16 19:23:35 +01:00
Niklas Poslovski
1bd433cf90 Remove if condition for home button because it makes sense when logged out,too. 2019-01-16 19:14:19 +01:00
Niklas Poslovski
1ab3773c72 Remove navbar from homepage again. 2019-01-16 19:10:43 +01:00
Oliver Falk
7c70199ea0 Merge branch 'devel' into 'master'
Add security content

See merge request oliver/ivatar!102
2019-01-08 15:36:17 +01:00
Oliver Falk
4f06ccbb7b Add security content 2019-01-08 15:05:27 +01:00
Oliver Falk
d9734682e7 Merge branch 'devel' into 'master'
Fix OpenId login with data imported from libravatar

See merge request oliver/ivatar!101
2019-01-08 14:49:14 +01:00
Oliver Falk
7028a4bd77 In order to be able to login with the ConfirmedOpenID, we need to create the UserOpenID objects as well - issue #27 2019-01-08 14:33:53 +01:00
Oliver Falk
83095f6443 Merge branch 'devel' into 'master'
Integrate latest devel

Closes #25, #28, and #30

See merge request oliver/ivatar!100
2019-01-08 13:49:39 +01:00
Oliver Falk
e005ca863e Fix issue #25 2019-01-08 13:33:52 +01:00
Oliver Falk
7d2b93ad90 Since we no longer redirect to Gravatar in case of inexisting hash on Gravatar side, we need to adapt our tests 2019-01-08 12:31:19 +01:00
Oliver Falk
9cbe84e005 Also export password - not sure if this will always work... 2019-01-08 12:29:51 +01:00
Oliver Falk
d0f15eaca5 Allow take over of passwords 2019-01-08 12:28:54 +01:00
Oliver Falk
e554537c40 Integrate change from PR ls -ltrah, issue #32 2019-01-08 12:01:50 +01:00
Oliver Falk
f4d47f2205 Merge branch 'devel' of git.linux-kernel.at:oliver/ivatar into devel 2019-01-08 11:54:44 +01:00
Oliver Falk
4f3381650b Merge branch 'import_relations' into 'devel'
add support for extracting relations between emails, openids, and photos from...

See merge request oliver/ivatar!97
2019-01-08 11:54:31 +01:00
Oliver Falk
5c4f4ce16e Ignore locally installed node modules 2019-01-08 11:42:01 +01:00
Oliver Falk
d7e0106dc3 Fix issue #28 2019-01-08 11:41:41 +01:00
Oliver Falk
3d22f6082e Hack for fixing issue #30 2019-01-08 11:30:00 +01:00
Oliver Falk
90635d64a7 Remove dryrun, since saving the data to a string, will be problematic with ascii and sh*t 2019-01-08 10:17:30 +01:00
Oliver Falk
f4249b312c Export relations for merge request !97 2019-01-08 10:08:25 +01:00
Oliver Falk
f0da1f5c8c Merge branch 'master' into libravatar_export 2019-01-08 10:06:43 +01:00
Oliver Falk
0d133aae91 Merge branch 'devel' into 'master'
Merge in latest devel

Closes #31

See merge request oliver/ivatar!99
2019-01-08 09:24:43 +01:00
Oliver Falk
abadbd1724 Merge branch 'devel' into 'devel'
make SITE_NAME, SECURE_BASE_URL, BASE_URL configurable from env

See merge request oliver/ivatar!95
2019-01-08 09:02:00 +01:00
Oliver Falk
02c5d8b766 Merge with master 2019-01-08 09:01:06 +01:00
Oliver Falk
43beff46af Merge branch 'devel' of ssh://pagure.io/ivatar into devel 2019-01-07 19:52:23 +01:00
Oliver Falk
50df65abd3 Fix for issue #29 2019-01-07 19:51:47 +01:00
Oliver Falk
3b216cee29 Fix for issue #15 2019-01-07 19:50:47 +01:00
Oliver Falk
a44abc226a Separate navbar for issue #31 2019-01-07 19:42:46 +01:00
Oliver Falk
06c6fc76b2 Implement option to specify EMAIL_BACKEND in ENV for issue #32 2019-01-07 19:42:18 +01:00
Oliver Falk
112c88c12f Fix issue #31 2019-01-07 19:40:55 +01:00
Oliver Falk
d878aaacea Userprefs 2019-01-07 19:20:38 +01:00
clime
3917f3530c add support for extracting relations between emails, openids, and photos from libravatar's export data
* support to export script needs to be added too
2018-12-30 16:59:46 +01:00
clime
a2b4c55976 make SITE_NAME, SECURE_BASE_URL, BASE_URL configurable from env 2018-12-29 16:08:46 +01:00
Oliver Falk
aad72d7e23 Merge branch 'master' into 'master'
Moved many styles to tortin.less

See merge request oliver/ivatar!94
2018-12-23 10:51:23 +01:00
Niklas Poslovski
7f5ad3dc46 Compiled new green.css from updated tortin.less 2018-12-07 18:15:14 +01:00
Niklas Poslovski
ca89e059b8 Compiled new red.css from updated tortin.less 2018-12-07 18:13:46 +01:00
Niklas Poslovski
b0b31c96d2 Compiled new tortin.css from updated tortin.less 2018-12-07 18:12:54 +01:00
Niklas Poslovski
6160f0e4ca Added many styles from the template files directly to tortin.less and make their color use LessCSS variables 2018-12-07 18:12:05 +01:00
Niklas Poslovski
aabeda903e Removed <style> tag from choose_libravatar_export.html because I'll move it to tortin.css and added divs with .checkbox to the checkboxes 2018-12-07 18:02:35 +01:00
Niklas Poslovski
e0cfed1c5c Removed <style> tag from crop_photo.html because I'll move it to tortin.css 2018-12-07 17:46:06 +01:00
Niklas Poslovski
e91c35bab9 Removed <style> tag from preferences.html because I'll move it to tortin.css 2018-12-07 17:39:47 +01:00
Niklas Poslovski
6abdd8eefe Removed <style> tag from upload_libravatar_export.html because I'll move it to tortin.css 2018-12-07 17:35:58 +01:00
Niklas Poslovski
18cde64e19 Removed <style> tag from upload_photo.html because I'll move it to tortin.css 2018-12-07 17:34:02 +01:00