16713 Commits
Author SHA1 Message Date
Luis Fernando Molina 855416a4cb Merge branch 'master' of https://github.com/AdvancedAlgos/MasterApp 2018-11-06 13:26:06 +01:00
Luis Fernando Molina f9894bcc2e Working Version of Integration with web site style 2018-11-06 13:23:19 +01:00
Julian Molina 5df235ec2f Legal update 2018-11-06 12:19:52 +01:00
Julian Molina 9bf94d6856 Legal update 2018-11-06 12:19:29 +01:00
Julian Molina 6d558aee24 Legal update 2018-11-06 12:19:11 +01:00
Julian Molina 67ebb4d384 Legal update 2018-11-06 12:18:21 +01:00
Julian Molina 822ccd8b22 Legal update 2018-11-06 12:13:46 +01:00
Julian Molina 5c8a1056ab Merge branch 'master' of https://github.com/AdvancedAlgos/UsersModule 2018-11-06 12:07:52 +01:00
Julian Molina c59b2a9eac Legal update 2018-11-06 12:07:45 +01:00
Julian Molina 61cc68ce72 Merge branch 'master' of https://github.com/AdvancedAlgos/TeamsModule 2018-11-06 12:07:07 +01:00
Julian Molina 3143ee4b16 Legal update 2018-11-06 12:07:03 +01:00
Julian Molina 8aed470f02 Merge branch 'master' of https://github.com/AdvancedAlgos/MasterApp 2018-11-06 12:06:36 +01:00
Julian Molina ffaa023dfe Legal update 2018-11-06 12:06:32 +01:00
Julian Molina 10e482b13d Legal update 2018-11-06 12:04:45 +01:00
Nikola Bjelo f3da7110ae Config and apply more linting 2018-11-06 08:53:51 +01:00
Nikola Bjelo 793b52e1d7 Renaming from status to state 2018-11-06 06:43:38 +01:00
Nikola Bjelo 7347d472bd Adding a new mutation for updating event status 2018-11-06 06:38:56 +01:00
Nikola Bjelo c22ff70868 Exporting the create action out of the modaal into a dedicated button 2018-11-06 06:23:10 +01:00
Nikola Bjelo 8b53cf1539 Instoring the status type
.
2018-11-06 05:24:21 +01:00
Nikola Bjelo 59669f23e7 Setting "cache-and-network" as default fetch policy 2018-11-06 04:15:17 +01:00
Nikola Bjelo 59743d7221 Adapting code for new API 2018-11-06 03:38:23 +01:00
Nikola Bjelo b14828655f Installing a clean linter for the frontend 2018-11-06 02:38:16 +01:00
Nikola Bjelo f889f6c93c typo on last commit 2018-11-05 18:44:02 +01:00
Nikola Bjelo 6dd6fac7e6 updating server's package-lock 2018-11-05 16:24:31 +01:00
Nikola Bjelo 43f08bc14b removing participants from event creation 2018-11-05 16:22:44 +01:00
Nikola Bjelo cd2053f2dd Correcting the userId fetching to avoid possible loops 2018-11-05 16:07:32 +01:00
Nikola Bjelo 189a8f1d84 Master refactoring, remove designator field 2018-11-05 15:27:09 +01:00
z@tOr 8384af01d2 Merge pull request #61 from AAVikings/develop
Pointing dev
2018-11-05 09:07:20 -03:00
mati108@gmail.com 9474a4612b Pointing dev 2018-11-05 09:06:12 -03:00
Julian Molina 5ab5b42743 Updating image 2018-11-04 19:01:16 +01:00
Nikola Bjelo 91b1a99598 Stop using soon to be deprecated function 2018-11-04 16:37:05 +01:00
Nikola Bjelo 73e1dbcdb8 Removing userless mutation and adapting CreateEvent with new format 2018-11-04 16:05:07 +01:00
Nikola Bjelo 100119a75b Adding Rules to Event input types 2018-11-04 16:02:31 +01:00
z@tOr a55e2417ca Merge pull request #64 from AAVikings/master
Including aacloud id
2018-11-04 12:02:14 -03:00
mati108@gmail.com 9843376a4b Including aacloud id 2018-11-04 12:01:14 -03:00
Barry Low fcfc741dde Merge pull request #54 from AdvancedAlgos/develop
Server: add module auth with Master API
2018-11-03 15:48:59 -07:00
Barry Low 32eac12dfa Server: add module auth with Master API 2018-11-03 15:48:09 -07:00
z@tOr f4cc44b895 Merge pull request #63 from AAVikings/master
fixing issue with geting user
2018-11-03 16:20:17 -03:00
mati108@gmail.com 4ac01a38b6 fixing issue with geting user 2018-11-03 16:18:25 -03:00
z@tOr 112dadd1d7 Merge pull request #59 from AAVikings/develop
url fixing
2018-11-03 14:35:09 -03:00
mati108@gmail.com 8e26c29c24 url fixing 2018-11-03 14:34:28 -03:00
z@tOr c6ce1e19e4 Merge pull request #62 from nikolabjelo/master
HotFix for reload on expired token when you arrive on a queryless page
2018-11-03 14:05:56 -03:00
z@tOr 3d59124cd3 Merge pull request #53 from nikolabjelo/master
HotFix (untested) adding a preshared key
2018-11-03 14:01:27 -03:00
Nikola Bjelo bfb8e84d84 HotFix for reload on expired token when you arrive on a queryless page 2018-11-03 17:53:20 +01:00
z@tOr b9ab3443b5 Merge pull request #61 from AAVikings/master
Fixing login issue and updating key vaul version
2018-11-03 13:52:13 -03:00
z@tOr c5e29233ac Merge pull request #58 from AAVikings/develop
reducing URL definitions
2018-11-03 13:51:53 -03:00
mati108@gmail.com 2c1fcbdbe8 reducing places for the URL 2018-11-03 13:05:06 -03:00
mati108@gmail.com c3ccf0c5c8 Merge remote-tracking branch 'upstream/develop' into develop 2018-11-03 13:02:01 -03:00
mati108@gmail.com b9278b63e5 reducing URL definitions 2018-11-03 13:01:11 -03:00
mati108@gmail.com 9f4d8ce135 Fixing login issue and updating key vaul version 2018-11-03 12:46:16 -03:00