zmiguel
/
ENEI2019-Public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
445 Commits 8 Branches 0 Tags 128 MiB
Commit Graph

445 Commits

Author SHA1 Message Date
João Borges c2b7539e2f Merge branch 'master' into Borges_march 
# Conflicts:
#	App/app/Router.js
#	App/app/screens/Eventos.js
 2019-03-14 18:46:17 +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 166384ee7f Merge remote-tracking branch 'origin/master' into zmiguel 2019-03-14 16:51:08 +00:00
henrydays 353130461a up 2019-03-14 15:27:42 +00:00
henrydays 0961498860 merge 2019-03-13 20:42:38 +00:00
henrydays d43a5befc2 a 2019-03-13 20:42:20 +00:00
João Borges f6ed1f7675 Febrada Detail screen 2019-03-13 20:23:59 +00:00
João Borges e0d01a6a11 Merge branch 'master' of https://github.com/henrydays/ENEI2019 2019-03-13 01:08:13 +00:00
João Borges 09e8180b54 Screen FebradaDetail 2019-03-13 01:07:27 +00:00
Filipe Pinho ffa5f3ec14 Merge branch 'master' of https://github.com/henrydays/ENEI2019 2019-03-13 00:55:48 +00:00
Filipe Pinho 596958c835 Gold sponsor - Novabase -> adicionado 2019-03-13 00:53:23 +00:00
henrydays adef17b12e reset em condições 2019-03-13 00:36:42 +00:00
henrydays c20718bfba reset 2019-03-12 23:27:58 +00:00
henrydays 3d2f5bb1cc reset password 2019-03-12 22:52:12 +00:00
João Borges e24d3c3391 Screen rally 
Screen eventos
 2019-03-12 22:51:17 +00:00
henrydays 2239ad99db bilhetes 2019-03-12 18:37:49 +00:00
henrydays 46751679e5 update user 2019-03-12 07:31:41 +00:00
henrydays 116fc1b3a9 calendar v3 2019-03-12 03:34:40 +00:00
João Borges 7b35f5c3ff rallyTascas screen 
Eventos Screen
 2019-03-11 19:16:10 +00:00
henrydays 4b7909da4c up 2019-03-11 19:14:10 +00:00
henrydays 1d71783892 p 2019-03-11 18:29:39 +00:00
henrydays 295123e5ed p 2019-03-11 18:29:21 +00:00
Henrique Dias a017e03285
Merge pull request #27 from henrydays/Borges_march 
New layout Calendar Detail
 2019-03-11 18:26:19 +00:00
João Borges 2c50d1eb6a New layout Calendar Detail 2019-03-11 18:11:51 +00:00
henrydays 4c1b2c5c02 up 2019-03-11 16:16:17 +00:00
henrydays 1e09446709 up 2019-03-11 16:15:51 +00:00
Henrique Dias eef29b10ab
Merge pull request #26 from henrydays/Borges_march 
Calendário Detail Layout
 2019-03-11 16:15:35 +00:00
Henrique Dias c225d71de7
Merge branch 'master' into Borges_march 2019-03-11 16:15:22 +00:00
João Borges 64813d3b17 Calendário Detail Layout 2019-03-11 01:30:37 +00:00
henrydays f048c87810 merge 2019-03-10 21:14:55 +00:00
henrydays 1ae3bdb36c up 2019-03-10 21:14:05 +00:00
Henrique Dias d305f550a7
Merge pull request #25 from henrydays/zmiguel 
Zmiguel
 2019-03-10 21:13:46 +00:00
Henrique Dias befb0c4f5c
Merge branch 'master' into zmiguel 2019-03-10 21:13:37 +00:00
henrydays f2e613a081 calendar 2019-03-10 20:17:58 +00:00
henrydays 4d10f614ac career paths calendar 2019-03-10 18:28:14 +00:00
henrydays 8d25174671 up 2019-03-10 00:00:54 +00:00
José Valdiviesso d2e5a69429 Fixed DB 2019-03-09 18:47:20 +00:00
José Valdiviesso 5a2744f8c1 fixed merge problems 2019-03-09 18:10:26 +00:00
José Valdiviesso dede15911f as 2019-03-09 18:08:39 +00:00
José Valdiviesso ed591eec6f Revert "coisas" 
This reverts commit 45c1b37e57.
 2019-03-09 18:08:01 +00:00
José Valdiviesso 7751140a1c revert 2 2019-03-09 18:04:37 +00:00
José Valdiviesso d93787f483 revert 2019-03-09 18:03:46 +00:00
José Valdiviesso 45c1b37e57 coisas 2019-03-09 18:02:34 +00:00
José Valdiviesso b8198b77d8 Merge remote-tracking branch 'origin/master' into zmiguel 2019-03-09 17:56:51 +00:00
José Valdiviesso 0003668cae Rev 1.2 TeamsEvents 2019-03-09 17:56:12 +00:00
henrydays 90b6337d76 brevemente 2019-03-08 18:30:27 +00:00
henrydays e55b8e0221 up 2019-03-08 18:26:01 +00:00
henrydays b0c4527a72 calendar 2019-03-08 18:24:01 +00:00