|
|
48988304c3
|
Merge branch 'develop' into feat/kahoot
|
2021-07-14 08:48:28 +02:00 |
|
|
|
9e99234bf6
|
Merge branch 'develop' into feat/kahoot
|
2021-07-12 08:21:31 +02:00 |
|
|
|
11541d3388
|
Merge branch 'develop' into feat/kahoot
|
2021-07-05 09:59:08 +02:00 |
|
|
|
3de6ef5d47
|
Merge branch 'develop' into feat/kahoot
|
2021-07-01 14:20:00 +02:00 |
|
|
|
84fa77ff3e
|
Merge branch 'develop' into feat/kahoot
|
2021-06-30 22:36:55 +02:00 |
|
|
|
4bae2d3c14
|
Merge branch 'develop' into feat/kahoot
|
2021-06-30 20:14:20 +02:00 |
|
|
|
d6e4184f33
|
Merge branch 'develop' into feat/kahoot
|
2021-06-24 18:27:52 +02:00 |
|
|
|
783ac0c602
|
Merge branch 'develop' into develop
|
2021-06-14 16:44:19 +02:00 |
|
|
|
b32fdce8bd
|
Merge branch 'develop' into develop
|
2021-06-04 14:57:10 +02:00 |
|
|
|
0c2b4c55b0
|
Merge branch 'develop' into develop
|
2021-05-26 08:41:10 +02:00 |
|
|
|
0a9fa43f77
|
Merge branch 'develop' into develop
|
2021-05-25 14:45:09 +02:00 |
|
|
|
b1d71b6e9c
|
Merge branch 'develop' into develop
|
2021-05-19 12:19:28 +02:00 |
|
|
|
9c8f83b3e4
|
Merge branch 'develop' into develop
|
2021-05-14 16:51:40 +02:00 |
|
|
|
0e568e9803
|
Merge branch 'develop' into develop
|
2021-05-13 16:58:51 +02:00 |
|
|
|
3b55e70cd0
|
Merge branch 'develop' into develop
|
2021-05-12 17:32:23 +02:00 |
|
|
|
f05c244a96
|
Merge branch 'develop' into develop
|
2021-05-12 17:09:03 +02:00 |
|
|
|
c2eef7fb84
|
Merge branch 'develop' into develop
|
2021-05-05 18:33:43 +02:00 |
|
|
|
8f185662de
|
Merge branch 'develop' into develop
|
2021-04-28 18:54:41 +02:00 |
|
|
|
4b6dbd3a52
|
Merge branch 'develop' into develop
|
2021-04-22 17:08:37 +02:00 |
|
|
|
57e251aedd
|
Merge branch 'develop' into develop
|
2021-04-09 17:33:00 +02:00 |
|
|
|
a7c6c89f18
|
Merge branch 'develop' into develop
|
2021-03-26 13:18:39 +01:00 |
|
|
|
968a15fd15
|
Merge branch 'develop' into develop
|
2021-03-19 08:11:20 +01:00 |
|
|
|
bdb7ca4a91
|
Merge branch 'develop' into develop
|
2021-03-12 14:25:12 +01:00 |
|
|
|
a244b4fb11
|
Merge branch 'develop' into develop
|
2021-03-02 18:21:53 +01:00 |
|
|
|
ebd5013bbb
|
Merge branch 'develop' into develop
|
2021-02-21 21:50:29 +01:00 |
|
|
|
06690fa2e6
|
Merge branch 'develop' into develop
|
2021-02-21 21:35:04 +01:00 |
|
|
|
1dd641e2e4
|
Merge branch 'master' into SergioDiazRueda-develop
|
2020-12-19 15:05:03 +01:00 |
|
|
|
02799e3593
|
Merge branch 'develop' into SergioDiazRueda-develop
|
2020-12-17 19:53:45 +01:00 |
|
|
|
fc91a31e33
|
Merge branch 'develop' into SergioDiazRueda-develop
|
2020-12-15 21:28:58 +01:00 |
|
|
|
0477cdd276
|
Merge branch 'develop' into SergioDiazRueda-develop
|
2020-12-14 20:32:01 +01:00 |
|
|
|
8ebf41091e
|
Update Build Tools to 30.0.3
|
2020-12-12 23:40:26 +01:00 |
|
|
|
da18d76038
|
Update Build Tools to 30.0.3
|
2020-12-12 23:28:41 +01:00 |
|
|
|
1632df151a
|
Merge branch 'develop' into SergioDiazRueda-develop
|
2020-12-04 14:21:49 +01:00 |
|
|
|
fdafb0624d
|
Merge branch 'develop' into develop
|
2020-11-13 08:03:19 +01:00 |
|
|
|
40a4fd7e4b
|
Merge branch 'develop' into develop
|
2020-11-11 09:58:58 +01:00 |
|
|
|
d825233335
|
UI improvements
|
2020-11-09 21:09:40 +01:00 |
|
|
|
8f9d69eded
|
UI improvements
|
2020-11-07 12:04:53 +01:00 |
|
|
|
f75c2807f4
|
Merge branch 'develop' into SergioDiazRueda-develop
|
2020-10-29 18:17:47 +01:00 |
|
|
|
5c8e2a6d00
|
Fix misspelling
|
2020-10-17 20:44:30 +02:00 |
|
|
|
ccecd56431
|
Code style improvements
|
2020-10-17 20:27:10 +02:00 |
|
|
|
b8980c7153
|
Code style improvements
|
2020-10-17 19:50:06 +02:00 |
|
|
|
b82e2dbf09
|
Remove old matches
|
2020-10-17 19:48:13 +02:00 |
|
|
|
bebcddc34e
|
Code style improvements
|
2020-10-15 21:55:53 +02:00 |
|
|
|
9a20546a79
|
Code style improvements
|
2020-10-15 21:43:00 +02:00 |
|
|
|
2eab728c13
|
Merge branch 'develop' into develop
|
2020-10-15 18:28:22 +02:00 |
|
|
|
aed0fc60c4
|
Merge branch 'develop' into develop
|
2020-10-14 23:17:14 +02:00 |
|
|
|
f295a010b3
|
Merge branch 'develop' into develop
|
2020-10-14 22:19:23 +02:00 |
|
|
|
425857ac15
|
Merge branch 'develop' into develop
|
2020-10-14 22:16:34 +02:00 |
|
|
|
3ab9147c44
|
Merge remote-tracking branch 'SergioDiazRueda/develop' into SergioDiazRueda-develop
# Conflicts:
# SWADroid/src/main/res/values-es/strings.xml
# SWADroid/src/main/res/values/strings.xml
|
2020-10-14 20:01:46 +02:00 |
|
|
|
a7dac0a1cc
|
Merge branch 'develop' into SergioDiazRueda-develop
# Conflicts:
# SWADroid/src/main/java/es/ugr/swad/swadroid/Constants.java
# SWADroid/src/main/res/values/icons.xml
|
2020-10-14 20:00:14 +02:00 |
|
|
|
aa31230032
|
Merge branch 'develop' into develop
|
2020-10-13 20:01:55 +02:00 |
|
|
|
28f0cf14b8
|
Apply suggestions from code review
|
2020-10-13 20:00:43 +02:00 |
|
SergioDiazRueda
|
c874268e2b
|
games
|
2020-09-19 00:27:16 +02:00 |
|
