Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into v/5.0-staging
Browse files Browse the repository at this point in the history
  • Loading branch information
@nimaai
nimaai committed Jan 24, 2019
2 parents e163c3f + 50a896d commit 8f7905f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion admin
Submodule admin updated 24 files
+1 −1 leihs-clj-shared
+2 −1 src/all/leihs/admin/front/html.cljs
+0 −4 src/all/leihs/admin/front/shared.cljs
+2 −1 src/all/leihs/admin/resources/authentication_system/front.cljs
+2 −1 src/all/leihs/admin/resources/authentication_system/groups/front.cljs
+2 −1 src/all/leihs/admin/resources/authentication_system/users/front.cljs
+2 −1 src/all/leihs/admin/resources/authentication_systems/front.cljs
+2 −1 src/all/leihs/admin/resources/delegation/front.cljs
+2 −1 src/all/leihs/admin/resources/delegation/users/front.cljs
+1 −1 src/all/leihs/admin/resources/delegations/front.cljs
+2 −1 src/all/leihs/admin/resources/group/front.cljs
+1 −1 src/all/leihs/admin/resources/group/users/front.cljs
+1 −1 src/all/leihs/admin/resources/groups/front.cljs
+1 −1 src/all/leihs/admin/resources/status/front.cljs
+1 −1 src/all/leihs/admin/resources/system_admins/direct_users/front.cljs
+1 −1 src/all/leihs/admin/resources/system_admins/front.cljs
+1 −1 src/all/leihs/admin/resources/system_admins/groups/front.cljs
+1 −1 src/all/leihs/admin/resources/user/front/create.cljs
+1 −1 src/all/leihs/admin/resources/user/front/edit.cljs
+1 −1 src/all/leihs/admin/resources/user/front/inventory_pools_roles.cljs
+1 −1 src/all/leihs/admin/resources/user/front/remove.cljs
+5 −8 src/all/leihs/admin/resources/user/front/shared.cljs
+1 −1 src/all/leihs/admin/resources/user/front/show.cljs
+1 −1 src/all/leihs/admin/resources/users/front.cljs
2 changes: 1 addition & 1 deletion legacy
Submodule legacy updated 4 files
+28 −13 app/assets/javascripts/components/expert/components/autocomplete/basic-autocomplete-internals.jsx
+5 −1 app/assets/javascripts/i18n/locale/de-CH.js
+4 −1 locale/de_CH/leihs.po
+1 −1 public/assets
2 changes: 1 addition & 1 deletion my
Submodule my updated 5 files
+1 −1 cider-ci/uberjar_task-component.yml
+1 −1 leihs-clj-shared
+24 −0 spec/features/user-show_spec.rb
+18 −3 src/all/leihs/my/back/html.clj
+8 −4 src/all/leihs/my/user/front.cljs
2 changes: 1 addition & 1 deletion procure
Submodule procure updated 1 files
+1 −1 server/leihs-clj-shared

0 comments on commit 8f7905f

Please sign in to comment.