Skip to content

Commit d3e36e9

Browse files
committed
Merge branch 'master' of github.com:microting/eform-angular-frontend
2 parents edd3a17 + 48c221b commit d3e36e9

File tree

646 files changed

+120361
-2659
lines changed

Some content is hidden

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

646 files changed

+120361
-2659
lines changed

.gitignore

Lines changed: 50 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,50 @@
1-
2-
eFormAPI/packages/
3-
4-
eFormAPI/eFormAPI/bin/
5-
6-
eFormAPI/eFormAPI/obj/
7-
8-
eFormAPI/\.vs/
9-
10-
eFormAPI/eFormApi\.Core/obj/Debug/
11-
12-
eFormAPI/eFromAPI\.Common/obj/Debug/
13-
14-
eFormAPI/eFormApi\.Core/bin/Debug/
15-
16-
eFormAPI/eFormAPI/logs/2017-04-27-full\.log
17-
18-
eFormAPI/eFromAPI\.Common/bin/Debug/
19-
20-
eFormAPI/eFromAPI\.Common/obj/
21-
22-
eFormAPI/eFormAPI/logs/
23-
24-
eFormAPI/eFormAPI\.sln\.DotSettings\.user
25-
26-
eFormAPI/eFormAPI/output/dataFolder/
27-
eform-client/package-lock.json
28-
.idea
1+
2+
eFormAPI/packages/
3+
4+
eFormAPI/eFormAPI/bin/
5+
6+
eFormAPI/eFormAPI/obj/
7+
8+
eFormAPI/\.vs/
9+
10+
eFormAPI/eFormApi\.Core/obj/Debug/
11+
12+
eFormAPI/eFromAPI\.Common/obj/Debug/
13+
14+
eFormAPI/eFormApi\.Core/bin/Debug/
15+
16+
eFormAPI/eFormAPI/logs/2017-04-27-full\.log
17+
18+
eFormAPI/eFromAPI\.Common/bin/Debug/
19+
20+
eFormAPI/eFromAPI\.Common/obj/
21+
22+
eFormAPI/eFormAPI/logs/
23+
24+
eFormAPI/eFormAPI\.sln\.DotSettings\.user
25+
26+
eFormAPI/eFormAPI/output/dataFolder/
27+
eform-client/package-lock.json
28+
.idea
29+
eFormAPI/eFromAPI.Common/bin/Release/*
30+
eFormAPI/eFormAPI/Properties/PublishProfiles/
31+
32+
eFormAPI/\.idea/
33+
34+
eFormAPI/eFormAPI\.Common/obj/Debug/
35+
36+
eFormAPI/eFormAPI\.Common/bin/Debug/
37+
38+
eform-client/package-lock\.json
39+
eFormAPI/AllowMultipleVersions/obj/
40+
eFormAPI/AlowMultipleVersionsBundle/bin/
41+
eFormAPI/AlowMultipleVersionsBundle/obj/
42+
eFormAPI/Bundle/bin/
43+
eFormAPI/Bundle/obj/
44+
eFormAPI/CustomActions/obj/
45+
eFormAPI/eFormAPI.Common/obj/
46+
eFormAPI/eFormAPI.Common/bin/
47+
eFormAPI/MainInstaller/obj/
48+
eFormAPI/MainInstaller/bin/
49+
eFormAPI/AllowMultipleVersionsBundle/bin/
50+
eFormAPI/AllowMultipleVersionsBundle/obj/

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ before_script:
1919
- sleep 3
2020
- fluxbox > /dev/null 2>&1 &
2121
script:
22-
- travis_retry nuget restore -source "https://www.nuget.org/api/v2" ./eFormAPI/eFormAPI.sln
23-
- xbuild ./eFormAPI/eFormAPI.sln
2422
- cd eform-client && npm install
2523
after_success:
2624
- echo dotnet test and npm test succeeded

eFormAPI/.idea/.idea.eFormAPI/.idea/contentModel.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eFormAPI/.idea/.idea.eFormAPI/.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eFormAPI/.idea/.idea.eFormAPI/.idea/workspace.xml

Lines changed: 1157 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eFormAPI/.idea/.idea.eFormAPI/riderModule.iml

Lines changed: 63 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)