Commits · 1.0 · Ginf Wang / Share OER

Browse files

May 14, 2020
- Merge branch 'doc-enhancement' into 'master' · 4f5d8007
  jlkDE authored May 14, 2020
  View commits for tag 1.0 1.0
  4f5d8007
- Revert "nest test classes into one" · ab4228d7
  jlkDE authored May 14, 2020
  ab4228d7
- Merge branch 'demo-media-11-15' into 'master' · 3f7176d1
  jlkDE authored May 14, 2020
  3f7176d1
- introduce demo media 11 to 15 · 391215fa
  Hannes Masuch authored May 14, 2020 and jlkDE committed May 14, 2020
  
  391215fa
- Merge branch 'demodaten16-20' into 'master' · afd46e58
  jlkDE authored May 14, 2020
  afd46e58
- demodaten 16-20 · a6b606e1
  Alex Decker authored May 14, 2020 and jlkDE committed May 14, 2020
  
  a6b606e1
- Merge branch 'Ressources-Leon' into 'master' · 40b95018
  jlkDE authored May 14, 2020
  40b95018
- Added My ressources and another User · 2e8e8439
  Leon Wallbaum authored May 14, 2020 and jlkDE committed May 14, 2020
  
  2e8e8439
- Merge branch 'IBOER' into 'master' · 4add78c1
  jlkDE authored May 14, 2020
  4add78c1
- add 5 oer resources · 7f5f3e22
  Ibrahim Apachi authored May 14, 2020
  
  7f5f3e22
- Merge branch 'search-execution-test' into 'master' · 5b3723f5
  Leon Wallbaum authored May 14, 2020
  5b3723f5
- Search execution test · 9c07c047
  Hannes Masuch authored May 14, 2020
  
  9c07c047
- Merge branch 'refactor-media' into 'master' · 074580f7
  jlkDE authored May 14, 2020
  074580f7
- Fix media · 2637b657
  Hannes Masuch authored May 14, 2020 and jlkDE committed May 14, 2020
  
  2637b657
- hotfix error page · 21e69292
  jlkDE authored May 14, 2020
  
  21e69292
- Merge branch 'media-logic' into 'master' · 70fef74f
  jlkDE authored May 14, 2020
  70fef74f
- media logic · 885f7b03
  Ibrahim Apachi authored May 14, 2020 and jlkDE committed May 14, 2020
  
  885f7b03
- Merge branch 'fix_rebuild' into 'master' · c6911a4c
  jlkDE authored May 14, 2020
  c6911a4c
- fix database rebuild · 2f89e44b
  jlkDE authored May 14, 2020
  
  2f89e44b
- Merge branch 'get-all-searches' into 'master' · 42d5ec48
  Ibrahim Apachi authored May 14, 2020
  42d5ec48
- Get all searches · dc6760e0
  Alex Decker authored May 14, 2020 and Ibrahim Apachi committed May 14, 2020
  
  dc6760e0
- Merge branch 'logic-nonmedia' into 'master' · f03d493c
  jlkDE authored May 14, 2020
  f03d493c
- Logic nonmedia · 7a26737d
  Hannes Masuch authored May 14, 2020 and jlkDE committed May 14, 2020
  
  7a26737d
- Merge branch 'dont_log_bins' into 'master' · 088d4c82
  jlkDE authored May 14, 2020
  088d4c82
- do not log binary data in tests · d9e14cf6
  jlkDE authored May 14, 2020
  
  d9e14cf6
- Merge branch 'maven_clean_db' into 'master' · 7d3a66bc
  jlkDE authored May 14, 2020
  7d3a66bc
- remove db-files on maven clean · 8494721c
  jlkDE authored May 14, 2020
  
  8494721c
- Merge branch 'enum-controller' into 'master' · 5905c670
  Hannes Masuch authored May 14, 2020
  5905c670
- add get request for every enum · 56649e8b
  Hannes Masuch authored May 14, 2020
  
  56649e8b
- Merge branch 'demodata-routine' into 'master' · 378f4254
  Leon Wallbaum authored May 14, 2020
  378f4254
- Revert "nest test classes into one" · 7c48df51
  jlkDE authored May 14, 2020
  7c48df51
May 13, 2020
- Merge branch 'nonUpdatables' into 'master' · 5709d33c
  jlkDE authored May 13, 2020
  5709d33c
- fix removed updatable = false in message to remove error on build since · 0ca99150
  Leon Wallbaum authored May 13, 2020 and jlkDE committed May 13, 2020
  0ca99150
- Merge branch 'remove_sort_enum' into 'master' · 299e6eb7
  jlkDE authored May 13, 2020
  299e6eb7
- Merge branch 'root-res' into 'master' · 86043a02
  jlkDE authored May 13, 2020
  86043a02
- remove unused sort enum · 89a3aa68
  jlkDE authored May 13, 2020
  
  89a3aa68
- redirect root to docs · 4cbb4702
  jlkDE authored May 13, 2020
  
  4cbb4702
- Merge branch 'filter-and-search' into 'master' · c43ece1d
  jlkDE authored May 13, 2020
  c43ece1d
- Filter and search · e1674c89
  Hannes Masuch authored May 13, 2020 and jlkDE committed May 13, 2020
  
  e1674c89
May 11, 2020
- Merge branch 'correct-NotNull' into 'master' · 9dd6eee0
  jlkDE authored May 11, 2020
  9dd6eee0