Commits · 0931745e1c9a1c4ba7f2487e12c875141f28ec90 · Joona Romppanen / Moya Info Tools

01 Jun, 2014 19 commits
- Merge branch 'master' of gitlab.codecrew.fi:liv/moya-info-tools · 0931745e
  Tapio Haapala committed Jun 01, 2014
  
  0931745e Browse Files
- viilailuja · 6ad9cff1
  Tapio Haapala committed Jun 01, 2014
  
  6ad9cff1 Browse Files
- Merge branch 'master' of gitlab.codecrew.fi:liv/moya-info-tools · e8fe2cb7
```
Conflicts:
	MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
	MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
	MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx
```
  Liv Haapala committed Jun 01, 2014
  e8fe2cb7 Browse Files
- update · 707e01d9
  Liv Haapala committed Jun 01, 2014
  
  707e01d9 Browse Files
- update · 99ec8070
  Liv Haapala committed Jun 01, 2014
  
  99ec8070 Browse Files
- haku juttuja · b180fb00
  Tapio Haapala committed Jun 01, 2014
  
  b180fb00 Browse Files
- Kortin näyttö henkilön hakuun ja lukitus paikka editoriin · 1b6d2154
  Tapio Haapala committed Jun 01, 2014
  
  1b6d2154 Browse Files
- update · 4ecffbb7
  Liv Haapala committed Jun 01, 2014
  
  4ecffbb7 Browse Files
- lisää ignorea · c7d6fdcd
  Tapio Haapala committed Jun 01, 2014
  
  c7d6fdcd Browse Files
- autoupdate.crt · 54d68e06
  Tapio Haapala committed Jun 01, 2014
  
  54d68e06
- sdfasdf · bd12ad2b
  Tapio Haapala committed Jun 01, 2014
  
  bd12ad2b Browse Files
- lisää ignorea · c66c8b05
  Tapio Haapala committed Jun 01, 2014
  
  c66c8b05 Browse Files
- Merge branch 'master' of gitlab.codecrew.fi:liv/moya-info-tools · 994990c1
```
Conflicts:
	MoyaAdmin/MoyaAdminUI/MoyaAdminUI.sln
	MoyaAdmin/MoyaAdminUI/MoyaAdminUI/obj/Debug/MoyaAdminUI.csproj.FileListAbsolute.txt
	PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.exe
	PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.pdb
```
  Tapio Haapala committed Jun 01, 2014
  994990c1 Browse Files
- Autopublishin tiedostoja · d03271cb
  Tapio Haapala committed Jun 01, 2014
  
  d03271cb
- raivo · cac27f32
  Tapio Haapala committed Jun 01, 2014
  
  cac27f32 Browse Files
- woops väärä file ignoreen · 5f8f78d8
  Tapio Haapala committed Jun 01, 2014
  
  5f8f78d8 Browse Files
- lisää ignorea · 49bdf1f3
  Tapio Haapala committed Jun 01, 2014
  
  49bdf1f3 Browse Files
- lisää ignoreja ja hiontaa print serveriin · 0657b381
  Tapio Haapala committed Jun 01, 2014
  
  0657b381 Browse Files
- update · ed57a528
  Liv Haapala committed Jun 01, 2014
  
  ed57a528
30 May, 2014 2 commits
- update · cb5c96f1
  Liv Haapala committed May 30, 2014
  
  cb5c96f1
- autoupdate · febb15ff
  Tapio Haapala committed May 30, 2014
  
  febb15ff Browse Files
29 May, 2014 10 commits

print serveriin auth tuki ja sortti · af057217
Tapio Haapala committed May 29, 2014

af057217 Browse Files

Merge branch 'master' of gitlab.codecrew.fi:liv/moya-info-tools · ab11d17f

Conflicts:
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/Form1.cs
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/bin/Debug/BarcodeScannerClient.exe
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/bin/Debug/BarcodeScannerClient.pdb
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.csproj.FileListAbsolute.txt
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.csprojResolveAssemblyReference.cache
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.exe
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.pdb
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/obj/Debug/MoyaAdminUI.csproj.FileListAbsolute.txt
PrintServer/moyaPrintServer/moyaPrintServer/Form1.cs
PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.exe
PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.exe.config
PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.pdb
PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.vshost.exe
PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.vshost.exe.config

committed May 29, 2014

ab11d17f Browse Files

s<d · c570adcd
Tapio Haapala committed May 29, 2014

c570adcd Browse Files
tunk · ae5ce51b
Tapio Haapala committed May 29, 2014

ae5ce51b
update · b730dd7f
Liv Haapala committed May 29, 2014

b730dd7f Browse Files
gitigititiigig *tu · 9bca4d82
Tapio Haapala committed May 29, 2014

9bca4d82 Browse Files

Merge branch 'master' of gitlab.codecrew.fi:liv/moya-info-tools · e6a2e178

Conflicts:
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/bin/Debug/BarcodeScannerClient.exe
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/bin/Debug/BarcodeScannerClient.pdb
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.csproj.FileListAbsolute.txt
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.csprojResolveAssemblyReference.cache
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.exe
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.pdb
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache

committed May 29, 2014

e6a2e178 Browse Files

korttien tagaus · 060534d6
Liv Haapala committed May 29, 2014

060534d6 Browse Files

Merge branch 'master' of gitlab.codecrew.fi:liv/moya-info-tools · 90014e71

Conflicts:
PrintServer/moyaPrintServer/moyaPrintServer/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
PrintServer/moyaPrintServer/moyaPrintServer/obj/x86/Debug/moyaPrintServer.csproj.FileListAbsolute.txt

committed May 29, 2014

90014e71 Browse Files

hiontaa viilailua ja authi · 2cf09928
Tapio Haapala committed May 29, 2014

2cf09928 Browse Files

03 Apr, 2014 2 commits
- lisätty admin ui · 7fc41e53
  Tapio Haapala committed Apr 03, 2014
  
  7fc41e53
- update · e442e589
  Liv Haapala committed Apr 03, 2014
  
  e442e589 Browse Files
28 Feb, 2014 1 commit
- added projects · e759bc90
  Liv Haapala committed Feb 28, 2014
  
  e759bc90