Commit Graph

8060 Commits (0af336e42a36ced71e1064a657e74292fc553615)

Author SHA1 Message Date
Rick Carlino e7bf038bee Update rack middleware config 2019-04-17 13:48:54 -07:00
gabrielburnworth 412a46415c add force unlock config 2019-04-17 12:40:04 -07:00
gabrielburnworth cb44640ca5 misc fixes 2019-04-17 12:39:56 -07:00
Rick Carlino 83d9cb8287
Merge pull request #1157 from gabrielburnworth/staging
Misc additions
2019-04-16 10:49:55 -07:00
gabrielburnworth 45908ff660 add messages 2019-04-16 10:14:52 -07:00
gabrielburnworth beee68850a add microsteps 2019-04-16 10:01:27 -07:00
gabrielburnworth 08259b0ab1 misc updates 2019-04-16 10:00:00 -07:00
Rick Carlino 6d68f73fbe
Merge pull request #1156 from RickCarlino/microsteps
Microstep migrations
2019-04-16 08:58:51 -07:00
Rick Carlino 88b18b20d8 Microstep migrations 2019-04-16 08:30:52 -07:00
Rick Carlino 36829ccd18
Merge pull request #1155 from RickCarlino/verbiage
Verbiage updates: Tools => "Tools and Seed Containers"
2019-04-15 19:53:26 -07:00
Rick Carlino ee23635dd0 updates to tests 2019-04-15 19:11:35 -07:00
Rick Carlino a9b6492823 Verbiage updates: Tools => "Tools and Seed Containers" 2019-04-15 18:23:58 -07:00
Rick Carlino c163cb13dd
Merge pull request #1154 from RickCarlino/slo_visit
Password Reset Fix
2019-04-15 16:14:03 -07:00
Rick Carlino 323fd29a8e Add tests for UserMailer URL generation helpers 2019-04-15 15:55:10 -07:00
Rick Carlino c21fb485bb More cleanup 2019-04-15 15:35:30 -07:00
Rick Carlino f0edeac404 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into slo_visit 2019-04-15 15:35:05 -07:00
Rick Carlino 91f4237a88 👍 2019-04-15 15:25:52 -07:00
Rick Carlino 8e11c42a90 Needs tests, QA 2019-04-15 14:56:46 -07:00
Rick Carlino 828a5aef27 WIP 2019-04-15 14:39:18 -07:00
Rick Carlino b6f0a46631
Merge pull request #1150 from RickCarlino/time_format_24_hour
Create account seed hint when user signs up
2019-04-15 11:20:09 -07:00
Rick Carlino 76d3938cc3
Merge branch 'staging' into time_format_24_hour 2019-04-15 11:00:59 -07:00
Rick Carlino ca8b9d2f83 Remove rollbar 2019-04-13 20:25:29 -07:00
Rick Carlino e2ae388b6d Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into time_format_24_hour 2019-04-13 19:52:58 -07:00
Rick Carlino 8faf0168cf
Merge pull request #1151 from gabrielburnworth/staging
FE updates
2019-04-13 11:52:17 -05:00
gabrielburnworth ea039789f5 add API enigmas to FE 2019-04-12 19:50:25 -07:00
gabrielburnworth 27c0efd980 web app config updates 2019-04-12 19:50:10 -07:00
Rick Carlino 8574ae35ab Merge branch 'time_format_24_hour' of github.com:RickCarlino/farmbot-web-app into time_format_24_hour 2019-04-12 17:56:17 -05:00
Rick Carlino bccace1286 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into time_format_24_hour 2019-04-12 17:55:11 -05:00
Rick Carlino 11f89fa111 Run migrations 2019-04-12 17:55:03 -05:00
Rick Carlino cc2d40f8bf
Merge branch 'staging' into time_format_24_hour 2019-04-12 17:40:37 -05:00
Rick Carlino 4b7b068e7e
Merge pull request #1149 from RickCarlino/verbiage_updates
Update Verbiage
2019-04-12 17:40:22 -05:00
Rick Carlino 66f6c858dd Update verbiage 2019-04-12 17:19:54 -05:00
Rick Carlino 4b18163fbf Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into time_format_24_hour 2019-04-12 14:47:32 -05:00
Rick Carlino b308c5ed64 Add Enigma at time of account creation 2019-04-12 14:47:20 -05:00
Rick Carlino 5b737273da More tests 2019-04-12 13:52:53 -05:00
Rick Carlino e6610eb8b1
Merge pull request #1148 from gabrielburnworth/staging
Misc fixes
2019-04-12 13:51:07 -05:00
gabrielburnworth aeeeea3808 fix spec 2019-04-11 23:43:02 -07:00
gabrielburnworth f303c27ce5 misc UI fixes 2019-04-11 23:01:51 -07:00
gabrielburnworth 8c053b2388 alerts fixes 2019-04-11 23:01:48 -07:00
Rick Carlino 0d3fea0adf
Merge pull request #1147 from RickCarlino/time_format_24_hour
Stub out Enigmas controller
2019-04-11 17:04:48 -05:00
Rick Carlino 133a2a7e78 Stub out Enigmas controller 2019-04-11 16:03:14 -05:00
Rick Carlino 5fc55b3649
Merge pull request #1146 from RickCarlino/time_format_24_hour
FBJS upgrades + changes to relevant interfaces
2019-04-10 20:40:38 -05:00
Rick Carlino 5319e48d58 FBJS upgrades + changes to relevant interfaces 2019-04-10 16:52:02 -05:00
Rick Carlino ed5b4b1a94
Merge pull request #1145 from RickCarlino/seed_data
Stub out Devices#seed endpoint
2019-04-10 16:14:20 -05:00
Rick Carlino 80ed4aad36
Merge branch 'staging' into seed_data 2019-04-10 15:43:38 -05:00
Rick Carlino 42e5d85171 Stub out Devices#seed endpoint 2019-04-10 15:40:31 -05:00
gabrielburnworth 30ee97d172 minor color adjustment 2019-04-10 12:18:48 -07:00
Rick Carlino d29f3ef459
Merge pull request #1144 from gabrielburnworth/staging
Updates
2019-04-10 09:52:45 -05:00
gabrielburnworth 1e92fe11bc fix linter error 2019-04-09 23:18:18 -07:00
gabrielburnworth 22d54c1c44 misc minor bug fixes 2019-04-09 23:02:39 -07:00