Commits · master · open-source / MetaGer

01 Mar, 2021 6 commits
- Merge branch 'development' into 'master' · 756a7550
  Dominik Hebeler authored Mar 01, 2021
```
fixed non ending loadmore

See merge request !1854
```
  756a7550
- fixed non ending loadmore · 41127cda
  Dominik Hebeler authored Mar 01, 2021
  
  41127cda
- Merge branch 'development' into 'master' · 365b8d38
  Dominik Hebeler authored Mar 01, 2021
```
reenabled admitad

See merge request !1853
```
  365b8d38
- reenabled admitad · 6a5e8c68
  Dominik Hebeler authored Mar 01, 2021
  
  6a5e8c68
- Merge branch 'development' into 'master' · 2f013b9a
  Dominik Hebeler authored Mar 01, 2021
```
readded wsb

See merge request !1852
```
  2f013b9a
- readded wsb · 7f67c005
  Dominik Hebeler authored Mar 01, 2021
  
  7f67c005
26 Feb, 2021 2 commits
- Merge branch 'development' into 'master' · 95f40a13
  Dominik Hebeler authored Feb 26, 2021
```
fixed error preventing loading more

See merge request !1850
```
  95f40a13
- fixed error preventing loading more · 78bcf550
  Dominik Hebeler authored Feb 26, 2021
  
  78bcf550
25 Feb, 2021 7 commits
- Merge branch 'development' into 'master' · dad1037a
  Dominik Hebeler authored Feb 25, 2021
```
Temporarily disabled admitad to solve some problems

See merge request !1849
```
  dad1037a
- Temporarily disabled admitad to solve some problems · 5cfd4697
  Dominik Hebeler authored Feb 25, 2021
  
  5cfd4697
- Merge branch 'development' into 'master' · 269c282e
  Dominik Hebeler authored Feb 25, 2021
```
Development

See merge request !1848
```
  269c282e
- Merge branch '1119-implement-admitad' into 'development' · 98f9147a
  Dominik Hebeler authored Feb 25, 2021
```
Resolve "Implement Admitad"

Closes #1119

See merge request !1847
```
  98f9147a
- added preference setting and loading adgoal we reloaded results · b3e53cb6
  Dominik Hebeler authored Feb 25, 2021
  
  b3e53cb6
- fixed partnershop description · 4dddf205
  Dominik Hebeler authored Feb 25, 2021
  
  4dddf205
- Loading of Admitad Affiliates is working now · b4c37dfc
  Dominik Hebeler authored Feb 25, 2021
  
  b4c37dfc
24 Feb, 2021 1 commit
- Basic Admitad Partnershop working now · 6751648b
  Dominik Hebeler authored Feb 24, 2021
  
  6751648b
22 Feb, 2021 6 commits
- repaired xdebug after upgrade from 2 to 3 · e36255ab
  Dominik Hebeler authored Feb 22, 2021
  
  e36255ab
- Merge branch 'development' into 'master' · 6fd0ad04
  Dominik Hebeler authored Feb 22, 2021
```
Development

See merge request !1846
```
  6fd0ad04
- Merge branch '1118-switch-back-to-debian-based-images' into 'development' · e6714dc0
  Dominik Hebeler authored Feb 22, 2021
```
Resolve "Switch back to Debian based images"

Closes #1118

See merge request !1845
```
  e6714dc0
- fixed loop in useragents · d0a5877e
  Dominik Hebeler authored Feb 22, 2021
  
  d0a5877e
- fixed chown · 9c7cbea5
  Dominik Hebeler authored Feb 22, 2021
  
  9c7cbea5
- replaced alpine containers · cf3f59c5
  Dominik Hebeler authored Feb 22, 2021
  
  cf3f59c5
16 Feb, 2021 10 commits
- Merge branch 'development' into 'master' · 42c05822
  Dominik Hebeler authored Feb 16, 2021
```
verifying metager.org

See merge request !1843
```
  42c05822
- verifying metager.org · 9336e155
  Dominik Hebeler authored Feb 16, 2021
  
  9336e155
- Merge branch 'development' into 'master' · 87d1a68e
  Dominik Hebeler authored Feb 16, 2021
```
added admitad verification

See merge request !1842
```
  87d1a68e
- added admitad verification · cdeab52f
  Dominik Hebeler authored Feb 16, 2021
  
  cdeab52f
- Merge branch 'development' into 'master' · eb861f38
  Dominik Hebeler authored Feb 16, 2021
```
Development

See merge request !1841
```
  eb861f38
- fixed pdf for membership form · c1f78b25
  Dominik Hebeler authored Feb 16, 2021
  
  c1f78b25
- Merge branch... · 3a384bc3
  Dominik Hebeler authored Feb 16, 2021
```
Merge branch '1117-stop-contact-and-donation-form-from-being-sent-multiple-times' into 'development'

Resolve "Stop contact and donation form from being sent multiple times"

Closes #1117

See merge request !1839
```
  3a384bc3
- Merge branch '1103-keys-for-donors' into 'development' · 6fbb5a24
  Dominik Hebeler authored Feb 16, 2021
```
Resolve "Keys for donors"

Closes #1103

See merge request !1819
```
  6fbb5a24
- fixed env values for civicrm api · 0101688d
  Dominik Hebeler authored Feb 16, 2021
  
  0101688d
- fixed style of thank you page · 0000cd29
  Dominik Hebeler authored Feb 16, 2021
  
  0000cd29
15 Feb, 2021 6 commits
- Merge branch '1102-shortname-in-opensearch-xml' into 'development' · f606f5df
  Dominik Hebeler authored Feb 15, 2021
```
Resolve "Shortname in opensearch.xml"

Closes #1102

See merge request !1838
```
  f606f5df
- minor change · 633efdf3
  Davide Aprea authored Feb 15, 2021
  
  633efdf3
- remove text change on submit · a16482df
  Davide Aprea authored Feb 15, 2021
  
  a16482df
- minor bug fix · bd8f0eed
  Davide Aprea authored Feb 15, 2021
  
  bd8f0eed
- disable button on submit and change value · f566c8e9
  Davide Aprea authored Feb 15, 2021
  
  f566c8e9
- disable button on submit · 07d1f2e9
  Davide Aprea authored Feb 15, 2021
  
  07d1f2e9
12 Feb, 2021 2 commits
- add seperate shortnames for locales · 5796acf0
  Davide Aprea authored Feb 12, 2021
  
  5796acf0
- remove unused translations · 859242e1
  Davide Aprea authored Feb 12, 2021
  
  859242e1