spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity
1,572 Commits
35 Branches
79 Tags
40 MiB
Commit Graph

1572 Commits (82a2841064f4e3a8344457aa6fc03a28fb662d7a)

Author SHA1 Message Date
connor rigby 8c8dd665c0 Merge branch 'master' of github.com:FarmBot/Farmbot-Web-API 2016-12-06 13:29:35 -08:00
connor rigby a5ab5b606f f 2016-12-06 13:29:29 -08:00
Rick Carlino 15261c9ae9 First draft of logs endpoint 2016-12-06 14:53:12 -06:00
Rick Carlino 1634c1c28f For real this time, fix (and tests) for bug. 2016-12-06 14:00:08 -06:00
Rick Carlino 25bbad49fc Fix tools#create 2016-12-06 13:48:01 -06:00
Rick Carlino b52fa51bd7 Logs#index 2016-12-06 13:31:37 -06:00
Rick Carlino 2039072021 Did I say 2.3.0? I meant 2.4.0... 2016-12-06 13:19:05 -06:00
Rick Carlino 91ed65ec26 [UNSTABLE] Scaffold out most of the logs API endpoint 2016-12-06 12:58:46 -06:00
Rick Carlino b66306338a tool.rb tests 2016-12-06 09:54:36 -06:00
Rick Carlino ce2cfcfb0b Authorization 2016-12-06 09:42:02 -06:00
connor rigby e7295dd72f Merge branch 'master' of https://github.com/RickCarlino/farmbot-web-app 2016-12-06 07:32:08 -08:00
connor rigby 097a8cfe60 uh 2016-12-06 07:32:04 -08:00
Rick Carlino dc2bcd1747 Add MySQL2 gem to gemfile for Dokku users 2016-12-06 08:04:08 -06:00
Rick Carlino 7ca468bb85 Add MySQL gem to gemfile for Dokku users 2016-12-06 07:57:14 -06:00
Rick Carlino 4526ccd9db Merge conflicts 2016-12-06 07:47:31 -06:00
Rick Carlino 5bfc699662 Merge pull request #300 from Br3nda/bw/rails-updates 
Update to new rails validators
 2016-12-05 20:32:59 -06:00
Brenda Wallace c40d29f5e5 Travis will install front end, before running test 2016-12-06 02:26:34 +00:00
Brenda Wallace 5c222c67d5 Merge remote-tracking branch 'upstream/master' into bw/rails-updates 2016-12-06 02:03:33 +00:00
Rick Carlino 81a970481c [STABLE] Endpoints work again. 2016-12-05 17:54:36 -06:00
connor rigby 81118741d2 no 2016-12-05 15:50:25 -08:00
Rick Carlino ea751d562a Make fields optional on API 2016-12-05 15:44:04 -06:00
Rick Carlino 7ed70a508f Temp fix for Tools#destroy 2016-12-05 14:45:06 -06:00
Rick Carlino ccd0313485 Redeploy 2016-12-05 13:41:04 -06:00
Rick Carlino 56449bb1f0 Temp fix for tools endpoint 2016-12-05 13:21:04 -06:00
Rick Carlino 3e90e9e792 Redeploy 2016-12-05 12:36:05 -06:00
Rick Carlino 7edffe8835 Token Expirations 2016-12-05 10:54:47 -06:00
Rick Carlino 796bad59e5 Merge conflicts 2016-12-05 09:29:31 -06:00
connor rigby 2d8a377a47 Merge branch 'master' of https://github.com/RickCarlino/farmbot-web-app 2016-12-05 07:25:43 -08:00
Rick Carlino 85424cfbdf Merge branch 'master' of https://github.com/rickcarlino/farmbot-web-app 2016-12-05 09:22:29 -06:00
Rick Carlino 2e80097119 Fix erroneous migration 2016-12-05 09:17:51 -06:00
Rick Carlino 6be23c99a8 Merge pull request #14 from MrChristofferson/master 
temporary fix for updating user passwords
 2016-12-05 08:17:20 -06:00
Rick Carlino 0683d2560d Merge pull request #299 from Br3nda/bw/travis 
Get CI running
 2016-12-04 20:25:36 -06:00
Brenda Wallace 8f94f1b625 Update to new rails validators 2016-12-05 01:17:57 +00:00
Brenda Wallace 983ec7b7e9 Only cache FE app if file exists. 2016-12-04 22:31:34 +00:00
Brenda Wallace 3eead5aad9 Travis - Moved env exports into the build script. 2016-12-04 22:29:40 +00:00
Brenda Wallace 2c31ca2dd0 Dev env needs to run the tests too 2016-12-04 22:26:05 +00:00
Brenda Wallace 4f84b4865d Use the database settings to create the database 2016-12-04 22:22:22 +00:00
Brenda Wallace 08c50db317 Fixed indentation in travis file 2016-12-04 22:21:57 +00:00
Brenda Wallace d3e28aa7a2 Only dev and test in the travis database config 
less repeating ourselves.
 2016-12-04 22:21:27 +00:00
Brenda Wallace 9f380afe93 Rcors and Devise from rubygems 2016-12-04 22:08:36 +00:00
MrChristofferson 0e13ea6151 temporary fix for updating user passwords 2016-12-02 15:09:01 -07:00
Chris Vandenberg 9ab29d0876 Update link in email template (#13) 
* used sqlite in development mode

* edit host var for email
 2016-12-02 11:41:53 -06:00
MrChristofferson fbe31a4368 Merge branch 'master' of github.com:MrChristofferson/Farmbot-Web-API 2016-12-02 10:39:24 -07:00
MrChristofferson 34fbe71006 edit host var for email 2016-12-02 10:35:48 -07:00
Rick Carlino a0c3c03de6 Password reset tokens and password updates plus fix broke test 2016-12-01 17:12:19 -06:00
Rick Carlino 2116295764 Password reset tokens and password updates 2016-12-01 16:52:18 -06:00
Rick Carlino 1d91f7f3de Fix failing user registration test 2016-12-01 14:19:00 -06:00
Rick Carlino 22f4dbec8b Add mailer tests + welcome email for new users. 2016-12-01 13:28:29 -06:00
Rick Carlino dba5f642ff Add layout 2016-12-01 13:23:27 -06:00
Rick Carlino 5456b8fb46 Scaffold for mailer. 2016-12-01 12:50:07 -06:00