Commits · master · open-source / MetaGer

11 Oct, 2021 6 commits
- Merge branch 'development' into 'master' · 777f9cd6
  Dominik Hebeler authored Oct 11, 2021
```
Development

See merge request !1919
```
  777f9cd6
- Merge branch '1154-add-breakpoints-for-image-search' into 'development' · 387d6c1e
  Dominik Hebeler authored Oct 11, 2021
```
Resolve "Add Breakpoints for image search"

Closes #1154

See merge request !1918
```
  387d6c1e
- set breakpoint for hiding logo in sidebar to min-height · 9fe79e0c
  Dominik Hebeler authored Oct 11, 2021
  
  9fe79e0c
- fixed width breakpoint of options · df929fbd
  Dominik Hebeler authored Oct 11, 2021
  
  df929fbd
- fixed cards on mobile screen · 823d9d0a
  Dominik Hebeler authored Oct 11, 2021
  
  823d9d0a
- fixed imagesearch layout · a8ea2cc2
  Dominik Hebeler authored Oct 11, 2021
  
  a8ea2cc2
08 Oct, 2021 4 commits
- line height · 98436c52
  Dominik Hebeler authored Oct 08, 2021
  
  98436c52
- fixed border color of quicktips · e45b53e8
  Dominik Hebeler authored Oct 08, 2021
  
  e45b53e8
- background color white again · 9f18745e
  Dominik Hebeler authored Oct 08, 2021
  
  9f18745e
- fixed quicktip borders · a5b43184
  Dominik Hebeler authored Oct 08, 2021
  
  a5b43184
07 Oct, 2021 10 commits
- Merge branch 'development' into 'master' · 40149046
  Dominik Hebeler authored Oct 07, 2021
```
Development

See merge request !1917
```
  40149046
- Merge branch '1153-flip-some-bits-minor-style-fixes' into 'development' · 39df8348
  Dominik Hebeler authored Oct 07, 2021
```
Resolve "Flip some bits: minor style fixes"

Closes #1153

See merge request !1916
```
  39df8348
- fixed integration tests · a53e95c4
  Dominik Hebeler authored Oct 07, 2021
  
  a53e95c4
- fixed margin on small screens · ffdb4b83
  Dominik Hebeler authored Oct 07, 2021
  
  ffdb4b83
- raised timeouts · 9026e30a
  Dominik Hebeler authored Oct 07, 2021
  
  9026e30a
- fixed some stylings and image search · ff07ac4f
  Dominik Hebeler authored Oct 07, 2021
  
  ff07ac4f
- fixed scroll links on smaller displays · 100d638c
  Dominik Hebeler authored Oct 07, 2021
  
  100d638c
- fixed result page searchbar background color · 194fc214
  Dominik Hebeler authored Oct 07, 2021
  
  194fc214
- fixed resultpage searchbar color · f6342f34
  Dominik Hebeler authored Oct 07, 2021
  
  f6342f34
- fixed resultpage searchbar color · 94f7defb
  Dominik Hebeler authored Oct 07, 2021
  
  94f7defb
06 Oct, 2021 4 commits
- Merge branch 'development' into 'master' · 059d061d
  Dominik Hebeler authored Oct 06, 2021
```
Development

See merge request !1915
```
  059d061d
- Merge branch '1152-create-blacklist-and-whitelist-for-affiliate-links' into 'development' · 34d9981e
  Dominik Hebeler authored Oct 06, 2021
```
Resolve "Create Blacklist and Whitelist for affiliate links"

Closes #1152

See merge request !1914
```
  34d9981e
- Loading and using the blacklist · d016590b
  Dominik Hebeler authored Oct 06, 2021
  
  d016590b
- added basic interface to control blacklist/whitelist · bca4c88b
  Dominik Hebeler authored Oct 06, 2021
  
  bca4c88b
05 Oct, 2021 4 commits
- added basic layout for overview page · 95764837
  Dominik Hebeler authored Oct 05, 2021
  
  95764837
- Merge branch 'development' into 'master' · 5e40a590
  Dominik Hebeler authored Oct 05, 2021
```
Development

See merge request !1913
```
  5e40a590
- Merge branch '1151-track-adgoal-ads' into 'development' · 708b5803
  Dominik Hebeler authored Oct 05, 2021
```
Resolve "Track Adgoal Ads"

Closes #1151

See merge request !1912
```
  708b5803
- Gathering affiliate clicks · 4e0c602d
  Dominik Hebeler authored Oct 05, 2021
  
  4e0c602d
03 Oct, 2021 2 commits
- Merge branch 'development' into 'master' · c368f56c
  Dominik Hebeler authored Oct 03, 2021
```
switched to custom certificate

See merge request !1911
```
  c368f56c
- switched to custom certificate · bee09293
  Dominik Hebeler authored Oct 03, 2021
  
  bee09293
01 Oct, 2021 10 commits
- Merge branch 'development' into 'master' · 782950b5
  Dominik Hebeler authored Oct 01, 2021
```
Development

See merge request !1910
```
  782950b5
- Merge branch '1150-fix-spam-page-js' into 'development' · 2906db0d
  Dominik Hebeler authored Oct 01, 2021
```
Resolve "Fix spam page js"

Closes #1150

See merge request !1909
```
  2906db0d
- removed last jquery calls · 99fb68b2
  Dominik Hebeler authored Oct 01, 2021
  
  99fb68b2
- fix coloring of input field · 57a56b69
  Dominik Hebeler authored Oct 01, 2021
  
  57a56b69
- Merge branch '1149-fix-rss-feed-header' into 'development' · 1c6f50fc
  Dominik Hebeler authored Oct 01, 2021
```
Resolve "Fix rss feed header"

Closes #1149

See merge request !1908
```
  1c6f50fc
- fixed picking index instead of element · cc572520
  Dominik Hebeler authored Oct 01, 2021
  
  cc572520
- fixed typo · ac897450
  Dominik Hebeler authored Oct 01, 2021
  
  ac897450
- fixed regexp method · f6f9aeab
  Dominik Hebeler authored Oct 01, 2021
  
  f6f9aeab
- fix js errors due to jquery missing · 50279b60
  Dominik Hebeler authored Oct 01, 2021
  
  50279b60
- fixed xml header indentation · deb59199
  Dominik Hebeler authored Oct 01, 2021
  
  deb59199