Skip to content

Commit

Permalink
Upgrade projects, update ports etc
Browse files Browse the repository at this point in the history
  • Loading branch information
DrTom committed Oct 16, 2018
1 parent 77b9b6c commit 6f6835c
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,3 +2,4 @@
!/config/releases.yml
/tmp
/integration
/zhdk-sync
6 changes: 6 additions & 0 deletions .gitmodules
Expand Up @@ -22,3 +22,9 @@
[submodule "procure"]
path = procure
url = https://github.com/leihs/leihs-procure
[submodule "my"]
path = my
url = https://github.com/leihs/leihs-my
[submodule "integration-tests"]
path = integration-tests
url = https://github.com/leihs/leihs-integration-tests.git
2 changes: 1 addition & 1 deletion admin
Submodule admin updated 143 files
1 change: 1 addition & 0 deletions integration-tests
Submodule integration-tests added at 3caff0
2 changes: 1 addition & 1 deletion legacy
Submodule legacy updated 108 files
1 change: 1 addition & 0 deletions my
Submodule my added at 8ac070
2 changes: 1 addition & 1 deletion procure
Submodule procure updated 38 files
+3 −0 .gitignore
+3 −0 .gitmodules
+1 −1 client/cider-ci.yml
+2 −2 client/package.json
+2 −1 client/src/apollo-client.js
+0 −0 client/src/components/Bootstrap/Bootstrap.testx.js
+0 −0 client/src/components/Bootstrap/MultiSelect.testx.js
+5 −0 client/src/components/MainNav.js
+1 −0 client/src/components/decorators.js
+0 −6 server/.gitmodules
+3 −3 server/README.md
+5 −4 server/cider-ci.yml
+5 −3 server/cider-ci/server_task-component.yml
+1 −1 server/database
+1 −0 server/leihs-clj-shared
+13 −9 server/project.clj
+1 −1 server/resources/all/schema.edn
+2 −2 server/scripts/run-rspec
+1 −1 server/scripts/start-dev-server
+1 −1 server/scripts/start-prod-server
+1 −1 server/scripts/start-test-server
+17 −1 server/spec/authorization_spec.rb
+3 −3 server/spec/config/constants.rb
+2 −2 server/spec/graphql/graphql_helper.rb
+0 −67 server/src/all/leihs/procurement/anti_csrf/core.clj
+9 −0 server/src/all/leihs/procurement/authorization.clj
+2 −1 server/src/all/leihs/procurement/backend/main.clj
+31 −24 server/src/all/leihs/procurement/backend/run.clj
+21 −5 server/src/all/leihs/procurement/handler.clj
+0 −10 server/src/all/leihs/procurement/paths.clj
+1 −1 server/src/all/leihs/procurement/resources/attachment.clj
+1 −1 server/src/all/leihs/procurement/resources/attachments.clj
+1 −1 server/src/all/leihs/procurement/resources/image.clj
+1 −1 server/src/all/leihs/procurement/resources/main_categories.clj
+1 −1 server/src/all/leihs/procurement/resources/upload.clj
+1 −1 server/src/all/leihs/procurement/status.clj
+4 −3 server/src/dev+test/leihs/procurement/auth/session.clj
+2 −100 server/src/prod/leihs/procurement/auth/session.clj
2 changes: 1 addition & 1 deletion zhdk-inventory

0 comments on commit 6f6835c

Please sign in to comment.