Commit Graph
622 Commits
Author SHA1 Message Date
Matias c077a8798f Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-27 11:56:03 +01:00
benme 7c4fc27481 Merge pull request #4 from AAVikings/develop
Changing default daily files data dependency config
2019-03-27 10:38:18 +01:00
Matias 67ad17177c Changing default daily files data dependency config 2019-03-27 10:37:27 +01:00
Matias 2ec9d778d2 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-27 10:23:56 +01:00
benme 3246019721 Merge pull request #3 from AAMasters/develop
Bug Fix, missing /@Year/@Month/@Day on Daily Files path when making c…
2019-03-27 08:41:35 +01:00
Luis Fernando Molina 462780a558 Bug Fix, missing /@Year/@Month/@Day on Daily Files path when making compy from the template 2019-03-27 08:28:17 +01:00
benme dcbfca99ca Merge pull request #2 from AAVikings/develop
Fixing Daily files
2019-03-26 19:54:42 +01:00
Matias de26391096 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-26 19:54:06 +01:00
benme 67283adc33 Merge pull request #1 from AAMasters/develop
Execution of Bots in the Browser Functionality Removed
2019-03-26 19:53:31 +01:00
Matias 522f3e2c48 Fixing Daily files 2019-03-26 19:50:57 +01:00
Luis Fernando Molina 4411b31e58 Execution of Bots in the Browser Functionality Removed 2019-03-26 14:19:19 +01:00
Luis Fernando Molina 862e8f8fee Update README.md 2019-03-25 11:30:13 +01:00
Luis Fernando Molina ace2464c21 Update README.md 2019-03-25 11:16:56 +01:00
Luis Fernando Molina b86c55ec97 Saira Font Added 2019-03-22 17:30:48 +01:00
Luis Fernando Molina 50bfcd1af7 Tab Button 2019-03-20 23:40:08 +01:00
Luis Fernando Molina b603638a59 Logos of AA replaced for logos of SA 2019-03-19 21:39:16 +01:00
benme 5c7db5453f Merge branch 'master' into 'develop'
Fixing integration issues

See merge request advancedalgos/aaweb!6
2019-03-19 16:33:34 +00:00
Matias 24325d3c48 Fixing new simulator name 2019-03-19 17:32:45 +01:00
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