|
|
ff5dc64ec1
|
Resolved Merge Conflict
|
2020-12-18 13:48:13 +01:00 |
|
|
|
0c9c7584f8
|
Merged .gitignore
|
2020-12-18 13:47:59 +01:00 |
|
|
|
49987cdb9e
|
removed .vs
|
2020-12-18 13:25:29 +01:00 |
|
|
|
c7190b4479
|
Merge branch 'DevMathieu' of github.com:Xandra10101/AlfaPrentice into DevMathieu
|
2020-12-18 13:24:08 +01:00 |
|
|
|
23f35b17c0
|
removed old BedrijfController and the folder structure associated with it
|
2020-12-18 13:22:18 +01:00 |
|
|
|
fa3ac2dd0e
|
removed obj
|
2020-12-18 13:18:51 +01:00 |
|
|
|
7e8ef43f35
|
merged DevMathieu into DevFix
|
2020-12-18 13:18:11 +01:00 |
|
Xandra10101
|
5f28a5ff71
|
Update README.md
|
2020-12-18 13:15:22 +01:00 |
|
mathieusteen
|
af0c2fce12
|
rename .net file to dotnet
|
2020-12-18 13:00:15 +01:00 |
|
mathieusteen
|
3cfa6713a7
|
added repos plus file sturucture changes
|
2020-12-18 12:58:49 +01:00 |
|
frits000000
|
92bdb484ad
|
delete vs folder
|
2020-12-18 12:55:34 +01:00 |
|
frits000000
|
dd552d3f5b
|
Revert "Merge remote-tracking branch 'origin/DevMathieu' into DevFrits"
This reverts commit 8982be3f102db4b013b4a010c934d5a80eceebca, reversing
changes made to 5ca42144ad773b5f1d793263a05deea641b146cb.
|
2020-12-18 12:54:54 +01:00 |
|
frits000000
|
8982be3f10
|
Merge remote-tracking branch 'origin/DevMathieu' into DevFrits
|
2020-12-18 12:53:31 +01:00 |
|
frits000000
|
5ca42144ad
|
Merge branch 'DevFrits' of https://github.com/Xandra10101/AlfaPrentice into DevFrits
|
2020-12-18 12:50:10 +01:00 |
|
frits000000
|
77a66bf07e
|
weekstaten update
|
2020-12-18 12:47:27 +01:00 |
|
mathieusteen
|
3ee6e09d8e
|
added sollicitatie repo ect
|
2020-12-17 17:18:41 +01:00 |
|
frits000000
|
6d35e92e42
|
wekstaten update
|
2020-12-11 17:17:20 +01:00 |
|
Xandra10101
|
e14c40aa9e
|
update bedrijfcontroller
|
2020-12-11 16:37:17 +01:00 |
|
Xandra10101
|
8eb2dbe6a2
|
Merge branch 'DevMathieu' into DevXandra
|
2020-12-11 16:20:32 +01:00 |
|
Xandra10101
|
b4a2dbf814
|
nog een keer
|
2020-12-11 16:16:27 +01:00 |
|
Xandra10101
|
ba004152d6
|
getbedrijven function toegevoegd
|
2020-12-11 16:14:53 +01:00 |
|
mathieusteen
|
ae2fc02378
|
repo bedrijf
|
2020-12-11 16:14:37 +01:00 |
|
mathieusteen
|
8644d8c81f
|
Merge branch 'DevMathieu' of https://github.com/Xandra10101/AlfaPrentice into DevMathieu
|
2020-12-11 15:25:46 +01:00 |
|
mathieusteen
|
05a59220a1
|
blabla
|
2020-12-11 15:25:37 +01:00 |
|
Xandra10101
|
5da9e78e3f
|
Update .gitignore
|
2020-12-11 14:48:29 +01:00 |
|
Xandra10101
|
09a0b5efda
|
Merge branch 'main' into DevMathieu
|
2020-12-11 14:42:54 +01:00 |
|
Xandra10101
|
fe5d1aacfd
|
changed version to 3.1.10
|
2020-12-11 14:36:38 +01:00 |
|
Xandra10101
|
79dc447513
|
Update .gitignore
|
2020-12-11 13:44:39 +01:00 |
|
Xandra10101
|
1e6b57bc17
|
Update README.md
|
2020-12-11 13:44:24 +01:00 |
|
mathieusteen
|
be45f867e2
|
nog niet
|
2020-12-11 01:35:40 +01:00 |
|
mathieusteen
|
0bc83a1ec6
|
snap er niks van
|
2020-12-11 01:11:55 +01:00 |
|
frits000000
|
caffae036c
|
weekstaten page implementatie
|
2020-12-10 17:04:21 +01:00 |
|
mathieusteen
|
2d253c4ab6
|
Merge branch 'main' into DevMathieu
|
2020-12-10 16:39:55 +01:00 |
|
Xandra10101
|
e754d3fa88
|
Update .gitignore
|
2020-12-10 16:30:47 +01:00 |
|
Xandra10101
|
5250c60504
|
Merge branch 'DevXandra' into main
|
2020-12-10 16:28:28 +01:00 |
|
Xandra10101
|
a44f0d1f00
|
update packages
|
2020-12-10 16:26:55 +01:00 |
|
Xandra10101
|
b62f94b728
|
Update .gitignore
|
2020-12-10 16:20:00 +01:00 |
|
mathieusteen
|
589b4e0adb
|
Merge branch 'main' into DevMathieu
|
2020-12-10 16:11:13 +01:00 |
|
Xandra10101
|
bd6dde5789
|
Merge branch 'DevXandra' into main
|
2020-12-10 16:07:08 +01:00 |
|
Xandra10101
|
20ba6daaf4
|
met updated packages hoop ik
|
2020-12-10 16:06:42 +01:00 |
|
mathieusteen
|
b57394db4c
|
adde db conection
|
2020-12-10 15:59:21 +01:00 |
|
Xandra10101
|
adec8fc334
|
Update .gitignore
|
2020-12-10 15:57:10 +01:00 |
|
Xandra10101
|
5b41aa89dc
|
Merge branch 'main' into DevMathieu
|
2020-12-10 15:12:39 +01:00 |
|
Xandra10101
|
3ed88708b9
|
update with packages
|
2020-12-10 15:06:01 +01:00 |
|
mathieusteen
|
29e752c6d4
|
added context tabels and models
|
2020-12-10 14:59:47 +01:00 |
|
frits000000
|
9d178aa535
|
update
|
2020-12-10 14:53:10 +01:00 |
|
Xandra10101
|
332873f63d
|
Changed version asp.net
|
2020-12-10 14:45:25 +01:00 |
|
frits000000
|
8dd660d933
|
apple fix
|
2020-12-10 14:20:06 +01:00 |
|
Xandra10101
|
f22fa3e427
|
changed weather stuff
|
2020-12-04 14:04:22 +01:00 |
|
Xandra10101
|
4045376df8
|
Created .gitignore
|
2020-12-04 13:22:45 +01:00 |
|
