Commit Graph

256 Commits

Author SHA1 Message Date
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
Filipe Pinho af6c58ed40 Merge branch 'filipe' 2019-03-07 23:23:13 +00:00
Filipe Pinho 09aa9260c2 ajustes 2019-03-07 23:21:42 +00:00
Filipe Pinho ea8398cd13 merge master (remote) > master (local) 2019-03-07 23:18:09 +00:00
Filipe Pinho bda5ec0f4e Alteracao da seccao dos precos (termino dos early-bird comeco dos normais) 2019-03-07 23:09:57 +00:00
José Valdiviesso 36118ede1c cenas 2019-03-07 18:27:14 +00:00
José Valdiviesso 7ee50f5b8e Rev 1.1 Teams 2019-03-07 17:42:18 +00:00
José Valdiviesso 633960e7db Rev. 1 Teams e Eventos 2019-03-07 17:33:15 +00:00
Henrique Dias 3d94d6d7a8
Merge pull request #24 from henrydays/zmiguel
almost there
2019-03-07 15:10:10 +00:00
José Valdiviesso afaed51e6d almost there 2019-03-06 23:25:33 +00:00
Henrique Dias e645cee192
Merge pull request #23 from henrydays/zmiguel
Zmiguel
2019-03-06 19:19:51 +00:00
José Valdiviesso 5c7498b3ec small up 2019-03-06 19:17:36 +00:00
José Valdiviesso 629d86229b Merge remote-tracking branch 'origin/master' into zmiguel 2019-03-06 17:16:18 +00:00
José Valdiviesso 583c8e19ee . 2019-03-06 17:16:10 +00:00
henrydays 31e221cb6e update api 2019-03-04 23:57:08 +00:00
henrydays c634a00490 up 2019-03-04 22:38:04 +00:00
henrydays 483a7216ca updates 2019-03-04 16:46:29 +00:00
João Pedro Borges c8389af216
new profile 2019-03-04 16:38:58 +00:00
João Pedro Borges 5846648a65
Profile screen 2019-03-04 16:36:16 +00:00
henrydays 824fe50c72 login error 2019-03-03 01:59:16 +00:00
henrydays 5344acbc90 jogo do enei 2019-03-02 18:18:04 +00:00
José Valdiviesso 374443be43 update 2019-03-02 03:57:16 +00:00
José Valdiviesso 7eac9f6c9c Auto stash before merge of "zmiguel" and "origin/zmiguel" 2019-03-02 03:57:08 +00:00
José Valdiviesso 7377df0173 Merge remote-tracking branch 'origin/zmiguel' into zmiguel 2019-03-02 01:06:47 +00:00
José Valdiviesso 96aff3f875 Merge remote-tracking branch 'origin/master' into zmiguel 2019-03-01 21:32:30 +00:00
henrydays c51e1543b0 website 2019-03-01 19:35:36 +00:00
henrydays ffd5d41b13 change guests 2019-03-01 17:36:52 +00:00
henrydays e36614b55f calendário update 2019-02-28 23:52:58 +00:00
Filipe Pinho 73a00e227d Logo da critical adicionado / Adicionada animacao do logo do enei 2019-02-28 23:39:39 +00:00
henrydays 1c4df5dee5 local storage 2019-02-27 21:55:25 +00:00
henrydays 7634f1b659 novo update 2019-02-27 11:22:43 +00:00
Filipe Pinho 3268784558 Seccao dos Sponsors adicionada / Ajustes css 2019-02-27 00:35:53 +00:00
José Valdiviesso df782124de Inicio Eventos e Equipas 2019-02-26 01:52:05 +00:00
José Valdiviesso 7fc4063c46 Auto stash before merge of "zmiguel" and "origin/zmiguel" 2019-02-26 00:41:17 +00:00
José Valdiviesso 8ef03a2a00 Merge remote-tracking branch 'origin/master' into zmiguel 2019-02-25 10:00:48 +00:00
henrydays 603ab626bf finosv3 2019-02-24 02:16:08 +00:00
José Valdiviesso 026bc41aab Migrations cleanup, teams and event DB 2019-02-23 23:30:54 +00:00
José Valdiviesso 39944dc363 Merge remote-tracking branch 'origin/master' into zmiguel 2019-02-23 23:08:00 +00:00
José Valdiviesso 0f0aa1436b Master merge, Teams & Events models 2019-02-23 23:06:56 +00:00
henrydays 36ca6b20a4 pavil~hao 2019-02-23 20:28:30 +00:00