Commit Graph
604 Commits
Author SHA1 Message Date
Matias ff60da9abb Fixing file structure issue 2019-03-19 17:32:25 +01:00
Matias 260be51566 Merge remote-tracking branch 'upstream/develop' 2019-03-19 17:04:10 +01:00
benme 20e7a857da Merge branch 'master' into 'develop'
Adding the copy of the simulator

See merge request advancedalgos/aaweb!5
2019-03-19 15:43:12 +00:00
benme df74ce1b11 Merge branch 'develop' into 'master'
# Conflicts:
#   server.js
2019-03-19 15:42:32 +00:00
Matias ebe5634d25 Adding the copy of the simulator 2019-03-19 16:23:52 +01:00
Luis Fernando Molina aad4f0bbc7 Paula Images 2019-03-04 13:09:02 +01:00
Luis Fernando Molina 5fcc7d58c6 Merge branch 'master' into develop 2019-03-04 12:37:17 +01:00
Unknown 0b5101b387 Events module integration 2019-02-28 14:55:27 +01:00
Luis Fernando Molina 41756ff068 Emojis 2019-02-25 20:39:31 +01:00
Unknown 722ea547b7 Merge remote-tracking branch 'origin/develop' into develop 2019-02-25 12:37:36 +01:00
Luis Fernando Molina 70addda281 New image 2019-02-23 10:15:42 +01:00
Luis Fernando Molina 51f8b4c8d9 Batch of changes made during the develop of Chris and fixing bugs 2019-02-21 21:37:41 +01:00
benme 7ba859a5dc Merge branch 'master' into 'develop'
Keys integration

See merge request advancedalgos/aaweb!1
2019-02-16 23:29:10 +00:00
Matias 7c34639e01 Keys integration 2019-02-16 19:55:44 -03:00
Matias 479523fd92 Merge remote-tracking branch 'origin/develop' 2019-02-16 19:44:41 -03:00
Unknown 0705dd87d1 Merge remote-tracking branch 'origin/develop' into develop 2019-02-14 02:12:49 +01:00
Luis Fernando Molina 026ae12610 Possible Race Condition needed Ecosystem File to be loaded first 2019-02-13 18:12:31 +01:00
Luis Fernando Molina 77d867650a Catching of scripts problem solution. 2019-02-13 12:38:37 +01:00
z@tOr de4d30ef13 Merge pull request #65 from Superalgos/develop
v1.0 Production Realease
2019-02-10 21:43:18 -03:00
mati108@gmail.com 8953933938 Removing hardcoded variables 2019-02-10 17:30:14 -03:00
Barry Low 3343d359b1 Merge branch 'develop' of https://github.com/AdvancedAlgos/AAWeb into develop 2019-01-17 15:39:16 -08:00
Julian Molina 08dd9d9d48 Merge branch 'master' of https://github.com/AdvancedAlgos/AAWeb 2019-01-15 13:55:54 +01:00
Julian Molina 6640377c98 Legal wording 2019-01-15 13:55:44 +01:00
Luis Fernando Molina 8e97637cb7 Updated URL platform api 2018-12-29 07:36:30 +01:00
Luis Fernando Molina a29140515d Unneded files removed 2018-12-29 07:34:03 +01:00
Barry Low e5b1489b0f Merge branch 'develop' of https://github.com/AdvancedAlgos/AAWeb into develop 2018-12-21 08:02:46 -08:00
Luis Fernando Molina f47ff3b832 Pointing to local in a file only used on development 2018-11-17 08:09:25 +01:00
Luis Fernando Molina d20c8794c5 Storage Permissions improved 2018-11-16 13:05:36 +01:00
Luis Fernando Molina ff69195d2e Storage Permissions now at server.config file 2018-11-16 12:56:31 +01:00
Luis Fernando Molina 2a3ec18859 Merge pull request #64 from AdvancedAlgos/develop
Develop got rid of CanvasApp
2018-11-16 12:27:03 +01:00
Luis Fernando Molina fb77bbefa0 Merge branch 'develop' of https://github.com/AdvancedAlgos/AAWebPlatform into develop 2018-11-16 12:23:55 +01:00
Luis Fernando Molina 1127e82ec6 CanvasApp extracted to its own repo 2018-11-16 12:23:51 +01:00
mati108@gmail.com 3e5f5e4579 Pointing to new dev 2018-11-13 15:35:28 -03:00
mati108@gmail.com f44fd54a74 Changes for linux docker container 2018-11-13 15:29:18 -03:00
Luis Fernando Molina faa77d07bd Sahred Secret to create and delete Teams implemented 2018-11-13 14:00:26 +01:00
Luis Fernando Molina 69e0dc4242 Product Cards orders not altered by image loading order 2018-11-10 16:17:23 +01:00
Luis Fernando Molina 79de43da8a TopBar resize implemented 2018-11-07 12:11:57 +01:00
Luis Fernando Molina 539e09e9e1 Positioning of Bottom bar Buttons fixed 2018-11-07 11:58:58 +01:00
Luis Fernando Molina 0891604deb Aesthetic Improvements on the Header and Footer 2018-11-07 11:34:24 +01:00
Luis Fernando Molina e8c5ad96b3 Bots Images at Competition Fixed 2018-11-07 11:05:06 +01:00
Luis Fernando Molina 5aa8d492c3 Background logos Y Margin Added 2018-11-07 10:21:48 +01:00
Luis Fernando Molina 475a9c8968 Panel Products BUG with the visible cards fixed 2018-11-07 10:14:58 +01:00
Luis Fernando Molina 83f448841d Legacy and new Teams Images shown at Product Panel 2018-11-07 09:34:53 +01:00
Luis Fernando Molina 9fcfc017be Images Showing in Products Pannel 2018-11-07 08:53:12 +01:00
Luis Fernando Molina f4a0e88199 Images URL at the context 2018-11-07 08:22:26 +01:00
Luis Fernando Molina f894f192e1 Teams Information grabbed from Teams Modules, ready to get Images URLs 2018-11-07 07:38:50 +01:00
Luis Fernando Molina e66d1ec160 Master App Url at global context 2018-11-07 06:51:14 +01:00
Luis Fernando Molina bf0a7789cf Opaque white background 2018-11-06 16:30:27 +01:00
Luis Fernando Molina 710a79afbb opacity bug fix 2018-11-06 15:19:49 +01:00
Luis Fernando Molina 49ceff98f2 Merge branch 'develop' of https://github.com/AdvancedAlgos/AAWebPlatform into develop 2018-11-06 15:14:08 +01:00