IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
144 Commits 5 Branches 2 Tags
Commit Graph

144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
ec4a50a03e Merge remote-tracking branch 'origin/master' into remove_e2e 2018-12-12 14:23:36 +01:00
dependabot[bot]
e93043eeba
Merge pull request #80 from Human-Connection/dependabot/submodules/Nitro-Web-6f782ef 2018-12-12 04:27:38 +00:00
dependabot[bot]
4b3bab7979
Bump Nitro-Web from 22354ce to 6f782ef 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `22354ce` to `6f782ef`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](22354ce865...6f782efbfb)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-12 04:27:01 +00:00
Robert Schäfer
e158747c3f Delete remainings of cypress tests 2018-12-12 01:00:16 +01:00
Grzegorz Leoniec
87cba32d87
Merge pull request #76 from Human-Connection/roschaefer-patch-1 
Add build status to README.md
 2018-12-11 15:24:56 +01:00
dependabot[bot]
1723e005e4
Merge pull request #78 from Human-Connection/dependabot/submodules/Nitro-Web-22354ce 2018-12-11 04:23:18 +00:00
dependabot[bot]
37bdb822fb
Merge pull request #77 from Human-Connection/dependabot/submodules/Nitro-Backend-bed0f81 2018-12-11 04:22:57 +00:00
dependabot[bot]
99ab380706
Bump Nitro-Web from 64abd76 to 22354ce 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `64abd76` to `22354ce`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](64abd767e2...22354ce865)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:22:36 +00:00
dependabot[bot]
211fdb9708
Bump Nitro-Backend from 99a9d51 to bed0f81 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `99a9d51` to `bed0f81`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](99a9d51596...bed0f819ff)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:22:36 +00:00
Robert Schäfer
6b8433e54b
Add build status to README.md 2018-12-10 15:15:54 +01:00
Grzegorz Leoniec
3490435bfd
Merge pull request #73 from Human-Connection/e2e 
Full stack tests with submodules and cypress
 2018-12-10 15:10:34 +01:00
Grzegorz Leoniec
9d68a8a304
updating api 2018-12-10 13:51:24 +01:00
Grzegorz Leoniec
2d330e5b85
removed fixed branch in triffer_build.sh 2018-12-10 13:24:55 +01:00
Grzegorz Leoniec
1700bff648
merge 2018-12-10 13:16:03 +01:00
dependabot[bot]
9879dd54fc
Merge pull request #75 from Human-Connection/dependabot/submodules/API-97d640d 2018-12-10 04:21:53 +00:00
dependabot[bot]
4c9d906f47
Bump API from 8ea42b5 to 97d640d 
Bumps [API](https://github.com/Human-Connection/API) from `8ea42b5` to `97d640d`.
- [Release notes](https://github.com/Human-Connection/API/releases)
- [Commits](8ea42b5b40...97d640d583)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-10 04:21:25 +00:00
Robert Schäfer
6e9348a6d3 Set executable permission on trigger_build.sh 2018-12-10 00:30:31 +01:00
Robert Schäfer
4489bbe662 Use export for Travis variable for convenience 
This way, we don't need to set the environment variable in the
`trigger_build.sh` script.
 2018-12-10 00:28:56 +01:00
Robert Schäfer
0a8aadbb2d Check out a common branch through environment var 
This will be useful if we trigger the build through the Travis CI API
where we can alter the environment variables in the request.
 2018-12-10 00:17:34 +01:00
Grzegorz Leoniec
f43458ba3d record test runs to https://dashboard.cypress.io/#/projects/qa7fe2/runs 2018-12-09 23:04:16 +01:00
Robert Schäfer
579cc3492c Coyp over files from webapp repository 2018-12-09 23:04:16 +01:00
Robert Schäfer
33290c32e0 Add Nitro-Web and Nitro-Backend as submodules 2018-12-09 23:04:16 +01:00
Grzegorz Leoniec
3802780ffd
record test runs to https://dashboard.cypress.io/#/projects/qa7fe2/runs 2018-12-09 18:02:00 +01:00
Robert Schäfer
d461238d2e This should be the first green build 2018-12-08 23:19:13 +01:00
Robert Schäfer
01497dddaa Reduce verbosity of database seeding 2018-12-08 22:47:43 +01:00
Robert Schäfer
e102b6e3fe Update submodules 2018-12-08 22:12:04 +01:00
Robert Schäfer
ef816b2d10 Wrong network name in Nitro-Backend 2018-12-08 13:37:42 +01:00
Robert Schäfer
bc5d75261b Wire frontend and backend together 2018-12-08 13:26:28 +01:00
Robert Schäfer
0abdb80b00 Update Nitro-Web so cypress can find email input 2018-12-08 12:54:04 +01:00
Robert Schäfer
4b8ac0836c Revert "Maybe localhost is not available on Travis CI?" 
This reverts commit cb215b850a2d0e6d9a713a16855f765e8273c9e5.
 2018-12-08 12:08:27 +01:00
Robert Schäfer
287aa96a3f Don't update submodules 2018-12-08 11:55:34 +01:00
Robert Schäfer
6ce9406188 And run seed data on Travis CI 2018-12-08 11:48:34 +01:00
Robert Schäfer
d2cde2154f Update submodules 
Backend is now on a commit that has npm-run-all which allows to run seed
data in docker-compose.
 2018-12-08 11:46:51 +01:00
Robert Schäfer
266072bcc9 Wait for http connection instead of tcp 2018-12-08 02:32:46 +01:00
Robert Schäfer
d801e679e6 Current dir relative to first docker-compose.yml 2018-12-08 02:19:22 +01:00
Robert Schäfer
61e1a474a8 Merge all docker-compose files 2018-12-08 01:56:54 +01:00
Robert Schäfer
8ce9dedc06 Remove one & to increase build time? 2018-12-08 01:54:23 +01:00
Robert Schäfer
cb215b850a Maybe localhost is not available on Travis CI? 2018-12-08 01:51:25 +01:00
Robert Schäfer
9b4279c162 Wait on port 3000 2018-12-08 01:39:55 +01:00
Robert Schäfer
e1137bd03f Again one level up 2018-12-08 00:47:58 +01:00
Robert Schäfer
ce07ece4d6 Go back the directory tree 2018-12-08 00:29:39 +01:00
Robert Schäfer
255f563206 Ok, don't run neo4j to keep port 7687 up 2018-12-08 00:22:39 +01:00
Robert Schäfer
fa617955d3 Up the containers and send to background 2018-12-08 00:19:42 +01:00
Robert Schäfer
e783acf97c Fix .yaml format 2018-12-06 16:00:51 +01:00
Robert Schäfer
54b92c465f Update docker-compose on Travis CI 2018-12-06 15:58:03 +01:00
Robert Schäfer
203ab4b0c5 Starting docker-containers in both repos 2018-12-06 15:53:42 +01:00
Robert Schäfer
3b807c5d05 Add missing cypress.json 2018-12-06 15:50:33 +01:00
Robert Schäfer
2d346448b3 Use https for submodules to avoid SSH key exchange 2018-12-06 15:44:35 +01:00
Robert Schäfer
0243bfbec2 Start with a .travis.yml and cypress run 
Build failures are expected
 2018-12-06 15:26:07 +01:00
Robert Schäfer
b0bd5b8174 Coyp over files from webapp repository 2018-12-06 15:24:49 +01:00