Commits · master · TJTS5901 project / beeMapBuzzplum

Feb 17, 2021
- Merge branch 'development' into 'master' · 3a708413
  joanolfo authored 4 years ago
  
  Merge week 5 development items to master branch See merge request !45
  3a708413
- Update reporting_week5.md · 76a596ed
  joanolfo authored 4 years ago
  
  76a596ed
- Update time_estimation_week5.md · e4f12c39
  joanolfo authored 4 years ago
  
  e4f12c39
- bugfix for empty table · 8a49c8b6
  Joose Tikkanen authored 4 years ago
  
  8a49c8b6
- Update time_estimation_week5.md · c6128fa7
  lamiilhi authored 4 years ago
  
  c6128fa7
- Update reporting_week5.md · e2aea32f
  lamiilhi authored 4 years ago
  
  e2aea32f
- Merge branch 'renaming' into 'development' · 0e5ae397
  jopitikk authored 4 years ago
  
  rename beehive to bee-village See merge request !59
  0e5ae397
- rename beehive to bee-village · a1683842
  Joose Tikkanen authored 4 years ago
  
  a1683842
- another email bugfix · 89be7d36
  Joose Tikkanen authored 4 years ago
  
  89be7d36
- Update time_estimation_week5.md · be21b7f1
  paronisk authored 4 years ago
  
  be21b7f1
- Update reporting_week5.md · 8863aafe
  paronisk authored 4 years ago
  
  8863aafe
- Merge branch 'development' of... · 025bb7cc
  Joose Tikkanen authored 4 years ago
  
  Merge branch 'development' of https://gitlab.jyu.fi/tjts5901-project/beemapBuzzplum into development
  025bb7cc
- email bugfix · 26455f67
  Joose Tikkanen authored 4 years ago
  
  26455f67
- Update reporting_week5.md · 2ec6e3b6
  jopitikk authored 4 years ago
  
  2ec6e3b6
- Update time_estimation_week5.md · dce61e32
  jopitikk authored 4 years ago
  
  dce61e32
- Update time_estimation_week5.md · 385c1f3f
  Hannamari Heiniluoma authored 4 years ago
  
  385c1f3f
- Update reporting_week5.md · 1c9ee4c5
  Hannamari Heiniluoma authored 4 years ago
  
  1c9ee4c5
- fixed bug with beehive edit, added role check to status change · 901e5f7a
  joonasfo authored 4 years ago
  
  901e5f7a
- Update reporting_week5.md · f0807c2f
  jopitikk authored 4 years ago
  
  f0807c2f
- Update README.md · dd7e6b45
  joanolfo authored 4 years ago
  
  dd7e6b45
- Update reporting_week5.md · fef63eb7
  jopitikk authored 4 years ago
  
  fef63eb7
Feb 16, 2021
- Update reporting_week5.md · f5331cbe
  jopitikk authored 4 years ago
  
  f5331cbe
- changed edit role -> edit to keep the style consistent between user/hivelocation management · 33dbdfb6
  joonasfo authored 4 years ago
  
  33dbdfb6
- Merge branch 'admin-ui-updates' into 'development' · 0bff9c41
  joanolfo authored 4 years ago
  
  decreased font in admin panel, moved export button to bottom of the page See merge request !58
  0bff9c41
- Merge branch 'downgrade-leaflet' into 'development' · cc23f21c
  joanolfo authored 4 years ago
  
  downgraded leaflet version to 1.7.0 See merge request !57
  cc23f21c
- downgraded leaflet version to 1.7.0 · 4c675f81
  joonasfo authored 4 years ago
  
  4c675f81
- Update time_estimation_week5.md · fd17dd03
  jopitikk authored 4 years ago
  
  fd17dd03
- Merge branch 'master' of gitlab.jyu.fi:tjts5901-project/beemapBuzzplum into development · b5dd11fb
  joonasfo authored 4 years ago
  
  b5dd11fb
- decreased font in admin panel, moved export button to bottom of the page · cd86a2a3
  joonasfo authored 4 years ago
  
  cd86a2a3
- Update reporting_week5.md · 5b482344
  jopitikk authored 4 years ago
  
  5b482344
- try smaller share image · 8be11cb3
  Joose Tikkanen authored 4 years ago
  
  8be11cb3
- fix linkedin links · 53eebd04
  Joose Tikkanen authored 4 years ago
  
  53eebd04
- Update time_estimation_week5.md · 56a16449
  joanolfo authored 4 years ago
  
  56a16449
- Update reporting_week5.md · 2918dc78
  joanolfo authored 4 years ago
  
  2918dc78
- Merge branch 'table-update' into 'development' · efef1e49
  jopitikk authored 4 years ago
  
  Social media buttons See merge request !56
  efef1e49
- Merge branch 'development' into 'table-update' · 83fbd297
  jopitikk authored 4 years ago
  
  # Conflicts: # templates/mymap.html
  83fbd297
- Merge branch 'somechanges' into 'development' · bc301196
  jopitikk authored 4 years ago
  
  Linkedin share change See merge request !55
  bc301196
- New social media buttons added · 0c7f16fd
  Panu Niskakoski authored 4 years ago
  
  0c7f16fd
- Merge branch 'admin-ui' into 'development' · c7ffb8b9
  jopitikk authored 4 years ago
  
  Translations See merge request !54
  c7ffb8b9
- fix wording · 7aff2049
  Joose Tikkanen authored 4 years ago
  
  7aff2049