Commit Graph

26 Commits

Author SHA1 Message Date
José Valdiviesso c3c3aeca45 Fix Teams, Events, Cromos & Scans 2019-03-16 19:17:19 +00:00
José Valdiviesso a6eed722c7 fix cromos 2019-03-16 16:32:37 +00:00
José Valdiviesso 89d8bb5585 Cromos e QR Scan 2019-03-14 18:10:59 +00:00
José Valdiviesso 3bedefafb7 cromos dbset 2019-03-14 16:52:49 +00:00
José Valdiviesso 1ccc5d6ad3 Auto stash before merge of "zmiguel" and "origin/master" 2019-03-14 16:51:48 +00:00
José Valdiviesso d2e5a69429 Fixed DB 2019-03-09 18:47:20 +00:00
José Valdiviesso 36118ede1c cenas 2019-03-07 18:27:14 +00:00
José Valdiviesso afaed51e6d almost there 2019-03-06 23:25:33 +00:00
José Valdiviesso 5c7498b3ec small up 2019-03-06 19:17:36 +00:00
José Valdiviesso 7eac9f6c9c Auto stash before merge of "zmiguel" and "origin/zmiguel" 2019-03-02 03:57:08 +00:00
henrydays 603ab626bf finosv3 2019-02-24 02:16:08 +00:00
henrydays 11ed571d02 resolver api 2019-02-21 00:09:38 +00:00
henrydays 60e795645b dot net 2019-02-14 20:41:15 +00:00
Henrique Dias d6c7dfeb3e
Merge pull request #22 from henrydays/zmiguel
Zmiguel
2019-02-14 19:11:13 +00:00
José Valdiviesso 778e7b45f3 small up 2019-02-14 17:25:19 +00:00
henrydays f982d8c158 merge 2019-01-31 00:46:49 +00:00
henrydays 3fd9ef450d Merge branch 'master' into henrique
# Conflicts:
#	api/bin/Debug/netcoreapp2.1/api.Views.dll
#	api/bin/Debug/netcoreapp2.1/api.Views.pdb
#	api/bin/Debug/netcoreapp2.1/api.dll
#	api/bin/Debug/netcoreapp2.1/api.pdb
#	api/obj/Debug/netcoreapp2.1/Razor/Views/Landing/index.g.cshtml.cs
#	api/obj/Debug/netcoreapp2.1/api.RazorCoreGenerate.cache
#	api/obj/Debug/netcoreapp2.1/api.Views.dll
#	api/obj/Debug/netcoreapp2.1/api.Views.pdb
#	api/obj/Debug/netcoreapp2.1/api.csproj.CoreCompileInputs.cache
#	api/obj/Debug/netcoreapp2.1/api.csproj.FileListAbsolute.txt
#	api/obj/Debug/netcoreapp2.1/api.dll
#	api/obj/Debug/netcoreapp2.1/api.pdb
2018-12-14 17:02:05 +00:00
henrydays 7db2a484bc lol 2018-12-14 16:52:31 +00:00
José Valdiviesso 4aeb53bf6d Event Models and QRs 2018-12-12 16:43:20 +00:00
henrydays 372ec741dd cleanup 2018-12-12 15:17:08 +00:00
henrydays 07d5954fa8 rm 2018-12-12 15:14:49 +00:00
henrydays 30e3a2e9d8 api updates 2018-08-29 23:31:44 +01:00
henrydays efef0ade4d major updates login system 2018-08-29 18:24:13 +01:00
henrydays b7c2d96b9f updates 2018-08-28 01:58:16 +01:00
henrydays ef661a1ea6 update api 2018-08-18 23:55:13 +01:00
henrydays 54d19b3567 added authentication 2018-08-17 23:28:12 +01:00