Skip to content

Commit 28934a8

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents d26578a + 57362a4 commit 28934a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+298
-36
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ eFormAPI/eFormAPI/logs/
2424
eFormAPI/eFormAPI\.sln\.DotSettings\.user
2525

2626
eFormAPI/eFormAPI/output/dataFolder/
27+
eform-client/package-lock.json
28+
.idea
29+
eFormAPI/eFromAPI.Common/bin/Release/*
30+
eFormAPI/eFormAPI/Properties/PublishProfiles/
2731

2832
eFormAPI/\.idea/
2933

.travis.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
dist: trusty
2+
addons:
3+
firefox: latest
4+
apt:
5+
sources:
6+
- google-chrome
7+
packages:
8+
- google-chrome-stable fluxbox
9+
sudo: required
10+
language: csharp
11+
mono: latest
12+
dotnet: 2.0.0
13+
install:
14+
- nvm install 8.0.0
15+
- nvm use 8.0.0
16+
before_script:
17+
- "export DISPLAY=:99.0"
18+
- "sh -e /etc/init.d/xvfb start"
19+
- sleep 3
20+
- fluxbox > /dev/null 2>&1 &
21+
script:
22+
- travis_retry nuget restore -source "https://www.nuget.org/api/v2" ./eFormAPI/eFormAPI.sln
23+
- xbuild ./eFormAPI/eFormAPI.sln
24+
- cd eform-client && npm install
25+
after_success:
26+
- echo dotnet test and npm test succeeded
27+
after_faliure:
28+
- echo dotnet test and npm test failed

README.md

Lines changed: 7 additions & 2 deletions

docs/file_1.png

48.7 KB

docs/file_2.png

114 KB

docs/file_3.png

389 KB

docs/file_4.png

65.9 KB

docs/file_5.png

63 KB

docs/file_6.png

61.1 KB

docs/file_7.png

50.6 KB

0 commit comments

Comments
 (0)