Commit Graph

7435 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 0c8c7a8d54
Merge pull request #1080 from RickCarlino/nightly
Merge `nightly` branch into `staging`.
2019-01-07 15:35:14 -06:00
Rick Carlino e0e2540bef Re-run migrations 2019-01-07 15:06:02 -06:00
Rick Carlino 14c64943a3 Merge branch 'master' of github.com:FarmBot/Farmbot-Web-App into nightly 2019-01-07 15:05:44 -06:00
Rick Carlino 4248c8fe4a Resolve conflicts in strucutre.sql 2019-01-07 15:04:42 -06:00
Rick Carlino dce91cdcc3
Merge pull request #1078 from FarmBot/staging
v7.1.1 - Happy Hibiscus
2019-01-07 14:49:17 -06:00
Rick Carlino 2633d1729a
Merge pull request #1077 from RickCarlino/recovery_deploy
Recovery Deploy
2019-01-07 11:03:36 -06:00
Rick Carlino 4a5550f85c Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into recovery_deploy 2019-01-07 10:40:09 -06:00
Rick Carlino b4a21a5393 Merge branch 'staging' into nightly 2019-01-06 13:28:13 -06:00
Rick Carlino 4e5348664d
Merge pull request #1075 from gabrielburnworth/staging
Minor bug fixes part 2
2019-01-05 10:53:33 -06:00
gabrielburnworth f2571ad3cb os update button fix part 2 2019-01-04 13:26:52 -08:00
Rick Carlino 2f6123d337
Merge pull request #1074 from gabrielburnworth/staging
Minor bug fixes
2019-01-04 14:27:25 -06:00
Gabriel Burnworth e0658767fd
lock package version 2019-01-04 11:41:11 -08:00
gabrielburnworth 189e20c7a2 os update button updates 2019-01-04 11:31:28 -08:00
Rick Carlino 2e94fc61bc Get coverage back to 💯% 2019-01-04 08:18:02 -06:00
Rick Carlino f57ac121c3 Minor changes (fixes `tag` related 500) 2019-01-03 16:48:57 -06:00
Rick Carlino 5e46edc1fb Migrate away from DeviceSerialNumber table CC: @connorrigby 2019-01-03 15:49:40 -06:00
Rick Carlino e0efa1ee27 return rather than raise 2019-01-03 11:41:52 -06:00
Rick Carlino 1b309ddf15 Add application-layer uniqueness validation (No DB-level constraint yet) 2019-01-03 09:54:48 -06: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
Rick Carlino 14a28ae287 ✔️ 2019-01-02 14:46:10 -06:00
Rick Carlino 4f4c774941 Gnarly naming convention collision. 2019-01-02 14:37:48 -06:00
Rick Carlino 5686fbaf31 WIP: Strange serialization error? 2019-01-02 13:44:53 -06:00
Rick Carlino 059277ae85 WIP: Upgrade bundler deps. 2019-01-02 10:35:08 -06:00
gabrielburnworth b7541606d7 farmEvent form updates 2018-12-30 12:48:37 -08:00
gabrielburnworth 458f9d8279 dev updates 2018-12-30 10:13:07 -08:00
gabrielburnworth 0d9ac0628f use default placeholder image 2018-12-30 10:04:24 -08:00
Rick Carlino 5ce374f379
Merge pull request #1073 from RickCarlino/nightly
Minor Changes
2018-12-27 13:45:15 -06:00
Rick Carlino bd1dabacbb Minor verbiage and formatting changes 2018-12-27 13:02:36 -06:00
Rick Carlino 6211911ef5 Fix bug #2 on the bug list 2018-12-27 11:23:04 -06:00
Rick Carlino 549dfb5870 Improve seeds.rb to use correct openfarm_slug 2018-12-27 10:33:09 -06:00
Rick Carlino c72bec8435 :thinking_face: Remove `delete viewModel.body;` 2018-12-26 15:47:05 -06:00
Rick Carlino 9d2325774e Make `body` mandatory moving forward. 2018-12-26 15:26:08 -06:00
Rick Carlino 2b67512ddc Runtime errors (500) 2018-12-26 14:57:20 -06:00
Rick Carlino 8969da174b Uncurry addOrEditVarDeclaration. 2018-12-26 12:00:41 -06:00
Rick Carlino 1d311f15df
Merge pull request #1072 from RickCarlino/friday
Minor Changes
2018-12-21 14:25:12 -06:00
Rick Carlino eb088e38f3 Increase CSS height for easier accesibility 2018-12-21 14:03:40 -06:00
Rick Carlino 80587c2d50 Remove placehold.it default (sorry) 2018-12-21 13:46:35 -06:00
Rick Carlino 25d43bd1b2 Add <DevMode/> 2018-12-21 12:58:17 -06:00
Rick Carlino 162b988159
Merge pull request #1071 from gabrielburnworth/variable_forms
variable form updates
2018-12-21 09:23:10 -06:00
gabrielburnworth 00183a86ba variable form updates 2018-12-20 20:52:52 -08:00
Rick Carlino 02baafb222
Add fragment table + FarmEvent parameters. 2018-12-20 14:40:45 -06:00
Rick Carlino 2872706db9
Merge pull request #1069 from gabrielburnworth/staging
Fix minor typos
2018-12-18 12:50:59 -06:00
gabrielburnworth f5a6cd62cd fix minor typos 2018-12-18 10:25:17 -08:00
Rick Carlino 436a3a2511
Merge pull request #1068 from FarmBot/staging
v7.1.0 - Happy Hibiscus
2018-12-18 10:49:33 -06:00
gabrielburnworth aace6d66f5 add missing seq/reg select 2018-12-14 16:35:50 -08:00
Rick Carlino 6253e2e11d
Merge pull request #1067 from RickCarlino/n_plus_one_sync
Fix "echo" in Auto Sync
2018-12-14 08:31:25 -06:00