Commits · master · Discuss Data Project / Discuss Data

15 Jun, 2021 4 commits
- Merge branch '430-dariah-doi-not-shown-correctly-in-publication-success-email' into 'master' · cc068cef
  felix.herrmann authored Jun 15, 2021
```
Resolve "Dariah DOI not shown correctly in publication success email"

Closes #430

See merge request !405
```
  cc068cef
- fix(mail): show dhdoi when given instead of dddoi twice · 695f3ae6
  felix.herrmann authored Jun 15, 2021
  
  695f3ae6
- Merge branch '429-data-submission-aggreement-generation-on-saving-fails' into 'master' · a0219e66
  felix.herrmann authored Jun 15, 2021
```
Resolve "Data submission aggreement generation on saving fails"

Closes #429

See merge request !404
```
  a0219e66
- fix(dsa): use get_license_name/text_from_ds() functions in generate_dsa() · bc475567
  felix.herrmann authored Jun 15, 2021
  
  bc475567
30 May, 2021 2 commits
- Merge branch '428-search-filters-conflict-with-pagination' into 'master' · 2d13be8a
  felix.herrmann authored May 30, 2021
```
Resolve "Search: filters conflict with pagination"

Closes #428

See merge request !403
```
  2d13be8a
- fix(search): deactivate pagination as its conlficts with filtering · 7dd19e88
  felix.herrmann authored May 30, 2021
  
  7dd19e88
25 May, 2021 5 commits
- Merge branch '402-upload-big-files-to-dariah' into 'master' · 6ba99e1f
  felix.herrmann authored May 25, 2021
```
Resolve "upload big files to dariah"

Closes #402

See merge request !402
```
  6ba99e1f
- refactor(dhrep/publisher): revert some more log-levels to debug · 2f8935a2
  hynek authored May 25, 2021
```
also, use lazy logging
```
  2f8935a2
- fix(dhrep/storage): do not store `response.text` of a `GET` on storage resource into exception · 748851e9
  hynek authored May 25, 2021
```
this may be the root cause of the memory leakage occuring on a big file upload

close #402
```
  748851e9
- fix(dhrep/services): open file on update as binary · d835b50b
  hynek authored May 25, 2021
```
this may fix the memory leakage issue; must be tested on dev instance

close #402
```
  d835b50b
- refactor(datasets/views/prep): revert loggin level in some places to 'debug' · 55ea7586
  hynek authored May 25, 2021
  
  55ea7586
17 May, 2021 10 commits
- Merge branch '419-2-neue-buttons-auf-landing-page' into 'master' · fe7ce10c
  felix.herrmann authored May 17, 2021
```
Resolve "2 neue buttons auf landing page"

Closes #419

See merge request !401
```
  fe7ce10c
- fix(login): change login link on landing page button · e7cb2bfb
  felix.herrmann authored May 17, 2021
  
  e7cb2bfb
- Merge branch '419-2-neue-buttons-auf-landing-page' into 'master' · 2c96d5a5
  felix.herrmann authored May 17, 2021
```
Resolve "2 neue buttons auf landing page"

Closes #419

See merge request !400
```
  2c96d5a5
- fix(login): add login.html template · 1c08eaf6
  felix.herrmann authored May 17, 2021
  
  1c08eaf6
- Merge branch '419-2-neue-buttons-auf-landing-page' into 'master' · 8840cf07
  felix.herrmann authored May 17, 2021
```
Resolve "2 neue buttons auf landing page"

Closes #419

See merge request !399
```
  8840cf07
- fix(headers): fix twitter link, open twitter links in new window · 8878f4f7
  felix.herrmann authored May 17, 2021
  
  8878f4f7
- Merge branch '419-2-neue-buttons-auf-landing-page' into 'master' · 3daf5aa0
  felix.herrmann authored May 17, 2021
```
Resolve "2 neue buttons auf landing page"

Closes #419

See merge request !398
```
  3daf5aa0
- fix(login): add an extra login page for additional info before showing signin button · 8aab003d
  felix.herrmann authored May 17, 2021
  
  8aab003d
- fix(header): add twitter logos to headers · d1136706
  felix.herrmann authored May 17, 2021
  
  d1136706
