Commit Graph

603 Commits

Author SHA1 Message Date
5e885ff3b4 . 2019-10-22 12:15:19 +02:00
426ddffa5f Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-10-21 20:23:09 +02:00
7a3c1ce5b6 Push 2019-10-21 20:23:06 +02:00
8cb228db88 a 2019-10-21 18:17:18 +02:00
cfa65e7eac a 2019-10-21 17:05:09 +02:00
47b1f87a79 . 2019-10-21 12:12:16 +02:00
2035343245 . 2019-10-21 11:44:14 +02:00
95413ca00e . 2019-10-21 11:38:47 +02:00
9af12af4aa a 2019-10-21 11:25:37 +02:00
94cfa548ce Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-10-17 18:59:23 +02:00
68a2f7fc52 Gestión de notificaciones 2019-10-17 18:59:18 +02:00
dbd615086a Gestión de notificaciones push 2019-10-17 18:00:50 +02:00
710123dad5 a 2019-10-16 09:23:12 +02:00
73f90217d4 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-10-15 18:23:59 +02:00
a7a464dc36 Error en el nombre de la tabla 'user_devices' 2019-10-15 18:23:55 +02:00
c3ef5160e7 a 2019-10-15 16:28:21 +02:00
32b00386fb a 2019-10-15 16:23:20 +02:00
f9f272917a a 2019-10-15 16:18:17 +02:00
b912abe399 a 2019-10-15 13:26:05 +02:00
61488977e6 a 2019-10-15 13:01:25 +02:00
3fc9f29e6f Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-10-15 12:56:34 +02:00
64acff9b3a a 2019-10-15 12:56:29 +02:00
dfabadeb6a a 2019-10-15 12:56:17 +02:00
e6547efba1 Error al guardar el push token. 2019-10-15 11:34:30 +02:00
07debfe693 . 2019-10-14 17:25:35 +02:00
6ef4e78752 #4 -> Revisar proceso de registro de usuario para que indiquen el colegio al que pertenecen 2019-10-14 16:59:55 +02:00
e3a4007ab6 a 2019-10-14 13:05:46 +02:00
a9da046d45 a 2019-10-14 13:02:48 +02:00
4e5fee6aa9 a 2019-10-14 13:00:49 +02:00
795c629e84 a 2019-10-14 12:59:02 +02:00
f91aa1fece a 2019-10-14 12:17:17 +02:00
cbda1df7b3 a 2019-10-14 12:17:07 +02:00
b996fe1a91 Poder dejar comentarios en borrador 2019-10-09 22:52:41 +02:00
f49f4b4ea3 Incluir comentarios al devolver un evento concreto. 2019-10-04 23:02:50 +02:00
1425134736 Notificaciones push 2019-10-03 21:37:56 +02:00
c1bd3bed18 . 2019-10-02 19:56:55 +02:00
dbafb15a10 Pruebas Live 2019-10-02 19:01:22 +02:00
f4e3b9c4c4 Pruebas LIVE 2019-10-02 17:09:51 +02:00
c7780e9980 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-10-02 16:45:09 +02:00
46e1053db2 . 2019-10-02 16:45:05 +02:00
845bac0326 a 2019-10-02 16:28:21 +02:00
9745f5da42 a 2019-10-02 12:28:18 +02:00
21f90afa4a a 2019-10-02 12:27:49 +02:00
c6e28e880c a 2019-10-02 12:24:59 +02:00
0b6416a413 a 2019-10-02 12:23:24 +02:00
ceb062fc93 a 2019-10-02 12:14:43 +02:00
da9b359e53 a 2019-10-02 12:12:42 +02:00
d64a0c1046 a 2019-10-02 12:10:39 +02:00
0765d0a2d4 a 2019-10-02 12:08:55 +02:00
d65125f876 a 2019-10-02 12:07:34 +02:00
158655b855 a 2019-10-02 12:06:24 +02:00
edf78de4a8 a 2019-10-02 12:02:53 +02:00
ddd3495ae5 a 2019-10-02 12:01:20 +02:00
03cf0afa88 a 2019-10-02 11:59:29 +02:00
70e31e2cbe a 2019-10-02 11:09:36 +02:00
5a68724eda a 2019-10-02 11:07:12 +02:00
e1c4e783a3 a 2019-10-02 11:04:50 +02:00
04dde946c8 a 2019-10-02 10:53:39 +02:00
ef17222132 a 2019-10-02 10:29:34 +02:00
6371c44956 a 2019-10-02 10:27:56 +02:00
86ef45bb70 a 2019-10-02 10:21:26 +02:00
28e36c8106 a 2019-09-30 15:59:11 +02:00
04321e8291 a 2019-09-30 15:57:32 +02:00
8e662ed54d Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-09-30 12:07:30 +02:00
383d11d9df a 2019-09-30 12:07:25 +02:00
62d1e19a55 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-09-28 00:03:39 +02:00
0f3132e030 routes normales 2019-09-28 00:03:34 +02:00
aa38e57c0c Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-09-27 23:43:55 +02:00
904ae177ab . 2019-09-27 23:28:18 +02:00
00dbd54025 . 2019-09-27 23:25:33 +02:00
f010e0de88 dejarlo como debe estar 2019-09-27 17:55:13 +02:00
8da13ef5ec . 2019-09-27 17:44:46 +02:00
a77ddee39b . 2019-09-27 17:41:49 +02:00
dac800a587 . 2019-09-27 17:34:33 +02:00
819c8c8c97 . 2019-09-27 17:34:22 +02:00
9e37018269 a 2019-09-27 17:22:43 +02:00
452e83a420 a 2019-09-27 17:07:51 +02:00
2724db4d4b . 2019-09-27 16:02:13 +02:00
0e2c17967e a 2019-09-27 12:22:09 +02:00
b6793d237d a 2019-09-27 11:11:20 +02:00
47971e2f84 a 2019-09-26 16:49:35 +02:00
c2cd5cefca a 2019-09-24 13:45:25 +02:00
abf5678289 a 2019-09-20 18:43:27 +02:00
77eedcbb42 a 2019-09-20 18:25:10 +02:00
6359dda0a8 a 2019-09-20 17:58:46 +02:00
b75f9eb793 a 2019-09-20 14:02:36 +02:00
3e4e79fa08 Crear preguntas a los ponentes 2019-09-19 13:30:32 +02:00
aca096bf3d a 2019-09-18 18:01:53 +02:00
c7748fe20b Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-09-18 18:01:22 +02:00
5af8f32000 a 2019-09-18 18:01:18 +02:00
7678a1bef7 . 2019-09-18 17:19:57 +02:00
a9804eae58 Ordenar los eventos próximos por fecha del evento, no por fecha de inscripciones. 2019-09-18 17:18:12 +02:00
f012750287 a 2019-09-18 16:25:34 +02:00
fbe3560026 a 2019-09-18 16:24:43 +02:00
18e00262e6 a 2019-09-18 16:19:27 +02:00
bc2698fcb2 a 2019-09-14 13:48:57 +02:00
66509e2b2c a 2019-09-14 13:32:46 +02:00
ecfab53407 a 2019-09-13 19:53:28 +02:00
f39a113de7 a 2019-09-13 19:51:29 +02:00
e0820f7b7e a 2019-09-13 19:12:47 +02:00
2fa3598191 a 2019-09-13 19:04:03 +02:00
a53ee1fd88 a 2019-09-13 18:51:15 +02:00
39c7e347dc a 2019-09-13 17:11:41 +02:00
002295bcae a 2019-09-13 17:08:41 +02:00
34ec013417 a 2019-09-13 17:04:37 +02:00
70d7c9e9b8 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-09-13 16:55:11 +02:00
d4c5c992b9 a 2019-09-13 16:55:07 +02:00
e379f67104 CORS 2019-09-13 16:45:02 +02:00
817bd834a6 a 2019-09-13 13:49:22 +02:00
c00006bca9 a 2019-09-12 19:42:45 +02:00
2121540882 a 2019-09-12 19:33:57 +02:00
c3b119545a a 2019-09-12 17:37:38 +02:00
672088413e a 2019-09-12 14:09:55 +02:00
eb66a49f7e a 2019-09-12 14:05:39 +02:00
7aed7d6a20 a 2019-09-12 14:02:46 +02:00
e421ad9cf0 a 2019-09-12 13:54:58 +02:00
c5473233d5 aa 2019-09-12 13:50:39 +02:00
d37b3fd84d a 2019-09-12 12:22:08 +02:00
a7e92409a3 a 2019-09-12 12:17:16 +02:00
6dc8b4b9de a 2019-09-12 12:06:24 +02:00
1897a74a28 a 2019-09-12 12:04:42 +02:00
b8a0bbcf3b a 2019-09-12 11:54:00 +02:00
881cce54fc a 2019-09-11 16:23:52 +02:00
568aca392d a 2019-09-11 16:19:22 +02:00
c4067fc447 a 2019-09-11 16:13:51 +02:00
14af0e3fc3 a 2019-09-11 16:10:21 +02:00
8682e35f10 a 2019-09-11 16:03:16 +02:00
c04419e938 a 2019-09-11 15:56:27 +02:00
de061f9a82 a 2019-09-11 15:47:13 +02:00
47e833daba a 2019-09-11 15:46:46 +02:00
68768b9a51 a 2019-09-11 15:23:13 +02:00
13b309f485 a 2019-09-11 13:11:47 +02:00
f98a88ec59 a 2019-09-11 13:07:32 +02:00
20060abdfb a 2019-09-11 13:04:32 +02:00
73c729e31e a 2019-09-11 13:01:16 +02:00
b827115bde a 2019-09-10 20:44:00 +02:00
cb3436c133 a 2019-09-10 17:23:28 +02:00
c0228c6f20 a 2019-09-10 17:07:22 +02:00
d5feef5b67 a 2019-09-09 16:55:26 +02:00
db922a39da a 2019-09-09 16:50:03 +02:00
54b1e8923a a 2019-09-09 16:43:26 +02:00
eef10573b6 a 2019-09-09 16:41:50 +02:00
7ccd10395c a 2019-09-09 16:40:47 +02:00
eba2fce49b a 2019-09-09 16:39:14 +02:00
8ca7364c7f a 2019-09-09 16:36:45 +02:00
9b9621462f a 2019-09-09 12:06:29 +02:00
1cb00c0035 a 2019-09-03 19:57:28 +02:00
5a09f01dc2 a 2019-09-03 19:19:16 +02:00
d53bc36cce Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-09-03 19:01:32 +02:00
153bcbb637 a 2019-09-03 19:00:41 +02:00
d471d5bc46 . 2019-09-03 18:09:14 +02:00
adabf25eac Caché en venues 2019-09-03 16:16:28 +02:00
44463e5729 Featured speakers 2019-09-03 10:52:35 +02:00
539cada80c Activar caché en algunas rutas 2019-09-03 10:40:10 +02:00
3dfaf4b32c Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-09-03 10:32:40 +02:00
a186e96407 . 2019-09-03 10:32:36 +02:00
4fe2488fa1 a 2019-09-02 18:00:34 +02:00
1518953416 a 2019-09-02 17:38:49 +02:00
26f89aa0f2 a 2019-09-02 17:37:00 +02:00
a0b24cd956 a 2019-09-02 17:33:40 +02:00
c7938219f7 a 2019-09-02 17:22:12 +02:00
c52a2b7b14 a 2019-09-02 17:04:11 +02:00
354adca8ef a 2019-09-02 17:02:00 +02:00
6b02b38928 a 2019-09-02 13:16:45 +02:00
2d09aae5dc a 2019-08-31 13:47:15 +02:00
a4b814747e a 2019-08-31 12:38:13 +02:00
2f953e2838 a 2019-08-31 11:36:31 +02:00
7e6c644a35 a 2019-08-30 20:04:21 +02:00
dde393649b a 2019-08-30 19:56:28 +02:00
efd1a22bd9 a 2019-08-30 19:47:28 +02:00
5bf09a4caa a 2019-08-30 19:31:00 +02:00
840dc9bd57 a 2019-08-30 19:03:41 +02:00
c9dc6cff33 a 2019-08-30 18:51:45 +02:00
c4f37ea012 a 2019-08-30 18:48:02 +02:00
b687c23378 a 2019-08-30 18:17:04 +02:00
0dd318c715 a 2019-08-30 17:35:52 +02:00
6e372a08b6 a 2019-08-30 17:21:40 +02:00
e49cb9741d a 2019-08-30 17:11:11 +02:00
749f29dbb1 a 2019-08-30 12:03:56 +02:00
ff1d371897 a 2019-08-29 20:08:22 +02:00
43d1da46ec a 2019-08-28 19:09:10 +02:00
fc43cee157 a 2019-08-28 14:00:59 +02:00
d1cbf79c26 a 2019-08-28 13:41:47 +02:00
c36b593327 a 2019-08-28 13:19:09 +02:00
777bf55bf6 a 2019-08-28 12:43:41 +02:00
01a02da4c3 a 2019-08-28 11:07:38 +02:00
a72762d581 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-27 16:46:24 +02:00
8c6cb2875c a 2019-08-27 16:46:20 +02:00
89f3b080fa Blog 2019-08-27 14:07:17 +02:00
90d82741f0 . 2019-08-27 13:18:44 +02:00
854b58187b a 2019-08-27 13:08:04 +02:00
05e7d6494d a 2019-08-27 11:12:19 +02:00
d52df0bc68 a 2019-08-26 17:44:48 +02:00
e080548da9 . 2019-08-26 17:42:52 +02:00
ee079f0f0d a 2019-08-26 17:22:04 +02:00
d66d41c02e a 2019-08-26 17:21:58 +02:00
e3837cd6c4 a 2019-08-22 19:25:50 +02:00
4bc53f7acc a 2019-08-22 19:09:32 +02:00
b0498dd746 a 2019-08-22 14:19:41 +02:00
09a977c9da blog 2019-08-22 00:15:03 +02:00
4bb807ec08 blog 2019-08-21 20:56:45 +02:00
72946c6c01 Comentarios para el blog 2019-08-21 20:37:58 +02:00
dd8c6a38ff blog 2019-08-21 20:28:12 +02:00
1ae994b1ff Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-21 20:04:18 +02:00
77257ec9c4 a 2019-08-21 20:04:15 +02:00
b61fd6cffb a 2019-08-21 17:41:05 +02:00
e3725f2bed blog 2019-08-21 16:16:59 +02:00
5558ea1684 blog 2019-08-21 16:04:34 +02:00
4af14ffb22 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-21 13:31:22 +02:00
839934a8e7 a 2019-08-21 13:31:10 +02:00
8c7a03d4af Blog 2019-08-21 13:21:15 +02:00
88f3e5e96f Blog 2019-08-20 23:28:48 +02:00
ffbbeba404 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-20 21:13:33 +02:00
6b76b5c0d7 a 2019-08-20 21:13:30 +02:00
9c02b6f127 . 2019-08-20 19:26:42 +02:00
b11c48626c a 2019-08-20 18:39:05 +02:00
aca1bf193b Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-20 17:38:03 +02:00
0c59d2a2fc a 2019-08-20 17:37:53 +02:00
2a00090c87 Dar ponentes similares a otro 2019-08-20 14:10:49 +02:00
e3976cb516 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-19 19:54:42 +02:00
30d231af37 a 2019-08-19 19:54:39 +02:00
ca54913fe0 Borrar un comentario dado su ID 2019-08-19 17:13:27 +02:00
b7b9d90a70 . 2019-08-19 17:05:03 +02:00
cacaa1ac74 . 2019-08-19 16:35:57 +02:00
1406bdcbb4 . 2019-08-18 23:15:34 +02:00
a60ced94dc . 2019-08-18 17:08:18 +02:00
759babd7d5 . 2019-08-17 22:03:00 +02:00
dce06ea5e9 . 2019-08-17 21:41:22 +02:00
517c661337 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-17 14:42:24 +02:00
259eb7e02b a 2019-08-17 14:42:20 +02:00
4425a54e3f . 2019-08-17 14:10:36 +02:00
42a6eefa48 . 2019-08-16 23:27:18 +02:00
4267e3a8c8 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-16 19:49:29 +02:00
5b20d94823 a 2019-08-16 19:49:25 +02:00
5a4be75ee8 . 2019-08-16 19:32:04 +02:00
86ff89e2b5 . 2019-08-16 18:37:13 +02:00
afd69b9da4 . 2019-08-15 23:44:09 +02:00
1771981b2f Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-15 20:09:54 +02:00
890b57f0d3 a 2019-08-15 20:09:50 +02:00
1a06f442c5 Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-15 19:54:23 +02:00
3caa814dd2 . 2019-08-15 19:54:18 +02:00
d7638fcc07 a 2019-08-15 14:33:21 +02:00
86446f2bd3 . 2019-08-14 22:50:04 +02:00
80db8afaeb . 2019-08-14 22:04:48 +02:00
7a84fcd0cd Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api 2019-08-14 19:49:49 +02:00
ac4b36dc59 a 2019-08-14 19:49:38 +02:00
85e222c73d registro de usuario administrador para web admin 2019-08-14 13:50:28 +02:00
c91d9461e1 a 2019-08-13 20:00:27 +02:00
78473f9604 . 2019-08-09 18:41:50 +02:00
a833114060 . 2019-08-09 18:12:57 +02:00