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
3,916 Commits 5 Branches 2 Tags
Commit Graph

3916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
0b01ab3d01 Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-10 00:53:31 +01: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
faca6069ab
meged mochajs in 2018-12-09 18:40:25 +01:00
Grzegorz Leoniec
1823223281
merged master in 2018-12-09 18:38:58 +01:00
Grzegorz Leoniec
3802780ffd
record test runs to https://dashboard.cypress.io/#/projects/qa7fe2/runs 2018-12-09 18:02:00 +01:00
Grzegorz Leoniec
eda9dfafb8
Merge pull request #76 from Human-Connection/docker_compose_override 
Split development config from production config
 2018-12-08 23:42:26 +01:00
Grzegorz Leoniec
2284e88f90
Merge pull request #80 from Human-Connection/fix_refresh_bug 
Fix refresh bug
 2018-12-08 23:38:36 +01:00
Robert Schäfer
d461238d2e This should be the first green build 2018-12-08 23:19:13 +01:00
Robert Schäfer
64abd767e2 Merge branch 'fix_refresh_bug' into temporary_merge_branch 2018-12-08 23:18:48 +01:00
Robert Schäfer
25f3da15c6 Merge branch 'docker_compose_override' into temporary_merge_branch 2018-12-08 23:18:41 +01:00
Robert Schäfer
2fcbdcb436 Fix refresh bug 
This misconfiguration doesn't produce a bug without the docker
environment. Better to use docker also for development. Let's make it the
single source of truth.
 2018-12-08 23:15:22 +01:00
Robert Schäfer
da498b28f0 Volume for styleguide dependencies 
Otherwise you would have to install dependencies on your host system
which is bad practice.
 2018-12-08 23:14:12 +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
d4d0eb88cf Fix wrong folder names 
@appinteractive same same, git-grep is your friend
 2018-12-08 15:45:16 +01:00
Robert Schäfer
db724e7834 Split development config from production config 
in `docker-compose.yml` and `docker-compose.override.yml`. This should speed
up builds e.g. on Travis CI, which does not need to sync folders or run
`yarn run dev` if the docker image was built recently. Also it should
make the build more reliable as it behaves more similar to our deployment.
 2018-12-08 15:45:02 +01:00
Robert Schäfer
7f389e4939 Fix wrong folder name 2018-12-08 15:44:20 +01:00
Robert Schäfer
8e7a9644c0 Split development config from production config 
in `docker-compose.yml` and `docker-compose.override.yml`. This should speed
up builds e.g. on Travis CI, which does not need to sync folders or run
`yarn run dev` if the docker image was built recently. Also it should
make the build more reliable as it behaves more similar to our deployment.
 2018-12-08 15:43:50 +01:00
Grzegorz Leoniec
d1d1b1dfc9
Merge branch 'master' into locations 2018-12-08 14:45:16 +01:00
Grzegorz Leoniec
902f2d4c17
Merge branch 'master' into admin-tags-and-categories 2018-12-08 14:45:00 +01:00
Grzegorz Leoniec
826d987fcd
Merge pull request #78 from Human-Connection/remove_xip_hack 
No need to call xip.io anymore
 2018-12-08 14:44:34 +01:00
Grzegorz Leoniec
aa77d6bd8e
Merge branch 'master' into remove_xip_hack 2018-12-08 14:44:22 +01:00
Grzegorz Leoniec
99a9d51596
Merge pull request #61 from Human-Connection/remove_xipio_hack 
Remove xip.io hack
 2018-12-08 14:44:08 +01:00
Grzegorz Leoniec
8c1b1fcd25
Merge branch 'master' into admin-tags-and-categories 2018-12-08 14:43:04 +01:00
Grzegorz Leoniec
8f0407c706
merged master in 2018-12-08 14:41:57 +01:00
Grzegorz Leoniec
deb1fb5953
Merge pull request #77 from Human-Connection/fix_accessibility_for_cypress 
Bind name to name instead of model
 2018-12-08 14:36:54 +01:00
Grzegorz Leoniec
4283c4d729
fixed dublicated classes 2018-12-08 14:30:30 +01:00
Grzegorz Leoniec
5a5f89e544
Merge branch 'ci-improvements' of github.com:appinteractive/hc-prototype-api into ci-improvements 2018-12-08 14:27:49 +01:00
Grzegorz Leoniec
141e1cc7fd
fix nyc testing on build 2018-12-08 14:27:46 +01:00
Grzegorz Leoniec
9bc9246bdc
Merge branch 'master' into remove_xipio_hack 2018-12-08 14:25:07 +01:00
Grzegorz Leoniec
3349c73862
Merge branch 'master' into ci-improvements 2018-12-08 14:22:24 +01:00
Grzegorz Leoniec
7e0aba23ec
Merge pull request #60 from Human-Connection/npm-run-all 
Replace concurrently with npm-run-all
 2018-12-08 14:22:05 +01:00
Grzegorz Leoniec
c4f7787796
merged npm-run-all in 2018-12-08 14:20:06 +01:00
Grzegorz Leoniec
f0c321700e
merged master in 2018-12-08 14:16:11 +01:00
Grzegorz Leoniec
f3bf82fdab
remove location related stuff 2018-12-08 14:02:35 +01:00
Grzegorz Leoniec
fb7307caf1
improve tags and categories 2018-12-08 14:01:00 +01:00
Grzegorz Leoniec
f9f58313ed
Merge pull request #58 from Human-Connection/pin-dependencies 
[WIP] Pin dependencies
 2018-12-08 13:55:01 +01:00
Grzegorz Leoniec
9042089d5e
fixed linting issues 2018-12-08 13:51:52 +01:00
Grzegorz Leoniec
c96e22492c
merged tags and categories in 2018-12-08 13:44:22 +01:00
Robert Schäfer
ef816b2d10 Wrong network name in Nitro-Backend 2018-12-08 13:37:42 +01:00
Robert Schäfer
ad66dd1b85 Give hc-network a name 
I was wrong. It's not the container name but I forgot simply to give the
network the very same name as specified in the docker-compose.yml of the
frontend
 2018-12-08 13:33:38 +01:00
Robert Schäfer
bc5d75261b Wire frontend and backend together 2018-12-08 13:26:28 +01:00
Robert Schäfer
d7b9dc1b23 No need to call xip.io anymore 
After https://github.com/Human-Connection/Nitro-Backend/pull/61
the xip.io URL has become obsolete
 2018-12-08 13:23:49 +01:00
Robert Schäfer
b4c92ec29a Remove xip.io hack 
After we proxy API requests through the server-side-rendered frontend
there is no need to use xip.io anymore. However, if you "join" services
to a named network at arbitrary times, the DNS of docker-compose only
works if you assign a name to the container. Thus I left `backend` as a
container name.
 2018-12-08 13:17:43 +01:00
Robert Schäfer
0abdb80b00 Update Nitro-Web so cypress can find email input 2018-12-08 12:54:04 +01:00