Commit Graph
397 Commits
Author SHA1 Message Date
z@tOr fac92c71e5 Merge pull request #135 from AAVikings/develop
Adding operations client
2018-12-27 09:38:19 -03:00
mati108@gmail.com 26d0dd1d06 Adding operations client 2018-12-27 09:34:44 -03:00
z@tOr 697b55b3d0 Merge pull request #134 from AAVikings/develop
Removing extra log line
2018-12-27 09:33:59 -03:00
mati108@gmail.com d068a53a48 Removing extra log line 2018-12-27 09:33:25 -03:00
z@tOr e1a035187a Merge pull request #133 from AAVikings/develop
Adding changes for operations module
2018-12-26 19:21:00 -03:00
z@tOr 4a8aca6a21 Merge branch 'develop' into develop 2018-12-26 19:20:50 -03:00
mati108@gmail.com 37d8bf1901 Adding changes for operations module 2018-12-26 19:16:51 -03:00
Barry Low ffd16d56e5 Merge pull request #132 from Algoteers/feature/fb-menu
Shorten Financial Being menu title
2018-12-18 22:57:19 -08:00
Barry Low 5b93a3e7ae Shorten Financial Being menu title 2018-12-18 18:38:14 -08:00
Barry Low 9796a4f5f3 Merge pull request #131 from algorithms-anonymous/master
Integrate Financial Beings
2018-12-18 18:34:32 -08:00
Vladimir Jovanovic 814f37d750 Remove unnecessary import 2018-12-17 20:06:58 +01:00
Vladimir Jovanovic b59086326d Merge remote-tracking branch 'origin/master' 2018-12-17 19:49:02 +01:00
Vladimir Jovanovic af9c210f91 Remove constants 2018-12-17 19:47:56 +01:00
V 1feacd6ab1 Merge pull request #4 from algorithms-anonymous/develop
Integrate Financial Beings
2018-12-17 19:10:14 +01:00
Vladimir Jovanovic 10303b4f16 Merge master to develop 2018-12-17 19:09:38 +01:00
Vladimir Jovanovic 00b23d21f2 Integrate Financial Beings 2018-12-17 19:04:19 +01:00
V 605448f86d Merge pull request #3 from AdvancedAlgos/develop
Merge MasterApp develop branch to master branch of our fork
2018-12-17 18:56:00 +01:00
Barry Low f9ff01fe4e Merge pull request #130 from Algoteers/feature/client-update-notifications
Feature/client update notifications
2018-12-17 09:22:56 -08:00
Barry Low cd85716e1a Update Changelog 2018-12-17 08:27:47 -08:00
Barry Low 90f6ed6ab6 Update signup data responses 2018-12-17 08:25:06 -08:00
Barry Low 4411bd296f Merge branch 'develop' of https://github.com/AdvancedAlgos/MasterApp into develop 2018-12-16 19:59:25 -08:00
Barry Low be3ef8093d Merge branch 'bug/update-material-ui' into develop 2018-12-16 19:59:14 -08:00
Barry Low 37f44a4298 Merge pull request #129 from Algoteers/bug/update-material-ui
Upgrade material-ui + webcomponents
2018-12-16 19:58:40 -08:00
Barry Low 2656b4da02 Upgrade material-ui + webcomponents 2018-12-16 19:57:38 -08:00
Barry Low 0660f4721f Merge pull request #128 from Algoteers/feature/client-notifications
Update email-verification graphql to notifications module
2018-12-16 19:05:31 -08:00
Barry Low 01e5f06b88 Update email-verification graphql to notifications module 2018-12-16 19:04:30 -08:00
Barry Low f84cefa84f Merge pull request #127 from Algoteers/feature/notifications-module
Feature/notifications module
2018-12-16 18:34:46 -08:00
Barry Low ce9d12d2f2 Remove Sendgrid Mutations 2018-12-14 22:20:47 -08:00
Barry Low 6307cb3e64 Add Changelog 2018-12-14 22:17:00 -08:00
Barry Low 610cdef115 Add notifications module 2018-12-14 19:42:57 -08:00
Barry Low 353aee8b0a Update .env.sample 2018-12-13 12:50:57 -08:00
Barry Low 7a5123ea72 Merge pull request #126 from Algoteers/bug/footer-links
Fixed footer links
2018-12-06 22:47:46 -08:00
Barry Low c974c31ea2 Fixed footer links 2018-12-06 22:46:36 -08:00
Barry Low 607b4bc2c2 Merge pull request #125 from Algoteers/feature/team-web-components-updates
Teams 0.0.32 + WebComponent 0.0.17
2018-12-06 22:34:54 -08:00
Barry Low 26ff478ddc Teams 0.0.32 + WebComponent 0.0.17 2018-12-06 22:32:08 -08:00
z@tOr d5bc5dda94 Merge pull request #118 from AAVikings/develop
Removing unused config
2018-11-24 11:15:51 -03:00
mati108@gmail.com b07848c447 Removing unused config 2018-11-24 11:15:06 -03:00
z@tOr 086bfb6852 Merge pull request #115 from AAVikings/develop
Inside IFRAMES the onload event is reaised before the window has its …
2018-11-22 18:48:28 -03:00
mati108@gmail.com 516e0a33db Inside IFRAMES the onload event is reaised before the window has its real size. 2018-11-22 18:47:50 -03:00
z@tOr 0355b829aa Merge pull request #114 from AAMasters/develop
Bug fixed on resize Canvas App running on iframe
2018-11-22 16:55:15 -03:00
Luis Fernando Molina 596eb7b59c Error handling for onResize of the Canvas App 2018-11-22 20:51:38 +01:00
Luis Fernando Molina edb58b7999 Merge remote-tracking branch 'upstream/develop' into develop 2018-11-22 20:49:10 +01:00
z@tOr b4fc22f472 Merge pull request #112 from AAVikings/develop
Adapting to new dev environment.
2018-11-21 14:21:38 -03:00
mati108@gmail.com b77ba03a15 Adapting to new dev environment. 2018-11-21 14:20:34 -03:00
Barry Low 271fee9d14 Merge pull request #111 from Algoteers/feature/unset-fb
Temporarily unset FB module
2018-11-20 22:33:56 -08:00
Barry Low 9049600212 Temporarily unset FB module 2018-11-20 22:32:40 -08:00
Barry Low 9263ecd6af Merge pull request #110 from Algoteers/feature/git-feature-teams-0.0.30
Client: Teams 0.0.30
2018-11-19 11:23:10 -08:00
Barry Low 3040336ecd Client: Teams 0.0.30 2018-11-19 11:22:17 -08:00
Barry Low 35281f3ccb Merge pull request #109 from algorithms-anonymous/develop
Initial MasterApp integration for Financial Beings Module
2018-11-19 11:19:10 -08:00
Barry Low 328fc86200 Merge branch 'develop' into develop 2018-11-19 11:18:41 -08:00