- fix(footer): add Dariah-DE logo, replace faulty DFG svg with png · b44b1a3f
  felix.herrmann authored May 17, 2021
  
  b44b1a3f
11 May, 2021 2 commits
- Merge branch '426-add-sorting-to-dataset-search-result' into 'master' · 474f7b88
  felix.herrmann authored May 11, 2021
```
Resolve "Add sorting to dataset search result"

Closes #426

See merge request !397
```
  474f7b88
- fix(search): sorting search results by date/alphabetically · ccd75776
  felix.herrmann authored May 11, 2021
  
  ccd75776
03 May, 2021 2 commits
- Merge branch '424-private-comments-shown-in-public' into 'master' · 53685739
  felix.herrmann authored May 03, 2021
```
Resolve "Private comments shown in public"

Closes #424

See merge request !396
```
  53685739
- fix(privacy): fix showing private comments in public threads · 622cd9d0
  felix.herrmann authored May 03, 2021
  
  622cd9d0
30 Mar, 2021 10 commits
- Merge branch '181-e-mail-notification-dashboard' into 'master' · 5df33830
  felix.herrmann authored Mar 30, 2021
```
Resolve "E-Mail notification & dashboard"

Closes #181

See merge request !395
```
  5df33830
- fix(admin): add ds pub requests to admin · 67387937
  felix.herrmann authored Mar 30, 2021
  
  67387937
- fix(mails): add more error logging · 758eeb1f
  felix.herrmann authored Mar 30, 2021
  
  758eeb1f
- Merge branch '181-e-mail-notification-dashboard' into 'master' · 5b6ddd66
  felix.herrmann authored Mar 30, 2021
```
Resolve "E-Mail notification & dashboard"

Closes #181

See merge request !394
```
  5b6ddd66
- fix(mails): add more error logging · 8d3ffde3
  felix.herrmann authored Mar 30, 2021
  
  8d3ffde3
- Merge branch '181-e-mail-notification-dashboard' into 'master' · 55be2b8b
  felix.herrmann authored Mar 30, 2021
```
Resolve "E-Mail notification & dashboard"

Closes #181

See merge request !393
```
  55be2b8b
- fix(mails): remove error cause by logging · 4ee62f38
  felix.herrmann authored Mar 30, 2021
  
  4ee62f38
- Merge branch '181-e-mail-notification-dashboard' into 'master' · 4c661018
  felix.herrmann authored Mar 30, 2021
```
Resolve "E-Mail notification & dashboard"

Closes #181

See merge request !392
```
  4c661018
- fix(mails): add error logging calls · 0e8805af
  felix.herrmann authored Mar 30, 2021
  
  0e8805af
- fix(mails): add error handling to send_update_email function · 9c48fbd8
  felix.herrmann authored Mar 30, 2021
  
  9c48fbd8
29 Mar, 2021 2 commits
- Merge branch '181-e-mail-notification-dashboard' into 'master' · af02f78a
  felix.herrmann authored Mar 29, 2021
```
Resolve "E-Mail notification & dashboard"

Closes #181

See merge request !391
```
  af02f78a
- fix(email): add email_alternative field to User in case shib provides faulty... · 5e64f523
  felix.herrmann authored Mar 29, 2021
```
fix(email): add email_alternative field to User in case shib provides faulty email address information


(cherry picked from commit 1b9aa1e6)
```
  5e64f523
28 Mar, 2021 3 commits
- Merge branch '181-mailing' into 'master' · 1502dc88
  felix.herrmann authored Mar 28, 2021
```
Resolve "Mailing"

Closes #181

See merge request !350
```
  1502dc88
- Merge branch 'cherry-pick-de0d44c7' into '181-mailing' · 4c458dbf
  felix.herrmann authored Mar 28, 2021
```
refactor(urls/settings.base): remove leftover wagtail-transfer config, urls and imports

See merge request !365
```
  4c458dbf
- Merge branch '181-mailing' into 'cherry-pick-de0d44c7' · ebbe9890
  felix.herrmann authored Mar 28, 2021
```
# Conflicts:
#   config/settings/base.py
```
  ebbe9890