Commits · 7ed42835849f9dad17cd4ce7e8c375a77572f6d5 · CHARISM / Shelter Database · GitLab

06 Sep, 2016 13 commits
- Fixed conflict. · 7ed42835
  Cédric Bonhomme authored Sep 06, 2016
  
  7ed42835
- change picture paths · d7f7352e
  Maarten van der Veen authored Sep 06, 2016
  
  d7f7352e
- API v0.1 '/shelters' resource minor fixes, now looks for pictures path in config file · d17f3d60
  Aron Gergely authored Sep 06, 2016
  
  d17f3d60
- Fixed conflict. · e3c373a0
  Cédric Bonhomme authored Sep 06, 2016
  
  e3c373a0
- Fixed conflict. · b7509953
  Cédric Bonhomme authored Sep 06, 2016
  
  b7509953
- API '/shelters' resource now looks for pictures path in conf.py · b6b3759e
  Aron Gergely authored Sep 06, 2016
  
  b6b3759e
- Fixed conflicts. · 19a93946
  Cédric Bonhomme authored Sep 06, 2016
  
  19a93946
- Fixed conflicts. · 15df3aa0
  Cédric Bonhomme authored Sep 06, 2016
  
  15df3aa0
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · 56b170c6
  Maarten van der Veen authored Sep 06, 2016
  
  56b170c6
- line endings · db718593
  Maarten van der Veen authored Sep 06, 2016
  
  db718593
- Switch back to line feed (LF). · c684d7cb
  Cédric Bonhomme authored Sep 06, 2016
  
  c684d7cb
- Merge branch 'master' of git.list.lu:charism/shelter-database · 4d7123f2
  Cédric Bonhomme authored Sep 06, 2016
  
  4d7123f2
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · 9d71ae1d
  Cédric Bonhomme authored Sep 06, 2016
  
  9d71ae1d
05 Sep, 2016 17 commits
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · d26559bf
  Aron Gergely authored Sep 05, 2016
  
  d26559bf
- Tidy up parsing and JSONifying data for API '/shelters' response · 51e71f0c
  Aron Gergely authored Sep 05, 2016
  
  51e71f0c
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · b1e9857d
  Cédric Bonhomme authored Sep 05, 2016
  
  b1e9857d
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · 605c59de
  Maarten van der Veen authored Sep 05, 2016
  
  605c59de
- change layout · d0b3b161
  Maarten van der Veen authored Sep 05, 2016
  
  d0b3b161
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · f198d3c8
  Cédric Bonhomme authored Sep 05, 2016
  
  f198d3c8
- API '/shelters' resource always returns category names · d9497249
  Aron Gergely authored Sep 05, 2016
  
  d9497249
- Merge branch 'master' of git.list.lu:charism/shelter-database · 3920fbad
  Cédric Bonhomme authored Sep 05, 2016
  
  3920fbad
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · c53871c3
  Cédric Bonhomme authored Sep 05, 2016
  
  c53871c3
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · 2f02e7a1
  Aron Gergely authored Sep 05, 2016
  
  2f02e7a1
- Add Spanish translation with minor fixes · 67237cce
  Aron Gergely authored Sep 05, 2016
  
  67237cce
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · c3fd6964
  Cédric Bonhomme authored Sep 05, 2016
  
  c3fd6964
- add pictures to detail page · 1cba741d
  Maarten van der Veen authored Sep 05, 2016
  
  1cba741d
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · fd0646d8
  Cédric Bonhomme authored Sep 05, 2016
  
  fd0646d8
- Fixed public shelter picture path · b861f686
  Aron Gergely authored Sep 05, 2016
  
  b861f686
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · fbbf1c6b
  Cédric Bonhomme authored Sep 05, 2016
  
  fbbf1c6b
- Changed picture file path for shelter pictures · a1dfa9ed
  Aron Gergely authored Sep 05, 2016
  
  a1dfa9ed
04 Sep, 2016 7 commits
- wqMerge branch 'master' of https://github.com/rodekruis/shelter-database · b1d5bd4f
  Cédric Bonhomme authored Sep 04, 2016
  
  b1d5bd4f
- add swipe libs · 82421138
  Maarten van der Veen authored Sep 04, 2016
  
  82421138
- update shelter details page · c701702e
  Maarten van der Veen authored Sep 04, 2016
  
  c701702e
- change init_db to unix formatting · 128d0df0
  Maarten van der Veen authored Sep 04, 2016
  
  128d0df0
- Fixed conflicts. · ddef3a69
  Cédric Bonhomme authored Sep 04, 2016
  
  ddef3a69
- local changes · 011351c7
  Maarten van der Veen authored Sep 04, 2016
  
  011351c7
- local changes · c5aeb319
  Maarten van der Veen authored Sep 04, 2016
  
  c5aeb319
02 Sep, 2016 2 commits
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · 6b68f38f
  Cédric Bonhomme authored Sep 02, 2016
  
  6b68f38f
- Add html documentation for API · e00e7bd5
  Aron Gergely authored Sep 02, 2016
  
  e00e7bd5
25 Aug, 2016 1 commit
- Merge branch 'master' of https://github.com/rodekruis/shelter-database · 91723bbe
  Cédric Bonhomme authored Aug 25, 2016
  
  91723bbe

Luxembourg Institute of Science and Technology - www.list.lu.