Commit Graph

373 Commits (a1a2a804bf2769e0d5d6b4beaa22d127f1c3df55)

Author SHA1 Message Date
gabrielburnworth a1a2a804bf dep updates 2019-01-07 17:17:24 -08:00
gabrielburnworth 87323e56f9 upgrade joyride 2019-01-07 16:08:48 -08:00
gabrielburnworth 0e19100d74 lock dep versions 2019-01-07 16:06:55 -08:00
Rick Carlino 4248c8fe4a Resolve conflicts in strucutre.sql 2019-01-07 15:04:42 -06:00
Rick Carlino b4a21a5393 Merge branch 'staging' into nightly 2019-01-06 13:28:13 -06:00
Gabriel Burnworth e0658767fd
lock package version 2019-01-04 11:41:11 -08:00
Rick Carlino f3fb3e5074 Remove the other carrot, too 2019-01-02 16:32:41 -06:00
Rick Carlino 95d62bee91 Remove the carrot 2019-01-02 16:16:33 -06:00
gabrielburnworth 00183a86ba variable form updates 2018-12-20 20:52:52 -08:00
Rick Carlino 67b65610b7 Dep upgrades 2018-12-06 11:14:27 -06:00
Rick Carlino 6db2587138 Upgrade deps, remove legacy stuff 2018-11-28 14:11:24 -06:00
gabrielburnworth de8aa1e881 fbjs update 2018-11-27 10:55:07 -08:00
gabrielburnworth 654533ae4b os update updates 2018-11-26 19:39:35 -08:00
Rick Carlino f054f87770 Remove withTimeout and its blinky tests 2018-11-26 09:57:08 -06:00
Rick Carlino 4a2b53a8ac Un skip() in-use tests 2018-11-17 15:06:26 -06:00
Rick Carlino 6583cd2708 Merge conflicts 2018-11-16 13:17:16 -06:00
Rick Carlino d014d1b721 Dep upgrades 2018-11-15 11:24:19 -06:00
Rick Carlino 8686ba3263 v. unstable: Need to add usage_tracker to ResourceIndex 2018-11-13 13:39:48 -06:00
Rick Carlino e0fa3c5182 Upgrade deps 2018-11-13 13:00:59 -06:00
Rick Carlino 9e61d07d0d FBJS upgrade 2018-11-12 16:02:09 -06:00
Rick Carlino 3bca25cd9c Fix type errors 2018-11-12 08:06:34 -06:00
Rick Carlino 8b36f83682
Merge branch 'staging' into fbjs_upgrade 2018-11-05 15:32:29 -06:00
Rick Carlino baaa8f1ec7 JS dep upgrades 2018-11-05 08:35:36 -06:00
Rick Carlino a35c850e3b
Merge branch 'staging' into fbjs_upgrade 2018-11-03 09:51:56 -05:00
Rick Carlino fa689fb076 v6.5.8 2018-11-03 09:50:34 -05:00
gabrielburnworth 314baf3854 differentiate coverage dirs 2018-11-02 12:52:55 -07:00
Rick Carlino 40a72b033e Update rspec deps 2018-11-02 14:03:57 -05:00
Rick Carlino e0c2e3497f WIP 2018-10-29 19:44:42 -05:00
Rick Carlino 2540c25dd0 Moar cleanup, first pass of new resource indexing system 2018-10-29 13:28:01 -05:00
Rick Carlino f789eb76e9 Fix WIP tests 2018-10-26 09:36:56 -05:00
Rick Carlino 934ff13ef3 Update fbjs 2018-10-24 11:12:37 -05:00
Rick Carlino 793c6cf895 Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into sync_object_sequel 2018-10-24 07:43:03 -05:00
gabrielburnworth 656492ea97 fix broken typing 2018-10-23 13:24:06 -07:00
Rick Carlino 24af2ea19f Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into sync_object_sequel 2018-10-23 15:23:13 -05:00
Rick Carlino 062ab436cd Update webpack, too 2018-10-23 14:53:41 -05:00
Rick Carlino 61e660d921 Yay typefixes 2018-10-22 10:35:44 -05:00
Rick Carlino 245f5d0c5a Building a POC; detour for timestamp fields and type issues 2018-10-21 17:34:39 -05:00
Rick Carlino e81ff2ee5e Remove --verbose flag since coveralls works now 2018-10-19 15:01:30 -05:00
Rick Carlino 13369a3716 Add color back to tests 2018-10-19 13:55:56 -05:00
Rick Carlino 08b341f820 Merge conflicts 2018-10-18 11:13:14 -05:00
Rick Carlino 4aa57064b0 WIP - fix webpack / dep issues 2018-10-16 16:35:04 -05:00
Rick Carlino 7d768cea0e See what the `--verbose` flag turns up 2018-10-16 14:19:35 -05:00
gabrielburnworth b8f54df306 tours feature 2018-10-15 16:32:13 -07:00
Rick Carlino 1e04d54992 Merge conflicts 2018-10-14 17:22:45 -05:00
Rick Carlino b011e7930b Upgrade FBJS 2018-10-14 17:19:12 -05:00
Rick Carlino 51d927b9b5 Dep upgrades 2018-10-14 17:02:12 -05:00
Rick Carlino aba2b3f35b Try other things 2018-10-12 14:14:44 -05:00
Rick Carlino b3d1620446 NPM Updates, more memory leak investigation 2018-10-12 13:27:06 -05:00
Rick Carlino 7dd988b310 --runInBand 2018-10-08 14:49:49 -05:00
Rick Carlino 0771a4f5ac Upgrade deps 2018-10-08 11:35:39 -05:00