mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-04 04:04:17 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 98 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
814 Commits
Author SHA1 Message Date
Shiny ab332976da Merge branch 'dev' into bw/rubocop 2017-01-15 17:36:17 +13:00
Brenda Wallace 0fa9f54c9c Rename member.has_role? to role? 2017-01-14 20:54:43 +13:00
Shiny e11603cb3e Merge branch 'dev' into bw/description-photo-links 2017-01-14 18:25:52 +13:00
Brenda Wallace a1cfa826d9 Removed unwanted quotes in member name in menu 
Fix for Issue #1144
 2017-01-14 17:11:58 +13:00
Brenda Wallace 405dfe4bc9 Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links 2017-01-08 21:35:59 +13:00
Brenda Wallace 062ff16acf Put garden.to_s back to garden.name 2017-01-07 13:17:53 +13:00
Brenda Wallace 76be980163 Translate garden.location 2017-01-07 12:48:14 +13:00
Brenda Wallace 5319d23ee3 Using translations on links from photo page 2017-01-07 12:03:31 +13:00
Brenda Wallace 283bb76a9e Link a harvest to a planting, and display 2017-01-04 22:45:49 +13:00
Brenda Wallace ca7868b79a Use guard clauses 2016-12-14 21:28:35 +00:00
Daniel O'Connor 2594e5d334 Rubocop 2016-12-09 12:06:14 +10:30
Daniel O'Connor fef272e30f Merge remote-tracking branch 'upstream/dev' into likeable 2016-12-09 11:42:32 +10:30
Shiny 1388aa3b06 Merge branch 'dev' into bw/useless-assignments 2016-12-03 08:23:19 +13:00
Jim Stallings 160c6efd04 Remove example file, add documentation 2016-12-02 15:34:38 +10:30
Jim Stallings fe6e269c64 GS-658 - i18n automation POC 2016-12-02 15:34:38 +10:30
Jim Stallings 81f2fa5fa4 GS-658: sort locale keys, add rake task for it 2016-12-02 15:31:07 +10:30
Shiny b454132cae Merge branch 'dev' into bw/useless-assignments 2016-12-01 12:51:13 +13:00
Miles Gould 1841548936 Precompile assets in test 
According to
https://github.com/teampoltergeist/poltergeist/issues/677#issuecomment-222919584,
a possible cause of the "Request failed to reach server" problem (#901)
is that assets are being compiled on-demand, causing enough of a
slowdown for PhantomJS to think the connection has failed. This turns
off lazy asset compilation in the test environment and precompiles
assets before testing on Travis. We should also turn off lazy asset
compilation in production - see
http://stackoverflow.com/questions/8821864/config-assets-compile-true-in-rails-production-why-not
Our Heroku deployments already run `rake assets:precompile`.
 2016-11-30 11:01:25 +00:00
Brenda Wallace 9aa4fa8031 Fixes for two calls to deprecated methods 2016-11-30 10:25:23 +13:00
Brenda Wallace 8c7fcd9d49 Fixed all useless assignments 2016-11-26 19:36:59 +13:00
Brenda Wallace 723ebff923 Spacing fixes 2016-11-26 12:13:17 +13:00
Brenda Wallace 62e7c716dd Removed extra empty blank lines 2016-11-26 12:06:02 +13:00
Brenda Wallace 2e46cccd21 Hash alignment 2016-11-26 11:52:10 +13:00
Brenda Wallace d268d2b09e Fixed indentation on comments 2016-11-26 11:45:25 +13:00
Brenda Wallace 83392ddda1 Indentation clean ups 2016-11-26 10:51:54 +13:00
Brenda Wallace be67b858b4 Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed 
Conflicts:
	lib/tasks/growstuff.rake
 2016-11-25 08:18:18 +13:00
Brenda Wallace 975deab4b2 Normalise translation file 2016-11-23 20:24:02 +13:00
Brenda Wallace 2872a1c29d Wrapped all long lines. 
reduced rubocop's line length limit to 120
 2016-11-17 22:02:18 +13:00
Brenda Wallace 6bd9bd98d9 Removed extra blank lines, & added a end of file 2016-11-16 12:52:48 +13:00
Brenda Wallace 0d371593fb Merge remote-tracking branch 'upstream/dev' into bw/trailing-whitespace-begone 2016-11-15 03:25:14 +00:00
Brenda Wallace bdb057ca0f Removed all trailing white space 2016-11-14 15:05:32 +13:00
Brenda Wallace dc5d7a8677 Removed duplicate wiki_linktext 2016-11-14 14:30:45 +13:00
Daniel O'Connor 1f005a3d42 Fixes #1042 2016-09-14 21:41:18 +09:30
Cesy fe137a11bb Merge pull request #1031 from CloCkWeRX/queue_mail 
Queue mail in sidekiq
 2016-08-24 10:38:13 +01:00
Daniel O'Connor aeb8792165 Merge remote-tracking branch 'upstream/dev' into queue_mail 2016-08-24 06:35:51 +09:30
Daniel O'Connor c60609d507 Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-08-23 16:34:03 +09:30
Daniel O'Connor 29765ebc19 rubocop --only HashSyntax --auto-correct 2016-08-22 19:02:27 +09:30
Daniel O'Connor 5008d35614 Add sidekiq configuration 2016-08-16 11:02:35 +09:30
Daniel O'Connor 6b470f180c #951 Add sidekiq as our activejob backend 2016-08-16 11:01:19 +09:30
Daniel O'Connor d8ad697d09 Swap tokens 2016-08-15 21:53:17 +09:30
Daniel O'Connor e38321aa33 #981 Add mapbox access token (on my free 50k views account) and update to v4 2016-07-28 14:27:49 +09:30
Daniel O'Connor d3dac756d6 Merge remote-tracking branch 'upstream/dev' into likeable 2016-07-09 21:08:33 +09:30
Daniel O'Connor 43e7d6f7c2 Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-07-05 03:09:36 +09:30
Daniel O'Connor c3d9885525 Merge pull request #987 from CloCkWeRX/upgradazzle_rails 
Upgrade to rails 4.2.0+ (round 2)
 2016-06-29 14:47:05 +09:30
Mackenzie Morgan 039978357b letsencrypt verification for staging 2016-06-20 11:48:19 -04:00
pozorvlak a66a040207 Revert "Handled Issue #950 (Branded Error Pages)" 2016-06-16 12:58:22 +01:00
pozorvlak 547a408a99 Merge pull request #988 from Prashanth261993/dev 
Add branding to error pages (#950)
 2016-06-16 11:12:23 +01:00
pozorvlak 8cd224b7fa Merge pull request #990 from maco/sparkpost_#917 
don't override our environment email settings with plain old sendmail
 2016-06-15 20:03:35 +01:00
Mackenzie Morgan 8428e93b47 don't override our environment email settings with plain old sendmail 2016-06-15 13:27:51 -04:00
Prashanth 483143f2fe Merge branch 'growstuff-dev' into dev 
Conflicts:
	CONTRIBUTORS.md
 2016-06-14 17:09:06 +05:30