Commit graph

5059 commits

Author SHA1 Message Date
Rick Carlino b051aa9b8c ✔️ Needs tests 2018-03-01 09:16:14 -06:00
Rick Carlino f1dfc4c2c5 de-webpackify user verification workflow 2018-03-01 09:06:04 -06:00
Rick Carlino e925e2955c Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into activiation_bug 2018-02-28 16:07:06 -06:00
Rick Carlino a1e2dc7088 WIP: Remove verify from webpack bundle 2018-02-28 16:06:53 -06:00
Rick Carlino 93bb59e624
Merge pull request #687 from gabrielburnworth/master
Allow translation of Content and ToolTips
2018-02-28 14:59:33 -06:00
gabrielburnworth f2a3f826c0 allow translation of Content and ToolTips 2018-02-28 12:12:11 -08:00
Rick Carlino 3d3e16d61c
Merge pull request #686 from RickCarlino/pin_bindings_api
Pin Bindings API
2018-02-28 13:10:21 -06:00
Rick Carlino 990c2d4d7b Add models to FE 2018-02-28 11:51:26 -06:00
Rick Carlino b31fea3f88 Test for sequence_id validator 2018-02-28 11:43:52 -06:00
Rick Carlino a39fd6f5b1 Fix foreign key errors in test suite 2018-02-28 11:38:05 -06:00
Rick Carlino d4ded90072 Mostly working pin_binding api endpoint 2018-02-28 11:08:41 -06:00
Rick Carlino 37a714f199 Begin pinbinding table work 2018-02-28 09:05:38 -06:00
Rick Carlino 1b72f1dfd4
Merge pull request #685 from RickCarlino/user_envs
Fix blinky test
2018-02-28 08:43:55 -06:00
Rick Carlino 8e3acc2364
Merge branch 'staging' into user_envs 2018-02-28 08:34:03 -06:00
Rick Carlino c5d4cb6362 Fix blinky test 2018-02-28 08:13:35 -06:00
Rick Carlino ab9ff829c8
Merge pull request #684 from RickCarlino/user_envs
Store Custom Device Configs on API
2018-02-27 18:13:37 -06:00
Rick Carlino c488320091 Light i18n changes 2018-02-27 15:24:15 -06:00
Rick Carlino 73a21d6df1 Merge branch 'staging' of https://github.com/DDDIM/Farmbot-Web-App into ru_i18n_part_ii 2018-02-27 14:55:26 -06:00
Rick Carlino ae6e30cbbb Specs and dead code elimination 2018-02-27 14:37:36 -06:00
Rick Carlino 921c5bee81 Add DeviceConfigs to FE 2018-02-27 14:20:34 -06:00
Rick Carlino 2e7db6760e Specs for backend 2018-02-27 14:13:22 -06:00
Rick Carlino 1eb3ee960e
Merge branch 'staging' into staging 2018-02-27 14:08:41 -06:00
Rick Carlino fd5aea8013 Add DeviceConfigs. NEXT: Tests, FE Integration 2018-02-27 13:15:02 -06:00
DDDIM b846c3c731 Merge branch 'staging' of https://github.com/DDDIM/Farmbot-Web-App into staging
?
2018-02-27 20:50:51 +03:00
DDDIM b0afb3d7cb trying to add multilanguage support 2018-02-27 20:49:37 +03:00
Rick Carlino 3a25110c8b WIP 2018-02-27 10:02:35 -06:00
Rick Carlino 7f4d7733e8 Slight change: Don't call overwrite() if step has not changed 2018-02-26 16:27:30 -06:00
Rick Carlino a65ba3a0f2
Merge pull request #682 from RickCarlino/ru_i18n
Russian Translations (Thanks, @DDDIM)
2018-02-26 14:15:00 -06:00
Rick Carlino dd99b0689a Syntax fix 2018-02-26 13:43:18 -06:00
Rick Carlino 9005f40d66 Merge branch 'staging' of https://github.com/DDDIM/Farmbot-Web-App into ru_i18n 2018-02-26 13:40:21 -06:00
Rick Carlino cb6389acc1
Merge pull request #681 from RickCarlino/backend_farmwares_thin
Track Farmware installation on Backend
2018-02-26 13:39:02 -06:00
Rick Carlino 590a71e19d Add FarmwareInstallation to reducers 2018-02-26 11:53:41 -06:00
Rick Carlino 2feedb43d2 API Side: ✔️ 2018-02-26 11:40:36 -06:00
Rick Carlino 985b308c1a API Side: ✔️ 2018-02-26 11:40:26 -06:00
Rick Carlino 73bd6eece6 FarmwareInstallations#create 2018-02-26 11:20:38 -06:00
Rick Carlino f3e008e056 Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into staging 2018-02-26 09:14:08 -06:00
Rick Carlino a8c80eb790 Update application.yml 2018-02-26 09:13:54 -06:00
Rick Carlino 2b1c3afbfb
Merge branch 'staging' into staging 2018-02-26 08:33:28 -06:00
Rick Carlino 2f596a980a
Merge pull request #679 from RickCarlino/sunday
Add Capybara (Integration Suite)
2018-02-26 08:33:13 -06:00
Rick Carlino c18a83a9df Rebuild 2018-02-26 08:24:16 -06:00
DDDIM 5133fdf8f4 1 2018-02-26 16:55:25 +03:00
DDDIM a093c84ba0 1 2018-02-26 16:50:41 +03:00
Rick Carlino 00cbf98a30 Prevent blinky tool test 2018-02-25 12:48:32 -06:00
Rick Carlino 051e74ec94 Updates to capybara settings 2018-02-25 12:41:50 -06:00
Rick Carlino 279cf24b84 ✔️ TODO: See if configs can be simplified. 2018-02-25 12:23:33 -06:00
Rick Carlino 9a8272615e Webdrive works. NEXT: Ignore features/ dir unless RUN_CAPYBARA is true 2018-02-25 11:59:28 -06:00
Rick Carlino fd2fb9d34c More unit tests. Next: Integration test suite? 2018-02-25 09:44:05 -06:00
Rick Carlino 4b719c15e4 Add more tests, remove unreachable code 2018-02-25 09:06:47 -06:00
Rick Carlino b1a0376669
Merge pull request #678 from DDDIM/patch-1
Update ru.js
2018-02-25 08:17:52 -06:00
DDDIM 57391efd67
Update ru.js
Proposing update of Russian translation
2018-02-24 16:04:15 +03:00