Commits · c2d387d4f08ef3068bdd74afd93828487995509f · Rosanny Sihombing / ckan theme

10 May, 2021 5 commits
- Merge branch 'dev' into 'testing' · c2d387d4
  Rosanny Sihombing authored May 10, 2021
```
Dev - path update

See merge request !9
```
  c2d387d4
- Update base.html · cc8a8c53
  Rosanny Sihombing authored May 10, 2021
  
  cc8a8c53
- Merge branch 'testing' into 'dev' · 95da07ea
  Rosanny Sihombing authored May 10, 2021
```
Testing

See merge request !8
```
  95da07ea
- Merge branch 'dev' into 'testing' · 9f8cc187
  Rosanny Sihombing authored May 10, 2021
```
# Conflicts:
#   ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml
#   ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
```
  9f8cc187
- update path · 9d73abf3
  Rosanny Sihombing authored May 10, 2021
  
  9d73abf3
04 May, 2021 7 commits
- Update webassets.yml · a6b26f80
  Wolfgang Knopki authored May 04, 2021
  
  a6b26f80
- Update webassets.yml · 9ce5303c
  Wolfgang Knopki authored May 04, 2021
  
  9ce5303c
- Update base.html · fc889f31
  Wolfgang Knopki authored May 04, 2021
  
  fc889f31
- Update base.html · 42bed698
  Wolfgang Knopki authored May 04, 2021
  
  42bed698
- Merge branch 'asset-fixing' into 'testing' · 10990be9
  Wolfgang Knopki authored May 04, 2021
```
Asset fixing

See merge request !7
```
  10990be9
- Update base.html · 5f1dfde5
  Wolfgang Knopki authored May 04, 2021
  
  5f1dfde5
- Update webassets.yml · 3ac6790f
  Wolfgang Knopki authored May 04, 2021
  
  3ac6790f
03 May, 2021 10 commits
- Update webassets.yml · 33192c08
  Rosanny Sihombing authored May 03, 2021
  
  33192c08
- Merge branch 'dev' into 'testing' · b00fefb2
  Rosanny Sihombing authored May 03, 2021
```
delete img

See merge request !6
```
  b00fefb2
- delete img · a58383c5
  Rosanny Sihombing authored May 03, 2021
  
  a58383c5
- Merge branch 'dev' into 'testing' · c8486f18
  Rosanny Sihombing authored May 03, 2021
```
# Conflicts:
#   .gitlab-ci.yml
#   ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml
#   ckanext-theme_hft/ckanext/theme_hft/templates/base.html
#   ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
```
  c8486f18
- update path · d24e8e7c
  Rosanny Sihombing authored May 03, 2021
  
  d24e8e7c
- add path for server · 45d549f6
  Rosanny Sihombing authored May 03, 2021
  
  45d549f6
- Merge branch 'revert' into 'testing' · ee21bb51
  Wolfgang Knopki authored May 03, 2021
```
Revert

See merge request !4
```
  ee21bb51
- Revert · dea0df5c
  Wolfgang Knopki authored May 03, 2021
  
  dea0df5c
- Update .gitlab-ci.yml · f1582fd4
  Wolfgang Knopki authored May 03, 2021
  
  f1582fd4
- update path · ccf53673
  Rosanny Sihombing authored May 03, 2021
  
  ccf53673
30 Apr, 2021 18 commits
- Merge branch 'dev' into 'testing' · 01ab53a5
  Wolfgang Knopki authored Apr 30, 2021
```
Dev

See merge request !1
```
  01ab53a5
- Dev · efeb1e79
  Wolfgang Knopki authored Apr 30, 2021
  
  efeb1e79
- Update .gitlab-ci.yml · 240bb7d0
  Wolfgang Knopki authored Apr 30, 2021
  
  240bb7d0
- Update .gitlab-ci.yml · 97f6cbe6
  Wolfgang Knopki authored Apr 30, 2021
  
  97f6cbe6
- Update .gitlab-ci.yml · e770be48
  Wolfgang Knopki authored Apr 30, 2021
  
  e770be48
- Update .gitlab-ci.yml · 89731d58
  Wolfgang Knopki authored Apr 30, 2021
  
  89731d58
- Update .gitlab-ci.yml · de788e19
  Wolfgang Knopki authored Apr 30, 2021
  
  de788e19
- Update .gitlab-ci.yml · 2a89c06a
  Wolfgang Knopki authored Apr 30, 2021
  
  2a89c06a
- Update .gitlab-ci.yml · 30748ea4
  Wolfgang Knopki authored Apr 30, 2021
  
  30748ea4
- Update .gitlab-ci.yml · 500db860
  Wolfgang Knopki authored Apr 30, 2021
  
  500db860
- Update .gitlab-ci.yml · b48c816c
  Wolfgang Knopki authored Apr 30, 2021
  
  b48c816c
- Update .gitlab-ci.yml · a2d0a5f7
  Wolfgang Knopki authored Apr 30, 2021
  
  a2d0a5f7
- Update .gitlab-ci.yml · 950ef419
  Wolfgang Knopki authored Apr 30, 2021
  
  950ef419
- Update .gitlab-ci.yml · 8460ffe4
  Wolfgang Knopki authored Apr 30, 2021
  
  8460ffe4
- Update .gitlab-ci.yml · e0264a3e
  Wolfgang Knopki authored Apr 30, 2021
  
  e0264a3e
- Update .gitlab-ci.yml · 97bfb553
  Wolfgang Knopki authored Apr 30, 2021
  
  97bfb553
- Update .gitlab-ci.yml · c0a5e5ad
  Wolfgang Knopki authored Apr 30, 2021
  
  c0a5e5ad
- Update .gitlab-ci.yml · 70700a26
  Wolfgang Knopki authored Apr 30, 2021
  
  70700a26